mirror of
https://github.com/nsnail/FreeSql.git
synced 2025-04-22 18:52:50 +08:00
- 修复 InsertDict SqlServer 下的问题;
This commit is contained in:
parent
09664cb3ad
commit
357e52a59f
@ -431,7 +431,7 @@ namespace base_entity
|
|||||||
{
|
{
|
||||||
[Column(Name = "ID", IsPrimary = true)]
|
[Column(Name = "ID", IsPrimary = true)]
|
||||||
public string Id { get; set; }
|
public string Id { get; set; }
|
||||||
[Column(Name = "XP")]
|
[Column(Name = "XP", StringLength = -1)]
|
||||||
public byte[] Bytes { get; set; }
|
public byte[] Bytes { get; set; }
|
||||||
[Column(Name = "UPLOAD_TIME")]
|
[Column(Name = "UPLOAD_TIME")]
|
||||||
public DateTime UploadTime { get; set; }
|
public DateTime UploadTime { get; set; }
|
||||||
@ -543,14 +543,14 @@ namespace base_entity
|
|||||||
|
|
||||||
//.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=2")
|
//.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=2")
|
||||||
|
|
||||||
//.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
|
.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
|
||||||
|
|
||||||
//.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=2")
|
//.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=2")
|
||||||
//.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=toc;Pooling=true;Maximum Pool Size=2")
|
//.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=toc;Pooling=true;Maximum Pool Size=2")
|
||||||
//.UseNameConvert(FreeSql.Internal.NameConvertType.ToLower)
|
//.UseNameConvert(FreeSql.Internal.NameConvertType.ToLower)
|
||||||
|
|
||||||
.UseConnectionString(FreeSql.DataType.Oracle, "user id=user1;password=123456;data source=//127.0.0.1:1521/XE;Pooling=true;Max Pool Size=2")
|
//.UseConnectionString(FreeSql.DataType.Oracle, "user id=user1;password=123456;data source=//127.0.0.1:1521/XE;Pooling=true;Max Pool Size=2")
|
||||||
.UseNameConvert(FreeSql.Internal.NameConvertType.ToUpper)
|
//.UseNameConvert(FreeSql.Internal.NameConvertType.ToUpper)
|
||||||
|
|
||||||
//.UseConnectionString(FreeSql.DataType.Dameng, "server=127.0.0.1;port=5236;user id=2user;password=123456789;database=2user;poolsize=5;min pool size=1")
|
//.UseConnectionString(FreeSql.DataType.Dameng, "server=127.0.0.1;port=5236;user id=2user;password=123456789;database=2user;poolsize=5;min pool size=1")
|
||||||
//.UseNameConvert(FreeSql.Internal.NameConvertType.ToUpper)
|
//.UseNameConvert(FreeSql.Internal.NameConvertType.ToUpper)
|
||||||
@ -622,9 +622,9 @@ namespace base_entity
|
|||||||
|
|
||||||
atimpl.GetTableNameByColumnValue(DateTime.Parse("2023-7-1"), autoExpand: true);
|
atimpl.GetTableNameByColumnValue(DateTime.Parse("2023-7-1"), autoExpand: true);
|
||||||
|
|
||||||
var dywhere = new DynamicFilterInfo { Field = "AspNetRoless.Name", Operator = DynamicFilterOperator.Equal, Value = "Admin" };
|
//var dywhere = new DynamicFilterInfo { Field = "AspNetRoless.Name", Operator = DynamicFilterOperator.Equal, Value = "Admin" };
|
||||||
var method = typeof(ISelect<object>).GetMethod("WhereDynamicFilter");
|
//var method = typeof(ISelect<object>).GetMethod("WhereDynamicFilter");
|
||||||
var users4 = fsql.Select<AspNetUsers>().IncludeByPropertyName("AspNetUserRoless", then => then.WhereDynamicFilter(dywhere)).ToList();
|
//var users4 = fsql.Select<AspNetUsers>().IncludeByPropertyName("AspNetUserRoless", then => then.WhereDynamicFilter(dywhere)).ToList();
|
||||||
|
|
||||||
|
|
||||||
var type = typeof(Student);
|
var type = typeof(Student);
|
||||||
@ -924,8 +924,8 @@ namespace base_entity
|
|||||||
|
|
||||||
var sqss = fsql.InsertDict(dic).AsTable("table1").ToSql();
|
var sqss = fsql.InsertDict(dic).AsTable("table1").ToSql();
|
||||||
var sqss2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
|
var sqss2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
|
||||||
sqss = fsql.InsertDict(dic).AsTable("table1").NoneParameter(false).ToSql();
|
sqss = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
|
||||||
sqss2 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter(false).ToSql();
|
sqss2 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
|
||||||
|
|
||||||
dic["xxx"] = null;
|
dic["xxx"] = null;
|
||||||
dic["yyy"] = 111;
|
dic["yyy"] = 111;
|
||||||
|
@ -733,6 +733,15 @@
|
|||||||
<param name="modelBuilder"></param>
|
<param name="modelBuilder"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:FreeSqlDbContextExtensions.ApplyConfigurationsFromAssembly(FreeSql.ICodeFirst,System.Reflection.Assembly,System.Func{System.Type,System.Boolean})">
|
||||||
|
<summary>
|
||||||
|
根据Assembly扫描所有继承IEntityTypeConfiguration<T>的配置类
|
||||||
|
</summary>
|
||||||
|
<param name="codeFirst"></param>
|
||||||
|
<param name="assembly"></param>
|
||||||
|
<param name="predicate"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:FreeSqlDbContextExtensions.CreateDbContext(IFreeSql)">
|
<member name="M:FreeSqlDbContextExtensions.CreateDbContext(IFreeSql)">
|
||||||
<summary>
|
<summary>
|
||||||
创建普通数据上下文档对象
|
创建普通数据上下文档对象
|
||||||
|
@ -622,7 +622,8 @@ namespace FreeSql.Internal.CommonProvider
|
|||||||
Attribute = new DataAnnotations.ColumnAttribute
|
Attribute = new DataAnnotations.ColumnAttribute
|
||||||
{
|
{
|
||||||
Name = colName,
|
Name = colName,
|
||||||
MapType = colType
|
MapType = colType,
|
||||||
|
DbType = "", //for SqlServer: ncharDbTypes.Any(a => mapColumn.Attribute.DbType.Contains(a))
|
||||||
},
|
},
|
||||||
CsType = colType
|
CsType = colType
|
||||||
};
|
};
|
||||||
|
@ -118,7 +118,16 @@ namespace FreeSql.Dameng
|
|||||||
{
|
{
|
||||||
if (value == null) return "NULL";
|
if (value == null) return "NULL";
|
||||||
if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value);
|
if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value);
|
||||||
if (type == typeof(byte[])) return $"hextoraw('{CommonUtils.BytesSqlRaw(value as byte[])}')";
|
if (type == typeof(byte[]))
|
||||||
|
{
|
||||||
|
var valueBytes = value as byte[];
|
||||||
|
if (valueBytes != null)
|
||||||
|
{
|
||||||
|
if (valueBytes.Length < 2000) return $"hextoraw('{CommonUtils.BytesSqlRaw(valueBytes)}')";
|
||||||
|
var pam = AppendParamter(specialParams, $"p_{specialParams?.Count}{specialParamFlag}", col, type, value);
|
||||||
|
return pam.ParameterName;
|
||||||
|
}
|
||||||
|
}
|
||||||
return FormatSql("{0}", value, 1);
|
return FormatSql("{0}", value, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user