- 修复 DataType 在 Cumstom 项目下的设置问题；#2153

2881099 · 2881099 · commit cb287e83a692 · 2025-11-21T20:33:33.000+08:00
diff --git a/Providers/FreeSql.Provider.Custom/CustomAdo/CustomAdo.cs b/Providers/FreeSql.Provider.Custom/CustomAdo/CustomAdo.cs
@@ -17,7 +17,7 @@ public CustomAdo(CommonUtils util, string masterConnectionString, string[] slave
             base._util = util;
             if (connectionFactory != null)
             {
-                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);
+                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.Custom, connectionFactory);
                 ConnectionString = pool.TestConnection?.ConnectionString;
                 MasterPool = pool;
                 _CreateCommandConnection = pool.TestConnection;
diff --git a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlAdo/CustomMySqlAdo.cs b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlAdo/CustomMySqlAdo.cs
@@ -13,13 +13,13 @@ public class CustomMySqlAdo : FreeSql.Internal.CommonProvider.AdoProvider
     {
         DbProviderFactory Factory => FreeSqlCustomAdapterGlobalExtensions.GetDbProviderFactory(_util._orm);
 
-        public CustomMySqlAdo() : base(DataType.OdbcMySql, null, null) { }
-        public CustomMySqlAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.OdbcMySql, masterConnectionString, slaveConnectionStrings)
+        public CustomMySqlAdo() : base(DataType.CustomMySql, null, null) { }
+        public CustomMySqlAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.CustomMySql, masterConnectionString, slaveConnectionStrings)
         {
             base._util = util;
             if (connectionFactory != null)
             {
-                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);
+                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.CustomMySql, connectionFactory);
                 ConnectionString = pool.TestConnection?.ConnectionString;
                 MasterPool = pool;
                 return;
diff --git a/Providers/FreeSql.Provider.Custom/Oracle/CustomOracleAdo/CustomOracleAdo.cs b/Providers/FreeSql.Provider.Custom/Oracle/CustomOracleAdo/CustomOracleAdo.cs
@@ -14,13 +14,13 @@ class CustomOracleAdo : FreeSql.Internal.CommonProvider.AdoProvider
     {
         DbProviderFactory Factory => FreeSqlCustomAdapterGlobalExtensions.GetDbProviderFactory(_util._orm);
 
-        public CustomOracleAdo() : base(DataType.OdbcOracle, null, null) { }
-        public CustomOracleAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.OdbcOracle, masterConnectionString, slaveConnectionStrings)
+        public CustomOracleAdo() : base(DataType.CustomOracle, null, null) { }
+        public CustomOracleAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.CustomOracle, masterConnectionString, slaveConnectionStrings)
         {
             base._util = util;
             if (connectionFactory != null)
             {
-                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);
+                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.CustomOracle, connectionFactory);
                 ConnectionString = pool.TestConnection?.ConnectionString;
                 MasterPool = pool;
                 using (var conn = pool.Get())
diff --git a/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLAdo/CustomPostgreSQLAdo.cs b/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLAdo/CustomPostgreSQLAdo.cs
@@ -14,13 +14,13 @@ class CustomPostgreSQLAdo : FreeSql.Internal.CommonProvider.AdoProvider
     {
         DbProviderFactory Factory => FreeSqlCustomAdapterGlobalExtensions.GetDbProviderFactory(_util._orm);
 
-        public CustomPostgreSQLAdo() : base(DataType.OdbcPostgreSQL, null, null) { }
-        public CustomPostgreSQLAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.OdbcPostgreSQL, masterConnectionString, slaveConnectionStrings)
+        public CustomPostgreSQLAdo() : base(DataType.CustomPostgreSQL, null, null) { }
+        public CustomPostgreSQLAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.CustomPostgreSQL, masterConnectionString, slaveConnectionStrings)
         {
             base._util = util;
             if (connectionFactory != null)
             {
-                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);
+                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.CustomPostgreSQL, connectionFactory);
                 ConnectionString = pool.TestConnection?.ConnectionString;
                 MasterPool = pool;
                 return;
diff --git a/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerAdo/CustomSqlServerAdo.cs b/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerAdo/CustomSqlServerAdo.cs
@@ -14,13 +14,13 @@ class CustomSqlServerAdo : FreeSql.Internal.CommonProvider.AdoProvider
     {
         DbProviderFactory Factory => FreeSqlCustomAdapterGlobalExtensions.GetDbProviderFactory(_util._orm);
 
-        public CustomSqlServerAdo() : base(DataType.OdbcSqlServer, null, null) { }
-        public CustomSqlServerAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.OdbcSqlServer, masterConnectionString, slaveConnectionStrings)
+        public CustomSqlServerAdo() : base(DataType.CustomSqlServer, null, null) { }
+        public CustomSqlServerAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.CustomSqlServer, masterConnectionString, slaveConnectionStrings)
         {
             base._util = util;
             if (connectionFactory != null)
             {
-                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);
+                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.CustomSqlServer, connectionFactory);
                 ConnectionString = pool.TestConnection?.ConnectionString;
                 MasterPool = pool;
                 return;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public CustomAdo(CommonUtils util, string masterConnectionString, string[] slave`
`17`	`17`	`base._util = util;`
`18`	`18`	`if (connectionFactory != null)`
`19`	`19`	`{`
`20`		`- var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);`
	`20`	`+ var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.Custom, connectionFactory);`
`21`	`21`	`ConnectionString = pool.TestConnection?.ConnectionString;`
`22`	`22`	`MasterPool = pool;`
`23`	`23`	`_CreateCommandConnection = pool.TestConnection;`
Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,13 @@ public class CustomMySqlAdo : FreeSql.Internal.CommonProvider.AdoProvider`
`13`	`13`	`{`
`14`	`14`	`DbProviderFactory Factory => FreeSqlCustomAdapterGlobalExtensions.GetDbProviderFactory(_util._orm);`
`15`	`15`
`16`		`- public CustomMySqlAdo() : base(DataType.OdbcMySql, null, null) { }`
`17`		`- public CustomMySqlAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.OdbcMySql, masterConnectionString, slaveConnectionStrings)`
	`16`	`+ public CustomMySqlAdo() : base(DataType.CustomMySql, null, null) { }`
	`17`	`+ public CustomMySqlAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.CustomMySql, masterConnectionString, slaveConnectionStrings)`
