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

- 增加 fsql.Insert(Dictionary<string, object>) 无实体类插入方法；#481

Browse Source
This commit is contained in:
2881099
2022-03-24 18:06:54 +08:00
parent 56ce675b65
commit dc688adc11
47 changed files with 416 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Providers/FreeSql.Provider.ClickHouse/ClickHouseDbFirst.cs
View File

@ -31,7 +31,7 @@ namespace FreeSql.ClickHouse
column.DbTypeText = column.DbTypeTextFull;
//(?<=\()(\S +)(?=\))
}
switch (column.DbTypeText.ToLower())
switch (column.DbTypeText?.ToLower())
{
case "bit":
case "tinyint":
@ -86,7 +86,7 @@ namespace FreeSql.ClickHouse
case "varchar": return DbType.String;
default:
{
if (column.DbTypeText.ToLower().Contains("datetime"))
if (column.DbTypeText?.ToLower().Contains("datetime") == true)
return DbType.DateTime;
return DbType.String;
}

12
Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs
View File

@ -20,8 +20,8 @@ namespace FreeSql.ClickHouse
public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
{
if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
var dbtype = (DbType)_orm.CodeFirst.GetDbInfo(type)?.type;
DbParameter ret = new ClickHouseDbParameter { ParameterName = parameterName, DbType = dbtype, Value = value };//QuoteParamterName(parameterName)
var dbtype = (DbType?)_orm.CodeFirst.GetDbInfo(type)?.type;
DbParameter ret = new ClickHouseDbParameter { ParameterName = parameterName, DbType = dbtype ?? default, Value = value };//QuoteParamterName(parameterName)
if (col != null)
{
var dbtype2 = (DbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText, DbTypeTextFull = col.Attribute.DbType, MaxLength = col.DbSize });
@ -40,8 +40,6 @@ namespace FreeSql.ClickHouse
ret.Value = (bool)value ? 1 : 0;
}
}
ret.DbType = dbtype;
_params?.Add(ret);
return ret;
}
@ -52,9 +50,7 @@ namespace FreeSql.ClickHouse
DbParameter ret = new ClickHouseDbParameter { ParameterName = $"?{name}", Value = value };
var tp = _orm.CodeFirst.GetDbInfo(type)?.type;
if (tp != null)
{
ret.DbType = (DbType)tp.Value;
}
return ret;
});
@ -64,13 +60,9 @@ namespace FreeSql.ClickHouse
if (string.IsNullOrWhiteSpace(col?.Attribute.RewriteSql) == false)
return string.Format(col.Attribute.RewriteSql, sql);
if (Regex.IsMatch(sql, @"\{\{[\w\d]+_+\d:\{\d\}\}\}"))
{
return string.Format(sql, col.Attribute.DbType);
}
else
{
return sql;
}
}
public override string FormatSql(string sql, params object[] args) => sql?.FormatClickHouse(args);