tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-18 20:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 GlobalFilter Apply 自动重命名表达式参数名，避免内容重复问题；

Browse Source 
- 修复 表达式解析 Guid.NewGuid() 的错误；
This commit is contained in:
28810
2019-12-05 20:10:39 +08:00
parent e01f7a2061
commit 05cf13f560
14 changed files with 90 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Providers/FreeSql.Provider.Odbc/Default/OdbcExpression.cs
View File

@ -73,25 +73,25 @@ namespace FreeSql.Odbc.Default
case "System.UInt64": return _utils.Adapter.LambdaConvert_ToUInt64(callExp.Method.DeclaringType, getExp(callExp.Arguments[0]));
case "System.Guid": return _utils.Adapter.LambdaConvert_ToGuid(callExp.Method.DeclaringType, getExp(callExp.Arguments[0]));
}
break;
return null;
case "NewGuid":
switch (callExp.Method.DeclaringType.NullableTypeOrThis().ToString())
{
case "System.Guid": return _utils.Adapter.LambdaGuid_NewGuid;
}
break;
return null;
case "Next":
if (callExp.Object?.Type == typeof(Random)) return _utils.Adapter.LambdaRandom_Next;
break;
return null;
case "NextDouble":
if (callExp.Object?.Type == typeof(Random)) return _utils.Adapter.LambdaRandom_NextDouble;
break;
return null;
case "Random":
if (callExp.Method.DeclaringType.IsNumberType()) return _utils.Adapter.LambdaRandom_NextDouble;
break;
return null;
case "ToString":
if (callExp.Object != null) return callExp.Arguments.Count == 0 ? _utils.Adapter.LambdaConvert_ToString(callExp.Object.Type, getExp(callExp.Object)) : null;
break;
return null;
}
var objExp = callExp.Object;

12
Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs
View File

@ -70,21 +70,21 @@ namespace FreeSql.Odbc.MySql
case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as unsigned)";
case "System.Guid": return $"substr(cast({getExp(callExp.Arguments[0])} as char), 1, 36)";
}
break;
return null;
case "NewGuid":
break;
return null;
case "Next":
if (callExp.Object?.Type == typeof(Random)) return "cast(rand()*1000000000 as signed)";
break;
return null;
case "NextDouble":
if (callExp.Object?.Type == typeof(Random)) return "rand()";
break;
return null;
case "Random":
if (callExp.Method.DeclaringType.IsNumberType()) return "rand()";
break;
return null;
case "ToString":
if (callExp.Object != null) return callExp.Arguments.Count == 0 ? $"cast({getExp(callExp.Object)} as char)" : null;
break;
return null;
}
var objExp = callExp.Object;

12
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleExpression.cs
View File

@ -70,21 +70,21 @@ namespace FreeSql.Odbc.Oracle
case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as number)";
case "System.Guid": return $"substr(to_char({getExp(callExp.Arguments[0])}), 1, 36)";
}
break;
return null;
case "NewGuid":
break;
return null;
case "Next":
if (callExp.Object?.Type == typeof(Random)) return "cast(dbms_random.value*1000000000 as smallint)";
break;
return null;
case "NextDouble":
if (callExp.Object?.Type == typeof(Random)) return "dbms_random.value";
break;
return null;
case "Random":
if (callExp.Method.DeclaringType.IsNumberType()) return "dbms_random.value";
break;
return null;
case "ToString":
if (callExp.Object != null) return callExp.Arguments.Count == 0 ? $"to_char({getExp(callExp.Object)})" : null;
break;
return null;
}
var objExp = callExp.Object;

10
Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs
View File

@ -76,19 +76,19 @@ namespace FreeSql.Odbc.PostgreSQL
}
break;
case "NewGuid":
break;
return null;
case "Next":
if (callExp.Object?.Type == typeof(Random)) return "(random()*1000000000)::int4";
break;
return null;
case "NextDouble":
if (callExp.Object?.Type == typeof(Random)) return "random()";
break;
return null;
case "Random":
if (callExp.Method.DeclaringType.IsNumberType()) return "random()";
break;
return null;
case "ToString":
if (callExp.Object != null) return callExp.Arguments.Count == 0 ? $"({getExp(callExp.Object)})::varchar" : null;
break;
return null;
}
var objExp = callExp.Object;

12
Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs
View File

@ -70,25 +70,25 @@ namespace FreeSql.Odbc.SqlServer
case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as bigint)";
case "System.Guid": return $"cast({getExp(callExp.Arguments[0])} as uniqueidentifier)";
}
break;
return null;
case "NewGuid":
switch (callExp.Method.DeclaringType.NullableTypeOrThis().ToString())
{
case "System.Guid": return $"newid()";
}
break;
return null;
case "Next":
if (callExp.Object?.Type == typeof(Random)) return "cast(rand()*1000000000 as int)";
break;
return null;
case "NextDouble":
if (callExp.Object?.Type == typeof(Random)) return "rand()";
break;
return null;
case "Random":
if (callExp.Method.DeclaringType.IsNumberType()) return "rand()";
break;
return null;
case "ToString":
if (callExp.Object != null) return callExp.Arguments.Count == 0 ? (callExp.Object.Type.NullableTypeOrThis() == typeof(Guid) ? $"cast({getExp(callExp.Object)} as varchar(36))" : $"cast({getExp(callExp.Object)} as nvarchar)") : null;
break;
return null;
}
var objExp = callExp.Object;