Skip to content

Commit ac1127a

Browse files
28810992881099
committed
- 修复 Lambda .Contains 通配符解析为非 Like 问题；
1 parent a2b1d55 commit ac1127a

File tree

25 files changed

+41
-27
lines changed

25 files changed

+41
-27
lines changed

‎FreeSql.Tests/FreeSql.Tests.Provider.Duckdb/Duckdb/DuckdbAdo/DuckdbAdoTest.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using FreeSql.DataAnnotations;
22
using System;
3+
using System.Diagnostics;
4+
using System.Threading;
35
using Xunit;
46

57
namespace FreeSql.Tests.Duckdb
@@ -20,9 +22,21 @@ public void ExecuteTest()
2022
Assert.True(fsql.Ado.ExecuteConnectTest());
2123
}
2224
[Fact]
23-
public void ExecuteReader()
25+
public void ExecuteDataTable()
2426
{
27+
var dataTable = fsql.Ado.ExecuteDataTable("select * from tbiou04");
2528

29+
using (var duck = new FreeSql.FreeSqlBuilder()
30+
.UseConnectionString(FreeSql.DataType.DuckDB, "DataSource=D:\\WeChat Files\\WeChat Files\\q2881099\\FileStorage\\File\\2025-05")
31+
.UseAutoSyncStructure(true)
32+
.UseMonitorCommand(
33+
cmd => Trace.WriteLine("\r\n线程" + Thread.CurrentThread.ManagedThreadId + ": " + cmd.CommandText) //监听SQL命令对象，在执行前
34+
, (cmd, traceLog) => Console.WriteLine(traceLog)
35+
)
36+
.Build())
37+
{
38+
var dataTable2 = fsql.Ado.ExecuteDataTable("select * from db_db");
39+
}
2640
}
2741
[Fact]
2842
public void ExecuteArray()

‎FreeSql.Tests/FreeSql.Tests.Provider.Duckdb/FreeSql.Tests.Provider.Duckdb.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
15-
<PackageReference Include="xunit" Version="2.4.1" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15+
<PackageReference Include="xunit" Version="2.9.3" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>

