Merge branch 'dev' of github.com:sunkaixuan/SqlSugar

# Conflicts:
#	Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs
#	Src/Asp.Net/SqlSugar/SqlSugar.nuspec

README.md

@@ -55,6 +55,26 @@ var skip5 = db.Queryable<Student>().Skip(5).ToList();
 ``` 
 
 ### 1.4 Join
+
+#### easy join 
+```c
+//2 join
+var list5 = db.Queryable<Student, School>((st, sc) => st.SchoolId == sc.Id).Select((st,sc)=>new {st.Name,st.Id,schoolName=sc.Name}).ToList();
+```
+
+```c
+//3 join 
+var list6 = db.Queryable<Student, School,School>((st, sc,sc2) => st.SchoolId == sc.Id&&sc.Id==sc2.Id)
+    .Select((st, sc,sc2) => new { st.Name, st.Id, schoolName = sc.Name,schoolName2=sc2.Name }).ToList();
+ ```
+ 
+ ```c
+//3 join page
+var list7= db.Queryable<Student, School, School>((st, sc, sc2) => st.SchoolId == sc.Id && sc.Id == sc2.Id)
+.Select((st, sc, sc2) => new { st.Name, st.Id, schoolName = sc.Name, schoolName2 = sc2.Name }).ToPageList(1,2);
+```
+
+#### left join  
 ```c
 //join  2
 var list = db.Queryable<Student, School>((st, sc) => new object[] {

Src/Asp.Net/SqlServerTest/Demos/1_Query.cs

@@ -164,7 +164,7 @@ namespace OrmTest.Demo
             var getFirstOrDefault = db.Queryable<Student>().First();
             var getByWhere = db.Queryable<Student>().Where(it => it.Id == 1 || it.Name == "a").ToList();
             var getByFuns = db.Queryable<Student>().Where(it => SqlFunc.IsNullOrEmpty(it.Name)).ToList();
-            var sum = db.Queryable<Student>().Sum(it => it.Id);
+            var sum = db.Queryable<Student>().Select(it => it.SchoolId).ToList();
             var sum2 = db.Queryable<Student,School>((st,sc)=>st.SchoolId==sc.Id).Sum((st,sc) => sc.Id);
             var isAny = db.Queryable<Student>().Where(it => it.Id == -1).Any();
             var isAny2 = db.Queryable<Student>().Any(it => it.Id == -1);

Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs

@@ -135,7 +135,7 @@ namespace SqlSugar
                     }
                     else
                     {
-                        reval.Add((T)Convert.ChangeType(re.GetValue(0), type));
+                        reval.Add((T)Convert.ChangeType(re.GetValue(0),PubMethod.GetUnderType(type)));
                     }
                 }
             }

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

