Update core

This commit is contained in:
sunkaixuna
2022-02-16 10:18:58 +08:00
parent e5f0e79d1d
commit a7254e61a2
4 changed files with 10 additions and 5 deletions

View File

@@ -84,8 +84,11 @@ namespace SqlSugar
{ {
keys.Add(dataReader.GetName(i)); keys.Add(dataReader.GetName(i));
var type = dataReader.GetFieldType(i); var type = dataReader.GetFieldType(i);
if (type != null)
{
sbTypes.Append(type.Name.Substring(0, 2)); sbTypes.Append(type.Name.Substring(0, 2));
} }
}
types = sbTypes.ToString(); types = sbTypes.ToString();
return keys; return keys;
} }

View File

@@ -149,7 +149,7 @@ namespace SqlSugar
foreach (var gitem in groupList) foreach (var gitem in groupList)
{ {
batchInsetrSql.Append("("); batchInsetrSql.Append("(");
insertColumns = string.Join(",", gitem.Select(it => FormatValue(it.DbColumnName, it.Value, allParamter, itemable.InsertBuilder.Builder.SqlParameterKeyWord))); insertColumns = string.Join(",", gitem.Select(it => FormatValue(it.PropertyType,it.DbColumnName, it.Value, allParamter, itemable.InsertBuilder.Builder.SqlParameterKeyWord)));
batchInsetrSql.Append(insertColumns); batchInsetrSql.Append(insertColumns);
if (groupList.Last() == gitem) if (groupList.Last() == gitem)
{ {
@@ -161,10 +161,11 @@ namespace SqlSugar
} }
} }
} }
private string FormatValue(string name, object value, List<SugarParameter> allParamter, string keyword) private string FormatValue(Type type,string name, object value, List<SugarParameter> allParamter, string keyword)
{ {
var result = keyword + name + allParamter.Count; var result = keyword + name + allParamter.Count;
allParamter.Add(new SugarParameter(result, value)); var addParameter = new SugarParameter(result, value,type);
allParamter.Add(addParameter);
return result; return result;
} }
#endregion #endregion

View File

@@ -107,6 +107,7 @@ namespace SqlSugar
new KeyValuePair<string, SqlSugar.CSharpDataType>("binary", CSharpDataType.@byteArray), new KeyValuePair<string, SqlSugar.CSharpDataType>("binary", CSharpDataType.@byteArray),
new KeyValuePair<string, CSharpDataType>("varchar",CSharpDataType.@string), new KeyValuePair<string, CSharpDataType>("varchar",CSharpDataType.@string),
new KeyValuePair<string, CSharpDataType>("nvarchar",CSharpDataType.@string),
new KeyValuePair<string, CSharpDataType>("varchar",CSharpDataType.@Guid), new KeyValuePair<string, CSharpDataType>("varchar",CSharpDataType.@Guid),
new KeyValuePair<string, CSharpDataType>("varchar2",CSharpDataType.@string), new KeyValuePair<string, CSharpDataType>("varchar2",CSharpDataType.@string),
new KeyValuePair<string, CSharpDataType>("nvarchar2",CSharpDataType.@string), new KeyValuePair<string, CSharpDataType>("nvarchar2",CSharpDataType.@string),

View File

@@ -838,8 +838,8 @@ namespace SqlSugar
#region IDispose #region IDispose
public void Dispose() public void Dispose()
{ {
this.Context.Dispose();
AllClientEach(it => it.Ado.RollbackTran()); AllClientEach(it => it.Ado.RollbackTran());
AllClientEach(it => it.Dispose());
} }
#endregion #endregion