‎Providers/FreeSql.Provider.Custom/MySql/CustomMySqlExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
285285
var leftLike = exp.Object.NodeType == ExpressionType.MemberAccess ? left : $"({left})";
286286
var args0Value = getExp(exp.Arguments[0]);
287287
if (args0Value == "NULL") return $"{leftLike} IS NULL";
288-
if (args0Value.Contains("%"))
288+
if (new[] { '%', '_', '[', ']', '*' }.Any(wildcard => args0Value.Contains(wildcard)))
289289
{
290290
if (exp.Method.Name == "StartsWith") return $"locate({args0Value}, {left}) = 1";
291291
if (exp.Method.Name == "EndsWith") return $"locate({args0Value}, {left}) = char_length({left})-char_length({args0Value})+1";

‎Providers/FreeSql.Provider.Custom/Oracle/CustomOracleExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
288288
var leftLike = exp.Object.NodeType == ExpressionType.MemberAccess ? left : $"({left})";
289289
var args0Value = getExp(exp.Arguments[0]);
290290
if (args0Value == "NULL") return $"{leftLike} IS NULL";
291-
if (args0Value.Contains("%"))
291+
if (new[] { '%', '_', '[', ']', '*' }.Any(wildcard => args0Value.Contains(wildcard)))
292292
{
293293
if (exp.Method.Name == "StartsWith") return $"instr({left}, {args0Value}, 1, 1) = 1";
294294
if (exp.Method.Name == "EndsWith") return $"instr({left}, {args0Value}, 1, 1) = length({left})-length({args0Value})+1";

‎Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
377377
var leftLike = exp.Object.NodeType == ExpressionType.MemberAccess ? left : $"({left})";
378378
var args0Value = getExp(exp.Arguments[0]);
379379
if (args0Value == "NULL") return $"{leftLike} IS NULL";
380-
if (args0Value.Contains("%"))
380+
if (new[] { '%', '_', '[', ']', '*' }.Any(wildcard => args0Value.Contains(wildcard)))
381381
{
382382
if (exp.Method.Name == "StartsWith") return $"strpos({left}, {args0Value}) = 1";
383383
if (exp.Method.Name == "EndsWith") return $"strpos({left}, {args0Value}) = char_length({left})-char_length({args0Value})+1";

‎Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
308308
var leftLike = exp.Object.NodeType == ExpressionType.MemberAccess ? left : $"({left})";
309309
var args0Value = getExp(exp.Arguments[0]);
310310
if (args0Value == "NULL") return $"{leftLike} IS NULL";
311-
if (args0Value.Contains("%"))
311+
if (new[] { '%', '_', '[', ']' }.Any(wildcard => args0Value.Contains(wildcard)))
312312
{
313313
if (exp.Method.Name == "StartsWith") return $"charindex({args0Value}, {left}) = 1";
314314
if (exp.Method.Name == "EndsWith") return $"charindex({args0Value}, {left}) = len({left})-len({args0Value})+1";

‎Providers/FreeSql.Provider.Dameng/DamengExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
288288
var leftLike = exp.Object.NodeType == ExpressionType.MemberAccess ? left : $"({left})";
289289
var args0Value = getExp(exp.Arguments[0]);
290290
if (args0Value == "NULL") return $"{leftLike} IS NULL";
291-
if (args0Value.Contains("%"))
291+
if (new[] { '%', '_', '[', ']', '*' }.Any(wildcard => args0Value.Contains(wildcard)))
292292
{
293293
if (exp.Method.Name == "StartsWith") return $"instr({left}, {args0Value}, 1, 1) = 1";
294294
if (exp.Method.Name == "EndsWith") return $"instr({left}, {args0Value}, 1, 1) = length({left})-length({args0Value})+1";

‎Providers/FreeSql.Provider.Duckdb/DuckdbExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
354354
var args0Value = getExp(exp.Arguments[0]);
355355
if (args0Value == "NULL") return $"{leftLike} IS NULL";
356356
if (exp.Method.Name == "StartsWith") return $"{left} ^@ ({args0Value})";
357-
if (args0Value.Contains("%"))
357+
if (new[] { '%', '_', '[', ']', '*' }.Any(wildcard => args0Value.Contains(wildcard)))
358358
{
359359
if (exp.Method.Name == "EndsWith") return $"strpos({left}, {args0Value}) = length({left})-length({args0Value})+1";
360360
return $"strpos({left}, {args0Value}) > 0";

‎Providers/FreeSql.Provider.Firebird/FirebirdExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
275275
var leftLike = exp.Object.NodeType == ExpressionType.MemberAccess ? left : $"({left})";
276276
var args0Value = getExp(exp.Arguments[0]);
277277
if (args0Value == "NULL") return $"{leftLike} IS NULL";
278-
if (args0Value.Contains("%"))
278+
if (new[] { '%', '_', '[', ']', '*' }.Any(wildcard => args0Value.Contains(wildcard)))
279279
{
280280
if (exp.Method.Name == "StartsWith") return $"position({args0Value}, {left}) = 1";
281281
if (exp.Method.Name == "EndsWith") return $"position({args0Value}, {left}) = char_length({left})-char_length({args0Value})+1";

‎Providers/FreeSql.Provider.GBase/GBaseExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
275275
var leftLike = exp.Object.NodeType == ExpressionType.MemberAccess ? left : $"({left})";
276276
var args0Value = getExp(exp.Arguments[0]);
277277
if (args0Value == "NULL") return $"{leftLike} IS NULL";
278-
if (args0Value.Contains("%"))
278+
if (new[] { '%', '_', '[', ']', '*' }.Any(wildcard => args0Value.Contains(wildcard)))
279279
{
280280
if (exp.Method.Name == "StartsWith") return $"instr({args0Value}, {left}) = 1";
281281
if (exp.Method.Name == "EndsWith") return $"instr({args0Value}, {left}) = char_length({left})-char_length({args0Value})+1";

0 commit comments

Comments
 (0)