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

- 完善 MapType byte[] 对 Contains/Parse 表达式解析的处理；#178

Browse Source
This commit is contained in:
28810 2020-01-07 18:16:37 +08:00
parent 0addfc638a
commit 0dec7ff587
17 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FreeSql.Tests/FreeSql.Tests/UnitTest3.cs
View File

@ -110,6 +110,9 @@ namespace FreeSql.Tests
var slslsl = g.oracle.Select<SendInfo>().ToList(); var slslsl = g.oracle.Select<SendInfo>().ToList();
var slsls1Ids = slslsl.Select(a => a.ID).ToArray();
var slslss2 = g.oracle.Select<SendInfo>().Where(a => slsls1Ids.Contains(a.ID)).ToList();
var mt_codeId = Guid.Parse("2f48c5ca-7257-43c8-9ee2-0e16fa990253"); var mt_codeId = Guid.Parse("2f48c5ca-7257-43c8-9ee2-0e16fa990253");
Assert.Equal(1, g.oracle.Insert(new SendInfo { ID = mt_codeId, Code = "mt_code", Binary = Encoding.UTF8.GetBytes("我是mt_code") }) Assert.Equal(1, g.oracle.Insert(new SendInfo { ID = mt_codeId, Code = "mt_code", Binary = Encoding.UTF8.GetBytes("我是mt_code") })
.ExecuteAffrows()); .ExecuteAffrows());

2
Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessAdo.cs
View File

@ -37,7 +37,7 @@ namespace FreeSql.MsAccess
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is bool || param is bool?) if (param is bool || param is bool?)

2
Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs
View File

@ -36,7 +36,7 @@ namespace FreeSql.MySql
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is bool || param is bool?) if (param is bool || param is bool?)

2
Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengAdo.cs
View File

@ -35,7 +35,7 @@ namespace FreeSql.Odbc.Dameng
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is byte[]) if (param is byte[])

8
Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengExpression.cs
View File

@ -41,7 +41,9 @@ namespace FreeSql.Odbc.Dameng
case "System.UInt16": case "System.UInt16":
case "System.UInt32": case "System.UInt32":
case "System.UInt64": return $"cast({getExp(operandExp)} as number)"; case "System.UInt64": return $"cast({getExp(operandExp)} as number)";
case "System.Guid": return $"to_char({getExp(operandExp)})"; case "System.Guid":
if (tsc.mapType == typeof(byte[])) return $"hextoraw({getExp(operandExp)})";
return $"to_char({getExp(operandExp)})";
} }
} }
break; break;
@ -68,7 +70,9 @@ namespace FreeSql.Odbc.Dameng
case "System.UInt16": case "System.UInt16":
case "System.UInt32": case "System.UInt32":
case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as number)"; case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as number)";
case "System.Guid": return $"substr(to_char({getExp(callExp.Arguments[0])}), 1, 36)"; case "System.Guid":
if (tsc.mapType == typeof(byte[])) return $"hextoraw({getExp(callExp.Arguments[0])})";
return $"to_char({getExp(callExp.Arguments[0])})";
} }
return null; return null;
case "NewGuid": case "NewGuid":

2
Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcAdo.cs
View File

@ -37,7 +37,7 @@ namespace FreeSql.Odbc.Default
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is bool || param is bool?) if (param is bool || param is bool?)

2
Providers/FreeSql.Provider.Odbc/GBase/OdbcGBaseAdo/__OdbcGBaseAdo.cs
View File

@ -37,7 +37,7 @@ namespace FreeSql.Odbc.GBase
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is bool || param is bool?) if (param is bool || param is bool?)
return (bool)param ? "'t'" : "'f'"; return (bool)param ? "'t'" : "'f'";

2
Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlAdo.cs
View File

@ -36,7 +36,7 @@ namespace FreeSql.Odbc.MySql
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is bool || param is bool?) if (param is bool || param is bool?)

2
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleAdo.cs
View File

