From 8b2c3fd122e7687b80c4008e1068afc5e658146c Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Tue, 23 May 2017 06:16:59 +0800 Subject: [PATCH] - --- OrmTest/Demo/Delete.cs | 2 +- OrmTest/Demo/Insert.cs | 2 +- OrmTest/Demo/Query.cs | 2 +- OrmTest/Demo/Update.cs | 2 +- OrmTest/PerformanceTesting/SqlSugarPerformance.cs | 2 +- OrmTest/UnitTest/Delete.cs | 2 +- OrmTest/UnitTest/Insert.cs | 2 +- OrmTest/UnitTest/Query/JoinQuery.cs | 2 +- OrmTest/UnitTest/Query/SelectQuery.cs | 2 +- OrmTest/UnitTest/Query/SingleQuery.cs | 2 +- OrmTest/UnitTest/Setting/AutoClose.cs | 2 +- OrmTest/UnitTest/Setting/MapColumn.cs | 2 +- OrmTest/UnitTest/Setting/MapTable.cs | 2 +- OrmTest/UnitTest/Update.cs | 2 +- .../Abstract/DbMaintenanceProvider/DbMaintenanceProvider.cs | 2 +- SqlSugar/Entities/ConnectionConfig.cs | 2 +- SqlSugar/SqlSugarClient.cs | 6 +++--- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/OrmTest/Demo/Delete.cs b/OrmTest/Demo/Delete.cs index 97408d966..7bba81db2 100644 --- a/OrmTest/Demo/Delete.cs +++ b/OrmTest/Demo/Delete.cs @@ -32,7 +32,7 @@ namespace OrmTest.Demo public static SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); db.Ado.IsEnableLogEvent = true; db.Ado.LogEventStarting = (sql, pars) => { diff --git a/OrmTest/Demo/Insert.cs b/OrmTest/Demo/Insert.cs index c80976552..49e5578b0 100644 --- a/OrmTest/Demo/Insert.cs +++ b/OrmTest/Demo/Insert.cs @@ -53,7 +53,7 @@ namespace OrmTest.Demo public static SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); db.Ado.IsEnableLogEvent = true; db.Ado.LogEventStarting = (sql, pars) => { diff --git a/OrmTest/Demo/Query.cs b/OrmTest/Demo/Query.cs index b99320181..cad90faa3 100644 --- a/OrmTest/Demo/Query.cs +++ b/OrmTest/Demo/Query.cs @@ -186,7 +186,7 @@ namespace OrmTest.Demo public static SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); db.Ado.IsEnableLogEvent = true; db.Ado.LogEventStarting = (sql, pars) => { diff --git a/OrmTest/Demo/Update.cs b/OrmTest/Demo/Update.cs index 8130f06c8..4316544a1 100644 --- a/OrmTest/Demo/Update.cs +++ b/OrmTest/Demo/Update.cs @@ -47,7 +47,7 @@ namespace OrmTest.Demo } public static SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); db.Ado.IsEnableLogEvent = true; db.Ado.LogEventStarting = (sql, pars) => { diff --git a/OrmTest/PerformanceTesting/SqlSugarPerformance.cs b/OrmTest/PerformanceTesting/SqlSugarPerformance.cs index 46315c4d1..18e77ff60 100644 --- a/OrmTest/PerformanceTesting/SqlSugarPerformance.cs +++ b/OrmTest/PerformanceTesting/SqlSugarPerformance.cs @@ -16,7 +16,7 @@ namespace OrmTest.PerformanceTesting } public void Select() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, diff --git a/OrmTest/UnitTest/Delete.cs b/OrmTest/UnitTest/Delete.cs index 219748f5d..5f39c908d 100644 --- a/OrmTest/UnitTest/Delete.cs +++ b/OrmTest/UnitTest/Delete.cs @@ -55,7 +55,7 @@ namespace OrmTest public SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); return db; } } diff --git a/OrmTest/UnitTest/Insert.cs b/OrmTest/UnitTest/Insert.cs index 91e62f82e..f082fc9af 100644 --- a/OrmTest/UnitTest/Insert.cs +++ b/OrmTest/UnitTest/Insert.cs @@ -118,7 +118,7 @@ INSERT INTO [Student] public SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); return db; } } diff --git a/OrmTest/UnitTest/Query/JoinQuery.cs b/OrmTest/UnitTest/Query/JoinQuery.cs index 7a24be3bc..322da056e 100644 --- a/OrmTest/UnitTest/Query/JoinQuery.cs +++ b/OrmTest/UnitTest/Query/JoinQuery.cs @@ -71,7 +71,7 @@ namespace OrmTest.UnitTest public SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer }); db.Ado.IsEnableLogEvent = true; db.Ado.LogEventStarting = (sql, pars) => { diff --git a/OrmTest/UnitTest/Query/SelectQuery.cs b/OrmTest/UnitTest/Query/SelectQuery.cs index 8516f6fc8..4df9eac20 100644 --- a/OrmTest/UnitTest/Query/SelectQuery.cs +++ b/OrmTest/UnitTest/Query/SelectQuery.cs @@ -87,7 +87,7 @@ namespace OrmTest.UnitTest public SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer }); return db; } } diff --git a/OrmTest/UnitTest/Query/SingleQuery.cs b/OrmTest/UnitTest/Query/SingleQuery.cs index 83002a14e..839fd6341 100644 --- a/OrmTest/UnitTest/Query/SingleQuery.cs +++ b/OrmTest/UnitTest/Query/SingleQuery.cs @@ -116,7 +116,7 @@ namespace OrmTest.UnitTest public SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer }); return db; } } diff --git a/OrmTest/UnitTest/Setting/AutoClose.cs b/OrmTest/UnitTest/Setting/AutoClose.cs index 738fe3aca..fc0431164 100644 --- a/OrmTest/UnitTest/Setting/AutoClose.cs +++ b/OrmTest/UnitTest/Setting/AutoClose.cs @@ -29,7 +29,7 @@ namespace OrmTest.UnitTest } public SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); return db; } } diff --git a/OrmTest/UnitTest/Setting/MapColumn.cs b/OrmTest/UnitTest/Setting/MapColumn.cs index 5a0a38777..ec5fae8a7 100644 --- a/OrmTest/UnitTest/Setting/MapColumn.cs +++ b/OrmTest/UnitTest/Setting/MapColumn.cs @@ -11,7 +11,7 @@ namespace OrmTest.UnitTest { public SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer }); return db; } } diff --git a/OrmTest/UnitTest/Setting/MapTable.cs b/OrmTest/UnitTest/Setting/MapTable.cs index 81843a385..0c87c2bf7 100644 --- a/OrmTest/UnitTest/Setting/MapTable.cs +++ b/OrmTest/UnitTest/Setting/MapTable.cs @@ -25,7 +25,7 @@ namespace OrmTest.UnitTest } public SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); return db; } } diff --git a/OrmTest/UnitTest/Update.cs b/OrmTest/UnitTest/Update.cs index c6b0e0eff..d7e676cef 100644 --- a/OrmTest/UnitTest/Update.cs +++ b/OrmTest/UnitTest/Update.cs @@ -121,7 +121,7 @@ UNION ALL public SqlSugarClient GetInstance() { - SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + SqlSugarClient db = new SqlSugarClient(new SystemTableConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); return db; } } diff --git a/SqlSugar/Abstract/DbMaintenanceProvider/DbMaintenanceProvider.cs b/SqlSugar/Abstract/DbMaintenanceProvider/DbMaintenanceProvider.cs index d6ba962f4..5f0f4364f 100644 --- a/SqlSugar/Abstract/DbMaintenanceProvider/DbMaintenanceProvider.cs +++ b/SqlSugar/Abstract/DbMaintenanceProvider/DbMaintenanceProvider.cs @@ -84,7 +84,7 @@ namespace SqlSugar } private bool IsSystemTables() { - var isSystemTables = Context.CurrentConnectionConfig is SystemTablesConfig; + var isSystemTables = Context.CurrentConnectionConfig is SystemTableConfig; return isSystemTables; } #endregion diff --git a/SqlSugar/Entities/ConnectionConfig.cs b/SqlSugar/Entities/ConnectionConfig.cs index 775743394..c3389401b 100644 --- a/SqlSugar/Entities/ConnectionConfig.cs +++ b/SqlSugar/Entities/ConnectionConfig.cs @@ -12,7 +12,7 @@ namespace SqlSugar bool IsAutoCloseConnection { get; set; } } - public class SystemTablesConfig : IConnectionConfig + public class SystemTableConfig : IConnectionConfig { public string DbType { get; set; } public string ConnectionString { get; set; } diff --git a/SqlSugar/SqlSugarClient.cs b/SqlSugar/SqlSugarClient.cs index 860a029c2..416352926 100644 --- a/SqlSugar/SqlSugarClient.cs +++ b/SqlSugar/SqlSugarClient.cs @@ -20,7 +20,7 @@ namespace SqlSugar { get { - return this.CurrentConnectionConfig is SystemTablesConfig; + return this.CurrentConnectionConfig is SystemTableConfig; } } #endregion @@ -30,7 +30,7 @@ namespace SqlSugar /// If you have system table permissions, use this /// /// - public SqlSugarClient(SystemTablesConfig config) + public SqlSugarClient(SystemTableConfig config) { base.Context = this; base.CurrentConnectionConfig = config; @@ -53,7 +53,7 @@ namespace SqlSugar /// /// /// - public SqlSugarClient(SystemTablesConfig masterConnectionConfig, IConnectionConfig[] slaveConnectionConfigs) + public SqlSugarClient(SystemTableConfig masterConnectionConfig, IConnectionConfig[] slaveConnectionConfigs) { base.Context = this; base.CurrentConnectionConfig = masterConnectionConfig;