diff --git a/Src/Asp.Net/SqlSugar/Entities/ConnectionConfig.cs b/Src/Asp.Net/SqlSugar/Entities/ConnectionConfig.cs index 59057cdbb..006a693c3 100644 --- a/Src/Asp.Net/SqlSugar/Entities/ConnectionConfig.cs +++ b/Src/Asp.Net/SqlSugar/Entities/ConnectionConfig.cs @@ -10,7 +10,7 @@ namespace SqlSugar /// ///DbType.SqlServer Or Other /// - public string DbType { get; set; } + public DbType DbType { get; set; } /// ///Database Connection string /// diff --git a/Src/Asp.Net/SqlSugar/Entities/DbType.cs b/Src/Asp.Net/SqlSugar/Entities/DbType.cs deleted file mode 100644 index 202b23010..000000000 --- a/Src/Asp.Net/SqlSugar/Entities/DbType.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace SqlSugar -{ - public partial class DbType - { - public const string MySql = "MySql"; - public const string SqlServer = "SqlServer"; - public const string Sqlite = "Sqlite"; - public const string Oracle = "Oracle"; - } -} diff --git a/Src/Asp.Net/SqlSugar/Enum/DbType.cs b/Src/Asp.Net/SqlSugar/Enum/DbType.cs new file mode 100644 index 000000000..51be78f4e --- /dev/null +++ b/Src/Asp.Net/SqlSugar/Enum/DbType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace SqlSugar +{ + public enum DbType + { + MySql , + SqlServer, + Sqlite, + Oracle + } +} diff --git a/Src/Asp.Net/SqlSugar/Infrastructure/InstanceFactory.cs b/Src/Asp.Net/SqlSugar/Infrastructure/InstanceFactory.cs index 525f912a9..db3d42196 100644 --- a/Src/Asp.Net/SqlSugar/Infrastructure/InstanceFactory.cs +++ b/Src/Asp.Net/SqlSugar/Infrastructure/InstanceFactory.cs @@ -21,7 +21,7 @@ namespace SqlSugar else { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } @@ -35,7 +35,7 @@ namespace SqlSugar else { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } @@ -49,7 +49,7 @@ namespace SqlSugar else { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } @@ -57,35 +57,35 @@ namespace SqlSugar public static ISugarQueryable GetQueryable(ConnectionConfig currentConnectionConfig) { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } public static ISugarQueryable GetQueryable(ConnectionConfig currentConnectionConfig) { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } public static ISugarQueryable GetQueryable(ConnectionConfig currentConnectionConfig) { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } public static ISugarQueryable GetQueryable(ConnectionConfig currentConnectionConfig) { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } public static ISugarQueryable GetQueryable(ConnectionConfig currentConnectionConfig) { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } @@ -94,28 +94,28 @@ namespace SqlSugar public static ISugarQueryable GetQueryable(ConnectionConfig currentConnectionConfig) { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } public static ISugarQueryable GetQueryable(ConnectionConfig currentConnectionConfig) { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } public static ISugarQueryable GetQueryable(ConnectionConfig currentConnectionConfig) { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } public static ISugarQueryable GetQueryable(ConnectionConfig currentConnectionConfig) { string className = "Queryable"; - className = GetClassName(currentConnectionConfig.DbType, className); + className = GetClassName(currentConnectionConfig.DbType.ToString(), className); ISugarQueryable result = CreateInstance>(className); return result; } @@ -131,23 +131,23 @@ namespace SqlSugar } else { - QueryBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "QueryBuilder")); + QueryBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "QueryBuilder")); return result; } } public static InsertBuilder GetInsertBuilder(ConnectionConfig currentConnectionConfig) { - InsertBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "InsertBuilder")); + InsertBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "InsertBuilder")); return result; } public static UpdateBuilder GetUpdateBuilder(ConnectionConfig currentConnectionConfig) { - UpdateBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "UpdateBuilder")); + UpdateBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "UpdateBuilder")); return result; } public static DeleteBuilder GetDeleteBuilder(ConnectionConfig currentConnectionConfig) { - DeleteBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "DeleteBuilder")); + DeleteBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "DeleteBuilder")); return result; } @@ -159,44 +159,44 @@ namespace SqlSugar } else { - ILambdaExpressions result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "ExpressionContext")); + ILambdaExpressions result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "ExpressionContext")); return result; } } public static ISqlBuilder GetSqlbuilder(ConnectionConfig currentConnectionConfig) { - ISqlBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "Builder")); + ISqlBuilder result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "Builder")); return result; } public static IDbBind GetDbBind(ConnectionConfig currentConnectionConfig) { - IDbBind result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "DbBind")); + IDbBind result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "DbBind")); return result; } public static IDbMaintenance GetDbMaintenance(ConnectionConfig currentConnectionConfig) { - IDbMaintenance result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "DbMaintenance")); + IDbMaintenance result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "DbMaintenance")); return result; } public static IDbFirst GetDbFirst(ConnectionConfig currentConnectionConfig) { - IDbFirst result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "DbFirst")); + IDbFirst result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "DbFirst")); return result; } public static ICodeFirst GetCodeFirst(ConnectionConfig currentConnectionConfig) { - ICodeFirst result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "CodeFirst")); + ICodeFirst result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "CodeFirst")); return result; } public static IAdo GetAdo(ConnectionConfig currentConnectionConfig) { - IAdo result = CreateInstance(GetClassName(currentConnectionConfig.DbType, "Provider")); + IAdo result = CreateInstance(GetClassName(currentConnectionConfig.DbType.ToString(), "Provider")); return result; } diff --git a/Src/Asp.Net/SqlSugar/SqlSugar.csproj b/Src/Asp.Net/SqlSugar/SqlSugar.csproj index 3fd4c4db3..84e6bee7b 100644 --- a/Src/Asp.Net/SqlSugar/SqlSugar.csproj +++ b/Src/Asp.Net/SqlSugar/SqlSugar.csproj @@ -71,6 +71,7 @@ + @@ -111,7 +112,6 @@ -