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

- 增加 ICodeFirst.IsGenerateCommandParameterWithLambda 选项，开启表达式解析的命令参数化；

Browse Source 
- 增加 ExpressionCallContext 自定义函数上下文档 DbParameter 属性；
- 修复 IncludeMany(a => a.x1.x2.Childs) 当 x1, x2 为 null 的报 null 错误；
This commit is contained in:
28810
2019-11-22 21:55:36 +08:00
parent 12be7f0051
commit e9a8ad70a1
54 changed files with 518 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Providers/FreeSql.Provider.MySql/MySqlUtils.cs
View File

@ -21,26 +21,31 @@ namespace FreeSql.MySql
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
var ret = new MySqlParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
var tp = _orm.CodeFirst.GetDbInfo(type)?.type;
if (tp != null)
var dbtype = (MySqlDbType)_orm.CodeFirst.GetDbInfo(type)?.type;
if (col != null)
{
if (col != null && type == typeof(string))
var dbtype2 = (MySqlDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText, DbTypeTextFull = col.Attribute.DbType, MaxLength = col.DbSize });
switch (dbtype2)
{
if (col.Attribute.DbType.Contains("VARCHAR")) ret.MySqlDbType = MySqlDbType.VarChar;
else if (col.Attribute.DbType.Contains("CHAR")) ret.MySqlDbType = MySqlDbType.VarChar;
else if (col.Attribute.DbType.Contains("TEXT")) ret.MySqlDbType = MySqlDbType.Text;
else ret.MySqlDbType = MySqlDbType.VarChar;
case MySqlDbType.Binary:
case MySqlDbType.VarBinary:
break;
default:
dbtype = dbtype2;
if (col.DbSize != 0) ret.Size = col.DbSize;
if (col.DbPrecision != 0) ret.Precision = col.DbPrecision;
if (col.DbScale != 0) ret.Scale = col.DbScale;
break;
}
else if ((MySqlDbType)tp.Value == MySqlDbType.Geometry)
{
ret.MySqlDbType = MySqlDbType.Text;
if (value != null) ret.Value = (value as MygisGeometry).AsText();
}
else
ret.MySqlDbType = (MySqlDbType)tp.Value;
}
if (dbtype == MySqlDbType.Geometry)
{
ret.MySqlDbType = MySqlDbType.Text;
if (value != null) ret.Value = (value as MygisGeometry).AsText();
}
else
ret.MySqlDbType = dbtype;
_params?.Add(ret);
return ret;
}

43
Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs
View File

@ -21,30 +21,35 @@ namespace FreeSql.MySql
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
var ret = new MySqlParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
var tp = _orm.CodeFirst.GetDbInfo(type)?.type;
if (tp != null)
var dbtype = (MySqlDbType)_orm.CodeFirst.GetDbInfo(type)?.type;
if (col != null)
{
if (col != null && type == typeof(string))
var dbtype2 = (MySqlDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText, DbTypeTextFull = col.Attribute.DbType, MaxLength = col.DbSize });
switch (dbtype2)
{
if (col.Attribute.DbType.Contains("VARCHAR")) ret.MySqlDbType = MySqlDbType.VarChar;
else if (col.Attribute.DbType.Contains("CHAR")) ret.MySqlDbType = MySqlDbType.VarChar;
else if (col.Attribute.DbType.Contains("TEXT")) ret.MySqlDbType = MySqlDbType.Text;
else ret.MySqlDbType = MySqlDbType.VarChar;
}
else if ((MySqlDbType)tp.Value == MySqlDbType.Geometry)
{
ret.MySqlDbType = MySqlDbType.Text;
if (value != null) ret.Value = (value as MygisGeometry).AsText();
}
else
{
ret.MySqlDbType = (MySqlDbType)tp.Value;
if (ret.MySqlDbType == MySqlDbType.Enum && value != null)
ret.Value = (long)Convert.ChangeType(value, typeof(long)) + 1;
//case MySqlDbType.Binary:
//case MySqlDbType.VarBinary:
// break;
default:
dbtype = dbtype2;
if (col.DbSize != 0) ret.Size = col.DbSize;
if (col.DbPrecision != 0) ret.Precision = col.DbPrecision;
if (col.DbScale != 0) ret.Scale = col.DbScale;
break;
}
}
if (dbtype == MySqlDbType.Geometry)
{
ret.MySqlDbType = MySqlDbType.Text;
if (value != null) ret.Value = (value as MygisGeometry).AsText();
}
else
{
ret.MySqlDbType = dbtype;
if (ret.MySqlDbType == MySqlDbType.Enum && value != null)
ret.Value = (long)Convert.ChangeType(value, typeof(long)) + 1;
}
_params?.Add(ret);
return ret;
}

1
Providers/FreeSql.Provider.Odbc/Default/OdbcUtils.cs
View File

@ -20,7 +20,6 @@ namespace FreeSql.Odbc.Default
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
var ret = new OdbcParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
var tp = _orm.CodeFirst.GetDbInfo(type)?.type;

1
Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs
View File

@ -21,7 +21,6 @@ namespace FreeSql.Odbc.MySql
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
var ret = new OdbcParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
var tp = _orm.CodeFirst.GetDbInfo(type)?.type;
if (tp != null)

1
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleUtils.cs
View File