@@ -10,8 +10,9 @@ namespace SqlSugar
         #region DML
         public virtual List<DbTableInfo> GetViewInfoList()
         {
-            string key = "DbMaintenanceProvider.GetViewInfoList";
+            string cacheKey = "DbMaintenanceProvider.GetViewInfoList";
-            var result = GetListOrCache<DbTableInfo>(key, this.GetViewInfoListSql);
+            cacheKey = GetCacheKey(cacheKey);
+            var result = GetListOrCache<DbTableInfo>(cacheKey, this.GetViewInfoListSql);
             foreach (var item in result)
             {
                 item.DbObjectType = DbObjectType.View;
@@ -20,8 +21,9 @@ namespace SqlSugar
         }
         public virtual List<DbTableInfo> GetTableInfoList()
         {
-            string key = "DbMaintenanceProvider.GetTableInfoList";
+            string cacheKey = "DbMaintenanceProvider.GetTableInfoList";
-            var result = GetListOrCache<DbTableInfo>(key, this.GetTableInfoListSql);
+            cacheKey = GetCacheKey(cacheKey);
+            var result = GetListOrCache<DbTableInfo>(cacheKey, this.GetTableInfoListSql);
             foreach (var item in result)
             {
                 item.DbObjectType = DbObjectType.Table;
@@ -31,12 +33,14 @@ namespace SqlSugar
         public virtual List<DbColumnInfo> GetColumnInfosByTableName(string tableName)
         {
             if (string.IsNullOrEmpty(tableName)) return new List<DbColumnInfo>();
-            string key = "DbMaintenanceProvider.GetColumnInfosByTableName." +this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            string cacheKey = "DbMaintenanceProvider.GetColumnInfosByTableName." + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
-            return GetListOrCache<DbColumnInfo>(key, string.Format(this.GetColumnInfosByTableNameSql, tableName));
+            cacheKey = GetCacheKey(cacheKey);
+            return GetListOrCache<DbColumnInfo>(cacheKey, string.Format(this.GetColumnInfosByTableNameSql, tableName));
         }
         public virtual List<string> GetIsIdentities(string tableName)
         {
             string cacheKey = "DbMaintenanceProvider.GetIsIdentities" + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            cacheKey = GetCacheKey(cacheKey);
             return this.Context.RewritableMethods.GetCacheInstance<List<string>>().Func(cacheKey,
                     (cm, key) =>
                     {
@@ -51,6 +55,7 @@ namespace SqlSugar
         public virtual List<string> GetPrimaries(string tableName)
         {
             string cacheKey = "DbMaintenanceProvider.GetPrimaries" + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            cacheKey = GetCacheKey(cacheKey);
             return this.Context.RewritableMethods.GetCacheInstance<List<string>>().Func(cacheKey,
             (cm, key) =>
             {
@@ -108,6 +113,7 @@ namespace SqlSugar
         {
             this.Context.Ado.CheckConnection();
             string sql = this.CheckSystemTablePermissionsSql;
+            this.Context.Ado.CheckConnection();
             try
             {
                 var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
@@ -267,6 +273,10 @@ namespace SqlSugar
             string result = string.Format(this.AlterColumnToTableSql, tableName, columnName, dataType, dataSize, nullType, primaryKey, identity);
             return result;
         }
+        protected virtual string GetCacheKey(string cacheKey)
+        {
+            return this.Context.CurrentConnectionConfig.DbType + "." + this.Context.Ado.Connection.Database +"."+ cacheKey;
+        }
         #endregion
     }
 }

Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.1.2")]
+[assembly: AssemblyVersion("4.2.1.6")]
-[assembly: AssemblyFileVersion("4.2.1.2")]
+[assembly: AssemblyFileVersion("4.2.1.6")]

Src/Asp.Net/SqlSugar/Realization/Sqlite/DbMaintenance/SqliteDbMaintenance.cs

@@ -167,6 +167,7 @@ namespace SqlSugar
         public override List<DbColumnInfo> GetColumnInfosByTableName(string tableName)
         {
             string cacheKey = "DbMaintenanceProvider.GetColumnInfosByTableName." + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            cacheKey = GetCacheKey(cacheKey);
             return this.Context.RewritableMethods.GetCacheInstance<List<DbColumnInfo>>().Func(cacheKey,
                     (cm, key) =>
                     {

Src/Asp.Net/SqlSugar/SqlSugar.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>sqlSugar</id>
-    <version>4.2.1.2</version>
+    <version>4.2.1.6</version>
     <title>SqlSugar SqlServer ORM</title>
     <authors>sun kaixuan</authors>
     <owners>landa</owners>

Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs

@@ -10,8 +10,9 @@ namespace SqlSugar
         #region DML
         public virtual List<DbTableInfo> GetViewInfoList()
         {
-            string key = "DbMaintenanceProvider.GetViewInfoList";
+            string cacheKey = "DbMaintenanceProvider.GetViewInfoList";
-            var result = GetListOrCache<DbTableInfo>(key, this.GetViewInfoListSql);
+            cacheKey = GetCacheKey(cacheKey);
+            var result = GetListOrCache<DbTableInfo>(cacheKey, this.GetViewInfoListSql);
             foreach (var item in result)
             {
                 item.DbObjectType = DbObjectType.View;
@@ -20,8 +21,9 @@ namespace SqlSugar
         }
         public virtual List<DbTableInfo> GetTableInfoList()
         {
-            string key = "DbMaintenanceProvider.GetTableInfoList";
+            string cacheKey = "DbMaintenanceProvider.GetTableInfoList";
-            var result = GetListOrCache<DbTableInfo>(key, this.GetTableInfoListSql);
+            cacheKey = GetCacheKey(cacheKey);
+            var result = GetListOrCache<DbTableInfo>(cacheKey, this.GetTableInfoListSql);
             foreach (var item in result)
             {
                 item.DbObjectType = DbObjectType.Table;
@@ -31,12 +33,14 @@ namespace SqlSugar
         public virtual List<DbColumnInfo> GetColumnInfosByTableName(string tableName)
         {
             if (string.IsNullOrEmpty(tableName)) return new List<DbColumnInfo>();
-            string key = "DbMaintenanceProvider.GetColumnInfosByTableName." +this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            string cacheKey = "DbMaintenanceProvider.GetColumnInfosByTableName." + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
-            return GetListOrCache<DbColumnInfo>(key, string.Format(this.GetColumnInfosByTableNameSql, tableName));
+            cacheKey = GetCacheKey(cacheKey);
+            return GetListOrCache<DbColumnInfo>(cacheKey, string.Format(this.GetColumnInfosByTableNameSql, tableName));
         }
         public virtual List<string> GetIsIdentities(string tableName)
         {
             string cacheKey = "DbMaintenanceProvider.GetIsIdentities" + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            cacheKey = GetCacheKey(cacheKey);
             return this.Context.RewritableMethods.GetCacheInstance<List<string>>().Func(cacheKey,
                     (cm, key) =>
                     {
@@ -51,6 +55,7 @@ namespace SqlSugar
         public virtual List<string> GetPrimaries(string tableName)
         {
             string cacheKey = "DbMaintenanceProvider.GetPrimaries" + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            cacheKey = GetCacheKey(cacheKey);
             return this.Context.RewritableMethods.GetCacheInstance<List<string>>().Func(cacheKey,
             (cm, key) =>
             {
@@ -107,11 +112,11 @@ namespace SqlSugar
         public virtual bool IsAnySystemTablePermissions()
         {
             string sql = this.CheckSystemTablePermissionsSql;
+            this.Context.Ado.CheckConnection();
             try
             {
                 var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
                 this.Context.Ado.IsEnableLogEvent = false;
-                this.Context.Ado.CheckConnection();
                 this.Context.Ado.ExecuteCommand(sql);
                 this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
                 return true;
@@ -267,6 +272,10 @@ namespace SqlSugar
             string result = string.Format(this.AlterColumnToTableSql, tableName, columnName, dataType, dataSize, nullType, primaryKey, identity);
             return result;
         }
+        protected virtual string GetCacheKey(string cacheKey)
+        {
+            return this.Context.CurrentConnectionConfig.DbType + "." + this.Context.Ado.Connection.Database +"."+ cacheKey;
+        }
         #endregion
     }
 }

Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs

@@ -17,5 +17,5 @@ using System.Runtime.InteropServices;
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1c022a5c-4e4d-4026-a8a3-f659b9740a1a")]
-[assembly: AssemblyVersion("4.2.1.1")]
+[assembly: AssemblyVersion("4.2.1.5")]
-[assembly: AssemblyFileVersion("4.2.1.1")]
+[assembly: AssemblyFileVersion("4.2.1.5")]

Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/Sqlite/DbMaintenance/SqliteDbMaintenance.cs

@@ -168,6 +168,7 @@ namespace SqlSugar
         public override List<DbColumnInfo> GetColumnInfosByTableName(string tableName)
         {
             string cacheKey = "DbMaintenanceProvider.GetColumnInfosByTableName." + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            cacheKey = GetCacheKey(cacheKey);
             return this.Context.RewritableMethods.GetCacheInstance<List<DbColumnInfo>>().Func(cacheKey,
                     (cm, key) =>
                     {

Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>sqlSugarCore</id>
-    <version>4.2.1.1</version>
+    <version>4.2.1.5</version>
     <authors>sunkaixuan</authors>
     <owners>Landa</owners>
     <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
@@ -26,6 +26,6 @@
     </dependencies>
   </metadata>
   <files>
-   <file src="D:\MyGit\SqlSugar\Src\Asp.NetCore\SqlServerTest\src\SqlSugar\bin\Debug\netstandard1.6\SqlSugar.dll" target="lib\netstandard1.6"></file>
+   <file src="F:\MyOpenSource\SqlSugar4.XNew\SqlSugar\Src\Asp.NetCore\SqlServerTest\src\SqlSugar\bin\Debug\netstandard1.6\SqlSugar.dll" target="lib\netstandard1.6"></file>
   </files>
 </package>