Synchronization code

Src/Asp.Net/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs

@@ -384,7 +384,7 @@ namespace SqlSugar
             {
                 value = columnInfo.DefaultValue;
             }
-            else if (columnInfo.DataType.ObjToString().ToLower().IsIn("int","int4","bigint","int8","int2")&& columnInfo.DefaultValue.IsInt()) 
+            else if (columnInfo.DataType.ObjToString().ToLower().IsIn("float","double","decimal","int","int4","bigint","int8","int2")&& columnInfo.DefaultValue.IsInt()) 
             {
                 value = columnInfo.DefaultValue;
             }

Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs

@@ -211,19 +211,23 @@ namespace SqlSugar
         }
         public ISugarQueryable<T, T2> LeftJoinIF<T2>(bool isLeftJoin, Expression<Func<T, T2, bool>> joinExpression) 
         {
+            var oldAsName = this.QueryBuilder.AsTables?.ToDictionary(it=>it.Key,it=>it.Value); 
             var result = LeftJoin(joinExpression);
             if (isLeftJoin == false)
             {
                 result.QueryBuilder.JoinQueryInfos.Remove(result.QueryBuilder.JoinQueryInfos.Last());
+                result.QueryBuilder.AsTables = oldAsName;
             }
             return result;
         }
         public ISugarQueryable<T, T2> InnerJoinIF<T2>(bool isJoin, Expression<Func<T, T2, bool>> joinExpression)
         {
+            var oldAsName = this.QueryBuilder.AsTables?.ToDictionary(it => it.Key, it => it.Value);
             var result = InnerJoin(joinExpression);
             if (isJoin == false)
             {
                 result.QueryBuilder.JoinQueryInfos.Remove(result.QueryBuilder.JoinQueryInfos.Last());
+                result.QueryBuilder.AsTables = oldAsName;
             }
             return result;
         }

Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs

@@ -538,7 +538,7 @@ namespace SqlSugar
                     break;
                 case DbType.HANA:
                     Check.Exception(SugarCompatible.IsFramework, "NANA only support .net core");
-                    InstanceFactory.CustomDllName = "SqlSugar.HanaConnector";
+                    InstanceFactory.CustomDllName = "SqlSugar.HANAConnector";
                     break;
                 case DbType.Xugu:
                     Check.Exception(SugarCompatible.IsFramework, "Xugu only support .net core");
@@ -549,6 +549,10 @@ namespace SqlSugar
                 case DbType.GoldenDB:
                     config.DbType = DbType.MySql;
                     break;
+                case DbType.DB2:
+                    Check.Exception(SugarCompatible.IsFramework, "Db2 only support .net core");
+                    InstanceFactory.CustomDllName = "SqlSugar.Db2Core";
+                    break;
                 default:
                     throw new Exception("ConnectionConfig.DbType is null");
             }

Src/Asp.Net/SqlSugar/Enum/DbType.cs

@@ -36,6 +36,7 @@ namespace SqlSugar
         TDSQLForPGODBC, 
         TDSQL,
         HANA,
+        DB2,
         Custom =900
     }
 }

Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve_Item.cs

@@ -262,6 +262,16 @@ namespace SqlSugar
                 var value = GetNewExpressionValue(item);
                 parameter.Context.Result.Append($" {value} AS {asName} ");
             }
+            else if (item is ConditionalExpression)
+            {
+                var value = GetNewExpressionValue(item);
+                parameter.Context.Result.Append($" {value} AS {asName} ");
+            }
+            else if (ExpressionTool.GetMethodName(item)==nameof(SqlFunc.IIF))
+            {
+                var value = GetNewExpressionValue(item);
+                parameter.Context.Result.Append($" {value} AS {asName} ");
+            }
             else
             {
                 asName = GetAsNameResolveAnObject(parameter, item, asName, isSameType);

Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs

@@ -144,6 +144,10 @@ namespace SqlSugar
             var leftString = GetNewExpressionValue(expression.Left);
             var RightString = GetNewExpressionValue(expression.Right);
             var joinString = this.Context.DbMehtods.MergeString(leftString, RightString);
+            if (this.Context is KdbndpExpressionContext&&this.Context?.SugarContext?.Context?.CurrentConnectionConfig?.MoreSettings?.DatabaseModel==DbType.SqlServer) 
+            {
+                joinString = new SqlServerMethod().MergeString(leftString, RightString);
+            }
             if (this.Context.Result.Contains(ExpressionConst.FormatSymbol))
             {
                 base.Context.Result.Replace("{0}", $" {joinString} ");

Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs

@@ -780,7 +780,14 @@ namespace SqlSugar
             string shortName = expression.Expression.ToString();
             string fieldName = expression.Member.Name;
             fieldName = this.Context.GetDbColumnName(expression.Expression.Type.Name, fieldName);
+            if (UtilMethods.GetMoreSetting(this.Context).IsCorrectErrorSqlParameterName)
+            {
+                fieldName = Context.GetTranslationColumnName(shortName) + UtilConstants.Dot + Context.GetTranslationColumnName(fieldName);
+            }
+            else
+            {
                 fieldName = Context.GetTranslationColumnName(shortName + UtilConstants.Dot + fieldName);
+            }
             return fieldName;
         }
 

Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs

@@ -186,6 +186,10 @@ namespace SqlSugar
                 {
                     var asName = this.context.GetTranslationTableName(asItems.First().Replace(subKey, ""), false);
                     var repKey = $"\\{this.context.SqlTranslationLeft}.+\\{this.context.SqlTranslationRight}";
+                    if (this.context.IsSingle&&this.context.JoinIndex==0&&this.context.CurrentShortName.HasValue()&& isAsAttr&& !asName.Contains(this.context.CurrentShortName))
+                    {
+                        asName = asName + " " + this.context.CurrentShortName+" ";
+                    }
                     sqlItems[i] = Regex.Replace(sqlItems[i], repKey, asName);
                 }
             }
@@ -195,11 +199,17 @@ namespace SqlSugar
             for (int i = 0; i < sqlItems.Count; i++)
             {
                 if (sqlItems[i].StartsWith("FROM " + this.context.SqlTranslationLeft))
+                {
+                    if (isAsAttr&&sqlItems[i].EndsWith(this.context.CurrentShortName + " "))
+                    {
+                    }
+                    else
                     {
                         sqlItems[i] = sqlItems[i] + " " + this.context.CurrentShortName + " ";
                     }
                 }
             }
+        }
 
         private List<string> GetSubItems()
         {

Src/Asp.Net/SqlSugar/Infrastructure/InstanceFactory.cs

@@ -436,6 +436,14 @@ namespace SqlSugar
             {
                 return CustomNamespace + "."+CustomDbName + name;
             }
+            else if (type == "HANA")
+            {
+                return InstanceFactory.CustomDllName + "." + type + name;
+            }
+            else if (type == "DB2")
+            {
+                return "SqlSugar.DB2."+ type+ name;
+            }
             else
             {
                 //if (!string.IsNullOrEmpty(CustomDllName)) 

Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs

@@ -1821,5 +1821,10 @@ namespace SqlSugar
             }
             return true;
         }
+
+        internal static ConnMoreSettings GetMoreSetting(ExpressionContext context)
+        {
+            return context?.SugarContext?.Context?.CurrentConnectionConfig?.MoreSettings ?? new ConnMoreSettings();
+        }
     }
 }