@ -19,7 +19,6 @@ namespace FreeSql.Odbc.Oracle
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
var dbtype = (OdbcType)_orm.CodeFirst.GetDbInfo(type)?.type;
switch (dbtype)
{

1
Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLUtils.cs
View File

@ -67,7 +67,6 @@ namespace FreeSql.Odbc.PostgreSQL
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
if (value != null) value = getParamterValue(type, value);
var ret = new OdbcParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
//if (value.GetType().IsEnum || value.GetType().GenericTypeArguments.FirstOrDefault()?.IsEnum == true) {

1
Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerUtils.cs
View File

@ -25,7 +25,6 @@ namespace FreeSql.Odbc.SqlServer
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
var ret = new OdbcParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
var tp = _orm.CodeFirst.GetDbInfo(type)?.type;

26
Providers/FreeSql.Provider.Oracle/OracleUtils.cs
View File

@ -19,7 +19,6 @@ namespace FreeSql.Oracle
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
var dbtype = (OracleDbType)_orm.CodeFirst.GetDbInfo(type)?.type;
if (dbtype == OracleDbType.Boolean)
{
@ -27,15 +26,24 @@ namespace FreeSql.Oracle
else value = (bool)value == true ? 1 : 0;
dbtype = OracleDbType.Int16;
}
else if (col != null && type == typeof(string))
{
if (col.Attribute.DbType.Contains("NVARCHAR2")) dbtype = OracleDbType.NVarchar2;
else if (col.Attribute.DbType.Contains("VARCHAR2")) dbtype = OracleDbType.Varchar2;
else if (col.Attribute.DbType.Contains("NCHAR")) dbtype = OracleDbType.NChar;
else if (col.Attribute.DbType.Contains("CHAR")) dbtype = OracleDbType.Char;
else dbtype = OracleDbType.NVarchar2;
}
var ret = new OracleParameter { ParameterName = QuoteParamterName(parameterName), OracleDbType = dbtype, Value = value };
if (col != null)
{
var dbtype2 = (OracleDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeTextFull = col.Attribute.DbType.Replace("NOT NULL", "").Trim(), DbTypeText = col.DbTypeText });
switch (dbtype2)
{
case OracleDbType.Char:
case OracleDbType.Varchar2:
case OracleDbType.NChar:
case OracleDbType.NVarchar2:
case OracleDbType.Decimal:
dbtype = dbtype2;
if (col.DbSize != 0) ret.Size = col.DbSize;
if (col.DbPrecision != 0) ret.Precision = col.DbPrecision;
if (col.DbScale != 0) ret.Scale = col.DbScale;
break;
}
}
_params?.Add(ret);
return ret;
}

17
Providers/FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs
View File

@ -82,24 +82,23 @@ namespace FreeSql.PostgreSQL
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
if (value != null) value = getParamterValue(type, value);
var ret = new NpgsqlParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
//if (value.GetType().IsEnum || value.GetType().GenericTypeArguments.FirstOrDefault()?.IsEnum == true) {
// ret.DataTypeName = "";
//} else {
var tp = _orm.CodeFirst.GetDbInfo(type)?.type;
if (tp != null)
if (tp != null) ret.NpgsqlDbType = (NpgsqlDbType)tp.Value;
if (col != null)
{
if (col != null && type == typeof(string))
var dbtype = (NpgsqlDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText });
if (dbtype != NpgsqlDbType.Unknown)
{
if (col.Attribute.DbType.Contains("VARCHAR")) ret.NpgsqlDbType = NpgsqlDbType.Varchar;
else if (col.Attribute.DbType.Contains("CHAR")) ret.NpgsqlDbType = NpgsqlDbType.Char;
else if (col.Attribute.DbType.Contains("TEXT")) ret.NpgsqlDbType = NpgsqlDbType.Text;
else ret.NpgsqlDbType = NpgsqlDbType.Varchar;
ret.NpgsqlDbType = dbtype;
if (col.DbSize != 0) ret.Size = col.DbSize;
if (col.DbPrecision != 0) ret.Precision = col.DbPrecision;
if (col.DbScale != 0) ret.Scale = col.DbScale;
}
else
ret.NpgsqlDbType = (NpgsqlDbType)tp.Value;
}
//}
_params?.Add(ret);

20
Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs
View File

@ -25,24 +25,20 @@ namespace FreeSql.SqlServer
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
var ret = new SqlParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
var tp = _orm.CodeFirst.GetDbInfo(type)?.type;
if (tp != null)
if (tp != null) ret.SqlDbType = (SqlDbType)tp.Value;
if (col != null)
{
if (col != null && type == typeof(string))
var dbtype = (SqlDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText });
if (dbtype != SqlDbType.Variant)
{
if (col.Attribute.DbType.Contains("NVARCHAR")) ret.SqlDbType = SqlDbType.NVarChar;
else if (col.Attribute.DbType.Contains("VARCHAR")) ret.SqlDbType = SqlDbType.VarChar;
else if (col.Attribute.DbType.Contains("NCHAR")) ret.SqlDbType = SqlDbType.NChar;
else if (col.Attribute.DbType.Contains("CHAR")) ret.SqlDbType = SqlDbType.Char;
else if (col.Attribute.DbType.Contains("NTEXT")) ret.SqlDbType = SqlDbType.NText;
else if (col.Attribute.DbType.Contains("TEXT")) ret.SqlDbType = SqlDbType.Text;
else ret.SqlDbType = SqlDbType.VarChar;
ret.SqlDbType = dbtype;
if (col.DbSize != 0) ret.Size = col.DbSize;
if (col.DbPrecision != 0) ret.Precision = col.DbPrecision;
if (col.DbScale != 0) ret.Scale = col.DbScale;
}
else
ret.SqlDbType = (SqlDbType)tp.Value;
}
_params?.Add(ret);
return ret;

1
Providers/FreeSql.Provider.Sqlite/SqliteUtils.cs
View File

@ -19,7 +19,6 @@ namespace FreeSql.Sqlite
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
if (type == null && col != null) type = col.Attribute.MapType ?? col.CsType;
var dbtype = (DbType)_orm.CodeFirst.GetDbInfo(type)?.type;
switch (dbtype)
{