weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-17 05:40:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 System.MemoryExtensions.Contains 解析问题；#1993

Browse Source
This commit is contained in:
28810
2025-07-16 09:51:41 +08:00
parent 430ba602b6
commit 8fc418150d
28 changed files with 307 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Providers/FreeSql.Provider.ClickHouse/ClickHouseExpression.cs
View File

@@ -111,7 +111,10 @@ namespace FreeSql.ClickHouse
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Custom/CustomExpression.cs
View File

@@ -112,7 +112,10 @@ namespace FreeSql.Custom
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Custom/MySql/CustomMySqlExpression.cs
View File

@@ -108,7 +108,10 @@ namespace FreeSql.Custom.MySql
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Custom/Oracle/CustomOracleExpression.cs
View File

@@ -112,7 +112,10 @@ namespace FreeSql.Custom.Oracle
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLExpression.cs
View File

@@ -111,7 +111,10 @@ namespace FreeSql.Custom.PostgreSQL
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerExpression.cs
View File

@@ -118,7 +118,10 @@ namespace FreeSql.Custom.SqlServer
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Dameng/DamengExpression.cs
View File

@@ -112,7 +112,10 @@ namespace FreeSql.Dameng
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Duckdb/DuckdbExpression.cs
View File

@@ -111,7 +111,10 @@ namespace FreeSql.Duckdb
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Firebird/FirebirdExpression.cs
View File

@@ -109,7 +109,10 @@ namespace FreeSql.Firebird
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.GBase/GBaseExpression.cs
View File

@@ -109,7 +109,10 @@ namespace FreeSql.GBase
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs
View File

@@ -112,7 +112,10 @@ namespace FreeSql.KingbaseES
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.MsAccess/MsAccessExpression.cs
View File

@@ -82,7 +82,10 @@ namespace FreeSql.MsAccess
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.MySql/MySqlExpression.cs
View File

@@ -110,7 +110,10 @@ namespace FreeSql.MySql
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

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

@@ -112,7 +112,10 @@ namespace FreeSql.Odbc.Default
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

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

@@ -108,7 +108,10 @@ namespace FreeSql.Odbc.MySql
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

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

@@ -112,7 +112,10 @@ namespace FreeSql.Odbc.Oracle
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

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

@@ -111,7 +111,10 @@ namespace FreeSql.Odbc.PostgreSQL
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

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

@@ -118,7 +118,10 @@ namespace FreeSql.Odbc.SqlServer
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Oracle/OracleExpression.cs
View File

@@ -112,7 +112,10 @@ namespace FreeSql.Oracle
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs
View File

@@ -112,7 +112,10 @@ namespace FreeSql.PostgreSQL
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.QuestDb/QuestDbExpression.cs
View File

@@ -117,7 +117,10 @@ namespace FreeSql.QuestDb
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs
View File

@@ -111,7 +111,10 @@ namespace FreeSql.ShenTong
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs
View File

@@ -117,7 +117,10 @@ namespace FreeSql.SqlServer
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Sqlite/SqliteExpression.cs
View File

@@ -108,7 +108,10 @@ namespace FreeSql.Sqlite
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.TDengine/TDengineExpression.cs
View File

@@ -111,7 +111,10 @@ namespace FreeSql.TDengine
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;

5
Providers/FreeSql.Provider.Xugu/XuguExpression.cs
View File

@@ -115,7 +115,10 @@ namespace FreeSql.Xugu
if (objType?.FullName == "System.Byte[]") return null;
var argIndex = 0;
if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
if (objType == null && (
callExp.Method.DeclaringType == typeof(Enumerable) ||
callExp.Method.DeclaringType.FullName == "System.MemoryExtensions"
))
{
objExp = callExp.Arguments.FirstOrDefault();
objType = objExp?.Type;