`18`	`18`	`{`
`19`	`19`	`base._util = util;`
`20`	`20`	`if (connectionFactory != null)`
`21`	`21`	`{`
`22`		`- var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);`
	`22`	`+ var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.CustomMySql, connectionFactory);`
`23`	`23`	`ConnectionString = pool.TestConnection?.ConnectionString;`
`24`	`24`	`MasterPool = pool;`
`25`	`25`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,13 @@ class CustomOracleAdo : FreeSql.Internal.CommonProvider.AdoProvider`
`14`	`14`	`{`
`15`	`15`	`DbProviderFactory Factory => FreeSqlCustomAdapterGlobalExtensions.GetDbProviderFactory(_util._orm);`
`16`	`16`
`17`		`- public CustomOracleAdo() : base(DataType.OdbcOracle, null, null) { }`
`18`		`- public CustomOracleAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.OdbcOracle, masterConnectionString, slaveConnectionStrings)`
	`17`	`+ public CustomOracleAdo() : base(DataType.CustomOracle, null, null) { }`
	`18`	`+ public CustomOracleAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.CustomOracle, masterConnectionString, slaveConnectionStrings)`
`19`	`19`	`{`
`20`	`20`	`base._util = util;`
`21`	`21`	`if (connectionFactory != null)`
`22`	`22`	`{`
`23`		`- var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);`
	`23`	`+ var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.CustomOracle, connectionFactory);`
`24`	`24`	`ConnectionString = pool.TestConnection?.ConnectionString;`
`25`	`25`	`MasterPool = pool;`
`26`	`26`	`using (var conn = pool.Get())`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,13 @@ class CustomPostgreSQLAdo : FreeSql.Internal.CommonProvider.AdoProvider`
`14`	`14`	`{`
`15`	`15`	`DbProviderFactory Factory => FreeSqlCustomAdapterGlobalExtensions.GetDbProviderFactory(_util._orm);`
`16`	`16`
`17`		`- public CustomPostgreSQLAdo() : base(DataType.OdbcPostgreSQL, null, null) { }`
`18`		`- public CustomPostgreSQLAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.OdbcPostgreSQL, masterConnectionString, slaveConnectionStrings)`
	`17`	`+ public CustomPostgreSQLAdo() : base(DataType.CustomPostgreSQL, null, null) { }`
	`18`	`+ public CustomPostgreSQLAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.CustomPostgreSQL, masterConnectionString, slaveConnectionStrings)`
`19`	`19`	`{`
`20`	`20`	`base._util = util;`
`21`	`21`	`if (connectionFactory != null)`
`22`	`22`	`{`
`23`		`- var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);`
	`23`	`+ var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.CustomPostgreSQL, connectionFactory);`
`24`	`24`	`ConnectionString = pool.TestConnection?.ConnectionString;`
`25`	`25`	`MasterPool = pool;`
`26`	`26`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,13 @@ class CustomSqlServerAdo : FreeSql.Internal.CommonProvider.AdoProvider`
`14`	`14`	`{`
`15`	`15`	`DbProviderFactory Factory => FreeSqlCustomAdapterGlobalExtensions.GetDbProviderFactory(_util._orm);`
`16`	`16`
`17`		`- public CustomSqlServerAdo() : base(DataType.OdbcSqlServer, null, null) { }`
`18`		`- public CustomSqlServerAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.OdbcSqlServer, masterConnectionString, slaveConnectionStrings)`
	`17`	`+ public CustomSqlServerAdo() : base(DataType.CustomSqlServer, null, null) { }`
	`18`	`+ public CustomSqlServerAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.CustomSqlServer, masterConnectionString, slaveConnectionStrings)`
`19`	`19`	`{`
`20`	`20`	`base._util = util;`
`21`	`21`	`if (connectionFactory != null)`
`22`	`22`	`{`
`23`		`- var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);`
	`23`	`+ var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.CustomSqlServer, connectionFactory);`
`24`	`24`	`ConnectionString = pool.TestConnection?.ConnectionString;`
`25`	`25`	`MasterPool = pool;`
`26`	`26`	`return;`