@ -35,7 +35,7 @@ namespace FreeSql.Odbc.Oracle
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is byte[]) if (param is byte[])

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

@ -41,7 +41,9 @@ namespace FreeSql.Odbc.Oracle
case "System.UInt16": case "System.UInt16":
case "System.UInt32": case "System.UInt32":
case "System.UInt64": return $"cast({getExp(operandExp)} as number)"; case "System.UInt64": return $"cast({getExp(operandExp)} as number)";
case "System.Guid": return $"to_char({getExp(operandExp)})"; case "System.Guid":
if (tsc.mapType == typeof(byte[])) return $"hextoraw({getExp(operandExp)})";
return $"to_char({getExp(operandExp)})";
} }
} }
break; break;
@ -68,7 +70,9 @@ namespace FreeSql.Odbc.Oracle
case "System.UInt16": case "System.UInt16":
case "System.UInt32": case "System.UInt32":
case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as number)"; case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as number)";
case "System.Guid": return $"substr(to_char({getExp(callExp.Arguments[0])}), 1, 36)"; case "System.Guid":
if (tsc.mapType == typeof(byte[])) return $"hextoraw({getExp(callExp.Arguments[0])})";
return $"to_char({getExp(callExp.Arguments[0])})";
} }
return null; return null;
case "NewGuid": case "NewGuid":

2
Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLAdo.cs
View File

@ -37,7 +37,7 @@ namespace FreeSql.Odbc.PostgreSQL
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is bool || param is bool?) if (param is bool || param is bool?)

2
Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerAdo.cs
View File

@ -38,7 +38,7 @@ namespace FreeSql.Odbc.SqlServer
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is bool || param is bool?) if (param is bool || param is bool?)

2
Providers/FreeSql.Provider.Oracle/OracleAdo/OracleAdo.cs
View File

@ -35,7 +35,7 @@ namespace FreeSql.Oracle
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is byte[]) if (param is byte[])

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

@ -41,7 +41,9 @@ namespace FreeSql.Oracle
case "System.UInt16": case "System.UInt16":
case "System.UInt32": case "System.UInt32":
case "System.UInt64": return $"cast({getExp(operandExp)} as number)"; case "System.UInt64": return $"cast({getExp(operandExp)} as number)";
case "System.Guid": return $"substr(to_char({getExp(operandExp)}), 1, 36)"; case "System.Guid":
if (tsc.mapType == typeof(byte[])) return $"hextoraw({getExp(operandExp)})";
return $"to_char({getExp(operandExp)})";
} }
} }
break; break;
@ -68,7 +70,9 @@ namespace FreeSql.Oracle
case "System.UInt16": case "System.UInt16":
case "System.UInt32": case "System.UInt32":
case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as number)"; case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as number)";
case "System.Guid": return $"to_char({getExp(callExp.Arguments[0])})"; case "System.Guid":
if (tsc.mapType == typeof(byte[])) return $"hextoraw({getExp(callExp.Arguments[0])})";
return $"to_char({getExp(callExp.Arguments[0])})";
} }
return null; return null;
case "NewGuid": case "NewGuid":

2
Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLAdo.cs
View File

@ -38,7 +38,7 @@ namespace FreeSql.PostgreSQL
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList() || param is JToken || param is JObject || param is JArray)) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || param is JToken || param is JObject || param is JArray))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
bool isdic; bool isdic;

2
Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerAdo.cs
View File

@ -39,7 +39,7 @@ namespace FreeSql.SqlServer
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is bool || param is bool?) if (param is bool || param is bool?)

2
Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteAdo.cs
View File

@ -34,7 +34,7 @@ namespace FreeSql.Sqlite
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
{ {
if (param == null) return "NULL"; if (param == null) return "NULL";
if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false || mapType.IsArrayOrList())) if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
param = Utils.GetDataReaderValue(mapType, param); param = Utils.GetDataReaderValue(mapType, param);
if (param is bool || param is bool?) if (param is bool || param is bool?)