Skip to content

Add static to the lambdas for functions/aggregates/collations (and explicit names). #38892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cincuranet wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add static to the lambdas for functions/aggregates/collations (and explicit names). #38892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb09603
Fix handling decimal for EF_DECIMAL collate.
cincuranet Sep 1, 2026
59e38fa
Add `static` to the lambdas for functions/aggregates/collations (and …
cincuranet Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 27 additions & 22 deletions src/EFCore.Sqlite.Core/Storage/Internal/SqliteRelationalConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,92 +100,97 @@ private void InitializeDbConnection(DbConnection connection)
}

sqliteConnection.CreateFunction<string, string, bool?>(
"regexp",
(pattern, input)
name: "regexp",
static (pattern, input)
=> input == null
|| pattern == null
? null
: Regex.IsMatch(input, pattern, RegexOptions.NonBacktracking, TimeSpan.FromMilliseconds(1000)),
isDeterministic: true);

sqliteConnection.CreateFunction(
"ef_mod",
(decimal? dividend, decimal? divisor) => divisor == 0m ? null : dividend % divisor,
name: "ef_mod",
static (decimal? dividend, decimal? divisor) => divisor == 0m ? null : dividend % divisor,
isDeterministic: true);

sqliteConnection.CreateFunction(
name: "ef_add",
(decimal? left, decimal? right) => left + right,
static (decimal? left, decimal? right) => left + right,
isDeterministic: true);

sqliteConnection.CreateFunction(
name: "ef_divide",
(decimal? dividend, decimal? divisor) => divisor == 0m ? null : dividend / divisor,
static (decimal? dividend, decimal? divisor) => divisor == 0m ? null : dividend / divisor,
isDeterministic: true);

sqliteConnection.CreateFunction(
name: "ef_compare",
(decimal? left, decimal? right) => left.HasValue && right.HasValue
static (decimal? left, decimal? right) => left.HasValue && right.HasValue
? decimal.Compare(left.Value, right.Value)
: default(int?),
isDeterministic: true);

sqliteConnection.CreateFunction(
name: "ef_multiply",
(decimal? left, decimal? right) => left * right,
static (decimal? left, decimal? right) => left * right,
isDeterministic: true);

sqliteConnection.CreateFunction(
name: "ef_negate",
(decimal? m) => -m,
static (decimal? m) => -m,
isDeterministic: true);

sqliteConnection.CreateAggregate(
"ef_avg",
name: "ef_avg",
seed: (0m, 0ul),
((decimal sum, ulong count) acc, decimal? value) => value is null
static ((decimal sum, ulong count) acc, decimal? value) => value is null
? acc
: (acc.sum + value.Value, acc.count + 1),
((decimal sum, ulong count) acc) => acc.count == 0
static ((decimal sum, ulong count) acc) => acc.count == 0
? default(decimal?)
: acc.sum / acc.count,
isDeterministic: true);

sqliteConnection.CreateAggregate(
"ef_max",
name: "ef_max",
seed: null,
(decimal? max, decimal? value) => max is null
static (decimal? max, decimal? value) => max is null
? value
: value is null
? max
: decimal.Max(max.Value, value.Value),
isDeterministic: true);

sqliteConnection.CreateAggregate(
"ef_min",
name: "ef_min",
seed: null,
(decimal? min, decimal? value) => min is null
static (decimal? min, decimal? value) => min is null
? value
: value is null
? min
: decimal.Min(min.Value, value.Value),
isDeterministic: true);

sqliteConnection.CreateAggregate(
"ef_sum",
name: "ef_sum",
seed: null,
(decimal? sum, decimal? value) => value is null
static (decimal? sum, decimal? value) => value is null
? sum
: sum is null
? value
: sum.Value + value.Value,
isDeterministic: true);

sqliteConnection.CreateCollation(
"EF_DECIMAL",
(x, y) => decimal.Compare(
decimal.Parse(x, NumberStyles.Number, CultureInfo.InvariantCulture),
decimal.Parse(y, NumberStyles.Number, CultureInfo.InvariantCulture)));
name: "EF_DECIMAL",
static (x, y) => (decimal.TryParse(x, NumberStyles.Number | NumberStyles.AllowExponent, CultureInfo.InvariantCulture, out var xValue),
decimal.TryParse(y, NumberStyles.Number | NumberStyles.AllowExponent, CultureInfo.InvariantCulture, out var yValue)) switch
{
(true, true) => decimal.Compare(xValue, yValue),
(true, _) => -1,
(_, true) => 1,
_ => string.CompareOrdinal(x, y)
});
}
else
{
Expand Down
53 changes: 53 additions & 0 deletions test/EFCore.Sqlite.FunctionalTests/BuiltInDataTypesSqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,6 +1950,59 @@ CROSS JOIN "BuiltInDataTypes" AS "b0"
""");
}

[Fact]
public virtual void Can_query_OrderBy_decimal_with_invalid_database_values()
{
using var context = CreateContext();
using var transaction = context.Database.BeginTransaction();

context.AddRange(
new BuiltInDataTypes { Id = 230, PartitionId = 210, TestDecimal = 2m },
new BuiltInDataTypes { Id = 231, PartitionId = 210, TestDecimal = 20m },
new BuiltInDataTypes { Id = 232, PartitionId = 210, TestDecimal = 0m },
new BuiltInDataTypes { Id = 233, PartitionId = 210, TestDecimal = 0m },
new BuiltInDataTypes { Id = 234, PartitionId = 210, TestDecimal = 0m },
new BuiltInDataTypes { Id = 235, PartitionId = 210, TestDecimal = 0m });

context.SaveChanges();

context.Database.ExecuteSql(
$"""UPDATE "BuiltInDataTypes" SET "TestDecimal" = {"1e1"} WHERE "Id" = {232}""");
context.Database.ExecuteSql(
$"""UPDATE "BuiltInDataTypes" SET "TestDecimal" = {"n/a"} WHERE "Id" = {233}""");
context.Database.ExecuteSql(
$"""UPDATE "BuiltInDataTypes" SET "TestDecimal" = {"zzz"} WHERE "Id" = {234}""");
context.Database.ExecuteSql(
$"""UPDATE "BuiltInDataTypes" SET "TestDecimal" = {"1e40"} WHERE "Id" = {235}""");

Fixture.TestSqlLoggerFactory.Clear();

var results = context.Set<BuiltInDataTypes>()
.Where(e => e.PartitionId == 210)
.OrderBy(e => e.TestDecimal)
.Select(e => e.Id)
.ToList();

Assert.Equal(
[
230, // 2
232, // 1e1 == 10
231, // 20
235, // Invalid values compare ordinally: "1e40"
233, // "n/a"
234 // "zzz"
],
results);

AssertSql(
"""
SELECT "b"."Id"
FROM "BuiltInDataTypes" AS "b"
WHERE "b"."PartitionId" = 210
ORDER BY "b"."TestDecimal" COLLATE "EF_DECIMAL"
""");
}

private void AssertTranslationFailed(Action testCode)
=> Assert.Contains(
CoreStrings.TranslationFailed("")[21..],
Expand Down
Loading