From 2fa8f455a6ca036a1fa478414726b42e6f4e8ec5 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 29 May 2017 01:30:23 +0800 Subject: [PATCH] - --- SqlServerTest/Demo/DbFirst.cs | 15 ++++++++++ SqlServerTest/Demo/Delete.cs | 14 +-------- SqlServerTest/Demo/DemoBase.cs | 23 +++++++++++++++ SqlServerTest/Demo/Insert.cs | 29 ++++++------------- SqlServerTest/Demo/Query.cs | 15 +--------- SqlServerTest/Demo/Update.cs | 20 ++++--------- SqlServerTest/SqlServerTest.csproj | 2 ++ .../DbFirstProvider/DbFirstProvider.cs | 17 ++++++++--- 8 files changed, 69 insertions(+), 66 deletions(-) create mode 100644 SqlServerTest/Demo/DbFirst.cs create mode 100644 SqlServerTest/Demo/DemoBase.cs diff --git a/SqlServerTest/Demo/DbFirst.cs b/SqlServerTest/Demo/DbFirst.cs new file mode 100644 index 000000000..48ca0c2e8 --- /dev/null +++ b/SqlServerTest/Demo/DbFirst.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace OrmTest.Demo +{ + public class DbFirst + { + public static void Init() + { + + } + } +} \ No newline at end of file diff --git a/SqlServerTest/Demo/Delete.cs b/SqlServerTest/Demo/Delete.cs index ff8583a2c..960434203 100644 --- a/SqlServerTest/Demo/Delete.cs +++ b/SqlServerTest/Demo/Delete.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace OrmTest.Demo { - public class Delete + public class Delete:DemoBase { public static void Init() { @@ -29,17 +29,5 @@ namespace OrmTest.Demo //by expression var t5 = db.Deleteable().Where(it => it.Id == 1).ExecuteCommand(); } - - public static SqlSugarClient GetInstance() - { - SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); - db.Ado.IsEnableLogEvent = true; - db.Ado.LogEventStarting = (sql, pars) => - { - Console.WriteLine(sql + "\r\n" + db.RewritableMethods.SerializeObject(pars)); - Console.WriteLine(); - }; - return db; - } } } diff --git a/SqlServerTest/Demo/DemoBase.cs b/SqlServerTest/Demo/DemoBase.cs new file mode 100644 index 000000000..9cbda2855 --- /dev/null +++ b/SqlServerTest/Demo/DemoBase.cs @@ -0,0 +1,23 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace OrmTest.Demo +{ + public class DemoBase + { + public static SqlSugarClient GetInstance() + { + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + db.Ado.IsEnableLogEvent = true; + db.Ado.LogEventStarting = (sql, pars) => + { + Console.WriteLine(sql + "\r\n" + db.RewritableMethods.SerializeObject(pars)); + Console.WriteLine(); + }; + return db; + } + } +} diff --git a/SqlServerTest/Demo/Insert.cs b/SqlServerTest/Demo/Insert.cs index dd724c45e..ede006939 100644 --- a/SqlServerTest/Demo/Insert.cs +++ b/SqlServerTest/Demo/Insert.cs @@ -8,13 +8,14 @@ using System.Threading.Tasks; namespace OrmTest.Demo { - public class Insert + public class Insert:DemoBase { - public static void Init() { + public static void Init() + { var db = GetInstance(); db.IgnoreColumns.Add("TestId", "Student"); - var insertObj = new Student() { Name = "jack", CreateTime = Convert.ToDateTime("2010-1-1") ,SchoolId=1}; + var insertObj = new Student() { Name = "jack", CreateTime = Convert.ToDateTime("2010-1-1"), SchoolId = 1 }; //Insert reutrn Insert Count var t2 = db.Insertable(insertObj).ExecuteCommand(); @@ -24,20 +25,20 @@ namespace OrmTest.Demo //Only insert Name - var t4 = db.Insertable(insertObj).InsertColumns(it => new { it.Name,it.SchoolId }).ExecuteReutrnIdentity(); + var t4 = db.Insertable(insertObj).InsertColumns(it => new { it.Name, it.SchoolId }).ExecuteReutrnIdentity(); //Ignore TestId var t5 = db.Insertable(insertObj).IgnoreColumns(it => new { it.Name, it.TestId }).ExecuteReutrnIdentity(); - - + + //Ignore TestId var t6 = db.Insertable(insertObj).IgnoreColumns(it => it == "Name" || it == "TestId").ExecuteReutrnIdentity(); - + //Use Lock var t8 = db.Insertable(insertObj).With(SqlWith.UpdLock).ExecuteCommand(); - + var insertObj2 = new Student() { Name = null, CreateTime = Convert.ToDateTime("2010-1-1") }; var t9 = db.Insertable(insertObj2).Where(true/* Is insert null */, true/*off identity*/).ExecuteCommand(); @@ -50,17 +51,5 @@ namespace OrmTest.Demo } var s9 = db.Insertable(insertObjs.ToArray()).InsertColumns(it => new { it.Name }).ExecuteCommand(); } - - public static SqlSugarClient GetInstance() - { - SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); - db.Ado.IsEnableLogEvent = true; - db.Ado.LogEventStarting = (sql, pars) => - { - Console.WriteLine(sql + "\r\n" + db.RewritableMethods.SerializeObject(pars)); - Console.WriteLine(); - }; - return db; - } } } diff --git a/SqlServerTest/Demo/Query.cs b/SqlServerTest/Demo/Query.cs index 82a786585..ce4cb5a69 100644 --- a/SqlServerTest/Demo/Query.cs +++ b/SqlServerTest/Demo/Query.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace OrmTest.Demo { - public class Query + public class Query:DemoBase { public static void Init() @@ -273,18 +273,5 @@ namespace OrmTest.Demo .Select("st.*").ToList(); //SELECT st.* FROM [Student] st Left JOIN School sh ON sh.id=st.schoolid WHERE st.id>@id } - - - public static SqlSugarClient GetInstance() - { - SqlSugarClient db = new SqlSugarClient(new ConnectionConfig{ ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); - db.Ado.IsEnableLogEvent = true; - db.Ado.LogEventStarting = (sql, pars) => - { - Console.WriteLine(sql + "\r\n" + db.RewritableMethods.SerializeObject(pars)); - Console.WriteLine(); - }; - return db; - } } } diff --git a/SqlServerTest/Demo/Update.cs b/SqlServerTest/Demo/Update.cs index 1bbe90130..bfe7f4702 100644 --- a/SqlServerTest/Demo/Update.cs +++ b/SqlServerTest/Demo/Update.cs @@ -8,9 +8,10 @@ using System.Threading.Tasks; namespace OrmTest.Demo { - public class Update + public class Update : DemoBase { - public static void Init() { + public static void Init() + { var db = GetInstance(); var updateObj = new Student() { Id = 1, Name = "jack", SchoolId = 0, CreateTime = Convert.ToDateTime("2017-05-21 09:56:12.610") }; var updateObjs = new List() { updateObj, new Student() { Id = 2, Name = "sun", SchoolId = 0 } }.ToArray(); @@ -19,7 +20,7 @@ namespace OrmTest.Demo //update reutrn Update Count - var t1= db.Updateable(updateObj).ExecuteCommand(); + var t1 = db.Updateable(updateObj).ExecuteCommand(); //Only update Name var t3 = db.Updateable(updateObj).UpdateColumns(it => new { it.Name }).ExecuteCommand(); @@ -47,23 +48,12 @@ namespace OrmTest.Demo //Update By Expression Where By Expression var t10 = db.Updateable() - .UpdateColumns(it => new Student() { Name="a",CreateTime=DateTime.Now }) + .UpdateColumns(it => new Student() { Name = "a", CreateTime = DateTime.Now }) .Where(it => it.Id == 11).ExecuteCommand(); //Rename db.Updateable().AS("Student").UpdateColumns(it => new School() { Name = "jack" }).Where(it => it.Id == 1).ExecuteCommand(); //Update Student set Name='jack' Where Id=1 } - public static SqlSugarClient GetInstance() - { - SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); - db.Ado.IsEnableLogEvent = true; - db.Ado.LogEventStarting = (sql, pars) => - { - Console.WriteLine(sql + "\r\n" + db.RewritableMethods.SerializeObject(pars)); - Console.WriteLine(); - }; - return db; - } } } diff --git a/SqlServerTest/SqlServerTest.csproj b/SqlServerTest/SqlServerTest.csproj index b9081da73..dbb750b3e 100644 --- a/SqlServerTest/SqlServerTest.csproj +++ b/SqlServerTest/SqlServerTest.csproj @@ -48,7 +48,9 @@ + + diff --git a/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs b/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs index eee674e80..106a3798d 100644 --- a/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs +++ b/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs @@ -119,6 +119,13 @@ namespace SqlSugar public Dictionary ToClassStringList(string nameSpace = "Models") { Dictionary result = new Dictionary(); + if (this.TableInfoList.IsValuable()) + { + foreach (var tableInfo in this.TableInfoList) + { + + } + } this.Namespace = nameSpace; return result; } @@ -132,13 +139,15 @@ namespace SqlSugar foreach (var item in classStringList) { string className = item.Key; - if (this.Context.MappingTables.IsValuable()) { - var mappingInfo = this.Context.MappingTables.FirstOrDefault(it => it.DbTableName.Equals(item.Key,StringComparison.CurrentCultureIgnoreCase)); - if (mappingInfo.IsValuable()) { + if (this.Context.MappingTables.IsValuable()) + { + var mappingInfo = this.Context.MappingTables.FirstOrDefault(it => it.DbTableName.Equals(item.Key, StringComparison.CurrentCultureIgnoreCase)); + if (mappingInfo.IsValuable()) + { className = mappingInfo.EntityName; } } - FileHeper.CreateFile(directoryPath.TrimEnd('\\').TrimEnd('/') +string.Format("{0}\\.cs", className), item.Value, Encoding.UTF8); + FileHeper.CreateFile(directoryPath.TrimEnd('\\').TrimEnd('/') + string.Format("{0}\\.cs", className), item.Value, Encoding.UTF8); } } }