- 修复 InsertDict SqlServer 下的问题；

Author: 2881099

Examples/base_entity/Program.cs

@@ -431,7 +431,7 @@ public class Xpb
         {
             [Column(Name = "ID", IsPrimary = true)]
             public string Id { get; set; }
-            [Column(Name = "XP")]
+            [Column(Name = "XP", StringLength = -1)]
             public byte[] Bytes { get; set; }
             [Column(Name = "UPLOAD_TIME")]
             public DateTime UploadTime { get; set; }
@@ -543,14 +543,14 @@ static void Main(string[] args)
 
                 //.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=toc;Pooling=true;Maximum Pool Size=2")
                 //.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")
-                .UseNameConvert(FreeSql.Internal.NameConvertType.ToUpper)
+                //.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)
 
                 //.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)
@@ -622,9 +622,9 @@ static void Main(string[] args)
 
             atimpl.GetTableNameByColumnValue(DateTime.Parse("2023-7-1"), autoExpand: true);
 
-            var dywhere = new DynamicFilterInfo { Field = "AspNetRoless.Name", Operator = DynamicFilterOperator.Equal, Value = "Admin" };
-            var method = typeof(ISelect<object>).GetMethod("WhereDynamicFilter");
-            var users4 = fsql.Select<AspNetUsers>().IncludeByPropertyName("AspNetUserRoless", then => then.WhereDynamicFilter(dywhere)).ToList();
+            //var dywhere = new DynamicFilterInfo { Field = "AspNetRoless.Name", Operator = DynamicFilterOperator.Equal, Value = "Admin" };
+            //var method = typeof(ISelect<object>).GetMethod("WhereDynamicFilter");
+            //var users4 = fsql.Select<AspNetUsers>().IncludeByPropertyName("AspNetUserRoless", then => then.WhereDynamicFilter(dywhere)).ToList();
 
 
             var type = typeof(Student);
@@ -924,8 +924,8 @@ static void Main(string[] args)
 
             var sqss = fsql.InsertDict(dic).AsTable("table1").ToSql();
             var sqss2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
-            sqss = fsql.InsertDict(dic).AsTable("table1").NoneParameter(false).ToSql();
-            sqss2 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter(false).ToSql();
+            sqss = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            sqss2 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
 
             dic["xxx"] = null;
             dic["yyy"] = 111;

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -622,7 +622,8 @@ public static void GetDictionaryTableInfo(T1 source, IFreeSql orm, ref TableInfo
                         Attribute = new DataAnnotations.ColumnAttribute
                         {
                             Name = colName,
-                            MapType = colType
+                            MapType = colType,
+                            DbType = "", //for SqlServer: ncharDbTypes.Any(a => mapColumn.Attribute.DbType.Contains(a))
                         },
                         CsType = colType
                     };

FreeSql/Internal/CommonProvider/UpdateProvider.cs

@@ -118,7 +118,16 @@ public override string GetNoneParamaterSqlValue(List<DbParameter> specialParams,
         {
             if (value == null) return "NULL";
             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);
         }
     }