From ef6d790dcc84584630afcafc5f133bee3ea2a766 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Fri, 23 Dec 2022 08:22:11 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=A2=9E=E5=8A=A0=20FreeSqlBuilder=20UseQu?= =?UTF-8?q?oteSqlName=20=E8=AE=BE=E7=BD=AE=E4=B8=8D=E4=BD=BF=E7=94=A8=20[]?= =?UTF-8?q?=20``=20""=20=E9=99=90=E5=AE=9A=E7=AC=A6=E5=8F=B7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Examples/base_entity/Program.cs | 2 +- FreeSql.DbContext/FreeSql.DbContext.xml | 9 +++ FreeSql/FreeSql.xml | 67 +--------------- FreeSql/FreeSqlBuilder.cs | 18 +++-- FreeSql/FreeSqlBuilder_Obsolete.cs | 80 ------------------- FreeSql/Internal/CommonUtils.cs | 9 ++- FreeSql/Internal/FreeSqlBuilderTypes.cs | 43 ---------- .../ClickHouseUtils.cs | 2 +- .../FreeSql.Provider.Custom/CustomUtils.cs | 2 +- .../MySql/CustomMySqlUtils.cs | 2 +- .../Oracle/CustomOracleUtils.cs | 2 +- .../PostgreSQL/CustomPostgreSQLUtils.cs | 2 +- .../SqlServer/CustomSqlServerUtils.cs | 2 +- .../FreeSql.Provider.Dameng/DamengUtils.cs | 2 +- .../FirebirdUtils.cs | 2 +- .../FreeSql.Provider.GBase/GBaseUtils.cs | 2 +- .../KingbaseESUtils.cs | 2 +- .../MsAccessUtils.cs | 2 +- .../FreeSql.Provider.MySql/MySqlUtils.cs | 2 +- .../MySqlConnectorUtils.cs | 2 +- .../Dameng/OdbcDamengUtils.cs | 2 +- .../Default/OdbcUtils.cs | 2 +- .../KingbaseES/OdbcKingbaseESUtils.cs | 2 +- .../MySql/OdbcMySqlUtils.cs | 2 +- .../Oracle/OdbcOracleUtils.cs | 2 +- .../PostgreSQL/OdbcPostgreSQLUtils.cs | 2 +- .../SqlServer/OdbcSqlServerUtils.cs | 2 +- .../FreeSql.Provider.Oracle/OracleUtils.cs | 2 +- .../OracleOledbUtils.cs | 2 +- .../PostgreSQLUtils.cs | 2 +- .../ShenTongUtils.cs | 2 +- .../SqlServerUtils.cs | 2 +- .../FreeSql.Provider.Sqlite/SqliteUtils.cs | 2 +- 33 files changed, 56 insertions(+), 224 deletions(-) delete mode 100644 FreeSql/FreeSqlBuilder_Obsolete.cs diff --git a/Examples/base_entity/Program.cs b/Examples/base_entity/Program.cs index 3dad8a00..322bc651 100644 --- a/Examples/base_entity/Program.cs +++ b/Examples/base_entity/Program.cs @@ -452,7 +452,7 @@ namespace base_entity .UseConnectionString(FreeSql.DataType.Firebird, @"database=localhost:D:\fbdata\EXAMPLES.fdb;user=sysdba;password=123456;max pool size=5") - + .UseQuoteSqlName(false) //.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=2") diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 594fbad3..537315e2 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -733,6 +733,15 @@ + + + 根据Assembly扫描所有继承IEntityTypeConfiguration<T>的配置类 + + + + + + 创建普通数据上下文档对象 diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml index 302c8ee7..ecf9a71d 100644 --- a/FreeSql/FreeSql.xml +++ b/FreeSql/FreeSql.xml @@ -1336,7 +1336,7 @@ 数据库类型 数据库连接串 - 提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场 + 提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场例如：typeof(FreeSql.SqlServer.SqlServerProvider<>) @@ -1352,7 +1352,7 @@ 数据库类型 数据库连接对象创建器 - 提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场 + 提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场例如：typeof(FreeSql.SqlServer.SqlServerProvider<>) @@ -1439,29 +1439,6 @@ - - - 转小写同步结构 - - true:转小写, false:不转 - - - - - 转大写同步结构 - - true:转大写, false:不转 - - - - - 自动转换实体属性名称 Entity Property -> Db Filed - - *不会覆盖 [Column] 特性设置的Name - - - - 指定事务对象 @@ -4174,46 +4151,6 @@ BigApple -> bigapple - - - 不进行任何处理 - - - - - 将帕斯卡命名字符串转换为下划线分隔字符串 - - BigApple -> Big_Apple - - - - - 将帕斯卡命名字符串转换为下划线分隔字符串，且转换为全大写 - - BigApple -> BIG_APPLE - - - - - 将帕斯卡命名字符串转换为下划线分隔字符串，且转换为全小写 - - BigApple -> big_apple - - - - - 将字符串转换为大写 - - BigApple -> BIGAPPLE - - - - - 将字符串转换为小写 - - BigApple -> bigapple - - 创建一个过滤器 diff --git a/FreeSql/FreeSqlBuilder.cs b/FreeSql/FreeSqlBuilder.cs index 51e3b3dc..013bc061 100644 --- a/FreeSql/FreeSqlBuilder.cs +++ b/FreeSql/FreeSqlBuilder.cs @@ -18,15 +18,13 @@ namespace FreeSql int[] _slaveWeights; Func _connectionFactory; bool _isAutoSyncStructure = false; - bool _isSyncStructureToLower = false; - bool _isSyncStructureToUpper = false; bool _isConfigEntityFromDbFirst = false; bool _isNoneCommandParameter = false; bool _isGenerateCommandParameterWithLambda = false; bool _isLazyLoading = false; bool _isExitAutoDisposePool = true; + bool _isQuoteSqlName = true; MappingPriorityType[] _mappingPriorityTypes; - StringConvertType _entityPropertyConvertType = StringConvertType.None; NameConvertType _nameConvertType = NameConvertType.None; Action _aopCommandExecuting = null; Action _aopCommandExecuted = null; @@ -37,7 +35,7 @@ namespace FreeSql /// /// 数据库类型 /// 数据库连接串 - /// 提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场 + /// 提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场例如：typeof(FreeSql.SqlServer.SqlServerProvider<>) /// public FreeSqlBuilder UseConnectionString(DataType dataType, string connectionString, Type providerType = null) { @@ -69,7 +67,7 @@ namespace FreeSql /// /// 数据库类型 /// 数据库连接对象创建器 - /// 提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场 + /// 提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场例如：typeof(FreeSql.SqlServer.SqlServerProvider<>) /// public FreeSqlBuilder UseConnectionFactory(DataType dataType, Func connectionFactory, Type providerType = null) { @@ -161,6 +159,11 @@ namespace FreeSql _nameConvertType = convertType; return this; } + public FreeSqlBuilder UseQuoteSqlName(bool value) + { + _isQuoteSqlName = value; + return this; + } /// /// 指定映射优先级 @@ -337,8 +340,6 @@ namespace FreeSql { ret.CodeFirst.IsAutoSyncStructure = _isAutoSyncStructure; - ret.CodeFirst.IsSyncStructureToLower = _isSyncStructureToLower; - ret.CodeFirst.IsSyncStructureToUpper = _isSyncStructureToUpper; ret.CodeFirst.IsConfigEntityFromDbFirst = _isConfigEntityFromDbFirst; ret.CodeFirst.IsNoneCommandParameter = _isNoneCommandParameter; ret.CodeFirst.IsGenerateCommandParameterWithLambda = _isGenerateCommandParameterWithLambda; @@ -352,7 +353,6 @@ namespace FreeSql if (_aopCommandExecuted != null) ret.Aop.CommandAfter += new EventHandler((s, e) => _aopCommandExecuted?.Invoke(e.Command, e.Log)); - this.EntityPropertyNameConvert(ret); //添加实体属性名全局AOP转换处理 if (_nameConvertType != NameConvertType.None) { @@ -517,6 +517,8 @@ namespace FreeSql if (_slaveWeights != null) for (var x = 0; x < _slaveWeights.Length; x++) ret.Ado.SlavePools[x].Policy.Weight = _slaveWeights[x]; + + (ret.Select() as Select0Provider)._commonUtils.IsQuoteSqlName = _isQuoteSqlName; } return ret; diff --git a/FreeSql/FreeSqlBuilder_Obsolete.cs b/FreeSql/FreeSqlBuilder_Obsolete.cs deleted file mode 100644 index b4021628..00000000 --- a/FreeSql/FreeSqlBuilder_Obsolete.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Data.Common; -using System.Linq; -using System.Reflection; -using FreeSql.DataAnnotations; -using FreeSql.Internal; - -namespace FreeSql -{ - partial class FreeSqlBuilder - { - - /// - /// 转小写同步结构 - /// - /// true:转小写, false:不转 - /// - [Obsolete("请使用 UseNameConvert(NameConvertType.ToLower)，或者 fsql.CodeFirst.IsSyncStructureToLower = value")] - public FreeSqlBuilder UseSyncStructureToLower(bool value) - { - _isSyncStructureToLower = value; - return this; - } - /// - /// 转大写同步结构 - /// - /// true:转大写, false:不转 - /// - [Obsolete("请使用 UseNameConvert(NameConvertType.ToUpper)，或者 fsql.CodeFirst.IsSyncStructureToUpper = value")] - public FreeSqlBuilder UseSyncStructureToUpper(bool value) - { - _isSyncStructureToUpper = value; - return this; - } - - /// - /// 自动转换实体属性名称 Entity Property -> Db Filed - /// - /// *不会覆盖 [Column] 特性设置的Name - /// - /// - /// - [Obsolete("请使用 UseNameConvert 功能")] - public FreeSqlBuilder UseEntityPropertyNameConvert(StringConvertType convertType) - { - _entityPropertyConvertType = convertType; - return this; - } - - void EntityPropertyNameConvert(IFreeSql fsql) - { - //添加实体属性名全局AOP转换处理 - if (_entityPropertyConvertType != StringConvertType.None) - { - string PascalCaseToUnderScore(string str) => string.IsNullOrWhiteSpace(str) ? str : string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x.ToString() : x.ToString())); - - switch (_entityPropertyConvertType) - { - case StringConvertType.Lower: - fsql.Aop.ConfigEntityProperty += (_, e) => e.ModifyResult.Name = e.ModifyResult.Name?.ToLower(); - break; - case StringConvertType.Upper: - fsql.Aop.ConfigEntityProperty += (_, e) => e.ModifyResult.Name = e.ModifyResult.Name?.ToUpper(); - break; - case StringConvertType.PascalCaseToUnderscore: - fsql.Aop.ConfigEntityProperty += (_, e) => e.ModifyResult.Name = PascalCaseToUnderScore(e.ModifyResult.Name); - break; - case StringConvertType.PascalCaseToUnderscoreWithLower: - fsql.Aop.ConfigEntityProperty += (_, e) => e.ModifyResult.Name = PascalCaseToUnderScore(e.ModifyResult.Name)?.ToLower(); - break; - case StringConvertType.PascalCaseToUnderscoreWithUpper: - fsql.Aop.ConfigEntityProperty += (_, e) => e.ModifyResult.Name = PascalCaseToUnderScore(e.ModifyResult.Name)?.ToUpper(); - break; - default: - break; - } - } - } - } -} diff --git a/FreeSql/Internal/CommonUtils.cs b/FreeSql/Internal/CommonUtils.cs index 8ad03191..bc848f6b 100644 --- a/FreeSql/Internal/CommonUtils.cs +++ b/FreeSql/Internal/CommonUtils.cs @@ -28,7 +28,14 @@ namespace FreeSql.Internal public abstract DbParameter AppendParamter(List _params, string parameterName, ColumnInfo col, Type type, object value); public abstract DbParameter[] GetDbParamtersByObject(string sql, object obj); public abstract string FormatSql(string sql, params object[] args); - public abstract string QuoteSqlName(params string[] name); + + public bool IsQuoteSqlName = true; + public string QuoteSqlName(params string[] name) { + if (IsQuoteSqlName) return QuoteSqlNameAdapter(name); + if (name == null) return ""; + return string.Join(".", name); + } + public abstract string QuoteSqlNameAdapter(params string[] name); public abstract string TrimQuoteSqlName(string name); public abstract string[] SplitTableName(string name); public static string[] GetSplitTableNames(string name, char leftQuote, char rightQuote, int size) diff --git a/FreeSql/Internal/FreeSqlBuilderTypes.cs b/FreeSql/Internal/FreeSqlBuilderTypes.cs index 4d3a4541..4910e886 100644 --- a/FreeSql/Internal/FreeSqlBuilderTypes.cs +++ b/FreeSql/Internal/FreeSqlBuilderTypes.cs @@ -79,47 +79,4 @@ namespace FreeSql.Internal ToLower } - public enum StringConvertType - { - /// - /// 不进行任何处理 - /// - None = 0, - - /// - /// 将帕斯卡命名字符串转换为下划线分隔字符串 - /// - /// BigApple -> Big_Apple - /// - PascalCaseToUnderscore, - - /// - /// 将帕斯卡命名字符串转换为下划线分隔字符串，且转换为全大写 - /// - /// BigApple -> BIG_APPLE - /// - PascalCaseToUnderscoreWithUpper, - - /// - /// 将帕斯卡命名字符串转换为下划线分隔字符串，且转换为全小写 - /// - /// BigApple -> big_apple - /// - PascalCaseToUnderscoreWithLower, - - /// - /// 将字符串转换为大写 - /// - /// BigApple -> BIGAPPLE - /// - Upper, - - /// - /// 将字符串转换为小写 - /// - /// BigApple -> bigapple - /// - Lower - } - } \ No newline at end of file diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs index 4a40da88..126b0704 100644 --- a/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs +++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs @@ -79,7 +79,7 @@ namespace FreeSql.ClickHouse public override string FormatSql(string sql, params object[] args) => sql?.FormatClickHouse(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Custom/CustomUtils.cs b/Providers/FreeSql.Provider.Custom/CustomUtils.cs index c3a99a4c..8e18320f 100644 --- a/Providers/FreeSql.Provider.Custom/CustomUtils.cs +++ b/Providers/FreeSql.Provider.Custom/CustomUtils.cs @@ -41,7 +41,7 @@ namespace FreeSql.Custom static FreeSql.Custom.CustomAdo _customAdo = new FreeSql.Custom.CustomAdo(); public override string FormatSql(string sql, params object[] args) => (_orm?.Ado as CustomAdo)?.Addslashes(sql, args) ?? _customAdo.Addslashes(sql, args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs index 2cdf0a46..82db8cfc 100644 --- a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs +++ b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs @@ -41,7 +41,7 @@ namespace FreeSql.Custom.MySql }); public override string FormatSql(string sql, params object[] args) => sql?.FormatCustomMySql(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Custom/Oracle/CustomOracleUtils.cs b/Providers/FreeSql.Provider.Custom/Oracle/CustomOracleUtils.cs index f1950fc7..1d31435d 100644 --- a/Providers/FreeSql.Provider.Custom/Oracle/CustomOracleUtils.cs +++ b/Providers/FreeSql.Provider.Custom/Oracle/CustomOracleUtils.cs @@ -71,7 +71,7 @@ namespace FreeSql.Custom.Oracle }); public override string FormatSql(string sql, params object[] args) => sql?.FormatCustomOracle(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLUtils.cs b/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLUtils.cs index 7e83cfa8..e59fd9e8 100644 --- a/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLUtils.cs +++ b/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLUtils.cs @@ -97,7 +97,7 @@ namespace FreeSql.Custom.PostgreSQL }); public override string FormatSql(string sql, params object[] args) => sql?.FormatCustomPostgreSQL(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerUtils.cs b/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerUtils.cs index 0a78ff34..9bb034d7 100644 --- a/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerUtils.cs +++ b/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerUtils.cs @@ -49,7 +49,7 @@ namespace FreeSql.Custom.SqlServer }); public override string FormatSql(string sql, params object[] args) => sql?.FormatCustomSqlServer(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Dameng/DamengUtils.cs b/Providers/FreeSql.Provider.Dameng/DamengUtils.cs index cfee3da5..ce0c1ed2 100644 --- a/Providers/FreeSql.Provider.Dameng/DamengUtils.cs +++ b/Providers/FreeSql.Provider.Dameng/DamengUtils.cs @@ -82,7 +82,7 @@ namespace FreeSql.Dameng }); public override string FormatSql(string sql, params object[] args) => sql?.FormatDameng(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs b/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs index 2655e2f0..ba07d24d 100644 --- a/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs +++ b/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs @@ -52,7 +52,7 @@ namespace FreeSql.Firebird }); public override string FormatSql(string sql, params object[] args) => sql?.FormatFirebird(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.GBase/GBaseUtils.cs b/Providers/FreeSql.Provider.GBase/GBaseUtils.cs index b2c243ca..c59177f2 100644 --- a/Providers/FreeSql.Provider.GBase/GBaseUtils.cs +++ b/Providers/FreeSql.Provider.GBase/GBaseUtils.cs @@ -56,7 +56,7 @@ namespace FreeSql.GBase }); public override string FormatSql(string sql, params object[] args) => sql?.FormatGBase(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESUtils.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESUtils.cs index f70ad987..3dba7e74 100644 --- a/Providers/FreeSql.Provider.KingbaseES/KingbaseESUtils.cs +++ b/Providers/FreeSql.Provider.KingbaseES/KingbaseESUtils.cs @@ -92,7 +92,7 @@ namespace FreeSql.KingbaseES }); public override string FormatSql(string sql, params object[] args) => sql?.FormatKingbaseES(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.MsAccess/MsAccessUtils.cs b/Providers/FreeSql.Provider.MsAccess/MsAccessUtils.cs index 35ca64fe..bdb5046e 100644 --- a/Providers/FreeSql.Provider.MsAccess/MsAccessUtils.cs +++ b/Providers/FreeSql.Provider.MsAccess/MsAccessUtils.cs @@ -38,7 +38,7 @@ namespace FreeSql.MsAccess }); public override string FormatSql(string sql, params object[] args) => sql?.FormatAccess(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs index 7ca8d271..a1622cc6 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs @@ -73,7 +73,7 @@ namespace FreeSql.MySql }); public override string FormatSql(string sql, params object[] args) => sql?.FormatMySql(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs b/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs index 7a7b8084..ad08572d 100644 --- a/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs +++ b/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs @@ -91,7 +91,7 @@ namespace FreeSql.MySql } public override string FormatSql(string sql, params object[] args) => sql?.FormatMySql(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengUtils.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengUtils.cs index 9ce96dbb..862decf2 100644 --- a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengUtils.cs @@ -71,7 +71,7 @@ namespace FreeSql.Odbc.Dameng }); public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcDameng(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Odbc/Default/OdbcUtils.cs b/Providers/FreeSql.Provider.Odbc/Default/OdbcUtils.cs index 328bfe2a..b16ad50d 100644 --- a/Providers/FreeSql.Provider.Odbc/Default/OdbcUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/Default/OdbcUtils.cs @@ -39,7 +39,7 @@ namespace FreeSql.Odbc.Default static FreeSql.Odbc.Default.OdbcAdo _customAdo = new FreeSql.Odbc.Default.OdbcAdo(); public override string FormatSql(string sql, params object[] args) => (_orm?.Ado as OdbcAdo)?.Addslashes(sql, args) ?? _customAdo.Addslashes(sql, args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESUtils.cs b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESUtils.cs index c8a0b400..536b8b80 100644 --- a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESUtils.cs @@ -91,7 +91,7 @@ namespace FreeSql.Odbc.KingbaseES }); public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcKingbaseES(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs index 0ec715b9..d78f43ea 100644 --- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs @@ -37,7 +37,7 @@ namespace FreeSql.Odbc.MySql }); public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcMySql(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleUtils.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleUtils.cs index a7920b0e..4530b4b7 100644 --- a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleUtils.cs @@ -71,7 +71,7 @@ namespace FreeSql.Odbc.Oracle }); public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcOracle(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLUtils.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLUtils.cs index e5fab3d3..e9b463b6 100644 --- a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLUtils.cs @@ -91,7 +91,7 @@ namespace FreeSql.Odbc.PostgreSQL }); public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcPostgreSQL(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerUtils.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerUtils.cs index d98487d3..8513e0b2 100644 --- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerUtils.cs @@ -43,7 +43,7 @@ namespace FreeSql.Odbc.SqlServer }); public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcSqlServer(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Oracle/OracleUtils.cs b/Providers/FreeSql.Provider.Oracle/OracleUtils.cs index 5fc1d27f..51661c0c 100644 --- a/Providers/FreeSql.Provider.Oracle/OracleUtils.cs +++ b/Providers/FreeSql.Provider.Oracle/OracleUtils.cs @@ -100,7 +100,7 @@ namespace FreeSql.Oracle }); public override string FormatSql(string sql, params object[] args) => sql?.FormatOracle(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.OracleOledb/OracleOledbUtils.cs b/Providers/FreeSql.Provider.OracleOledb/OracleOledbUtils.cs index 77f6f3ef..edfa2da2 100644 --- a/Providers/FreeSql.Provider.OracleOledb/OracleOledbUtils.cs +++ b/Providers/FreeSql.Provider.OracleOledb/OracleOledbUtils.cs @@ -104,7 +104,7 @@ namespace FreeSql.Oracle }); public override string FormatSql(string sql, params object[] args) => sql?.FormatOracle(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs index 2fb59508..96ae3dfa 100644 --- a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs +++ b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs @@ -132,7 +132,7 @@ namespace FreeSql.PostgreSQL }); public override string FormatSql(string sql, params object[] args) => sql?.FormatPostgreSQL(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.ShenTong/ShenTongUtils.cs b/Providers/FreeSql.Provider.ShenTong/ShenTongUtils.cs index 001ff7e1..9e0db7e1 100644 --- a/Providers/FreeSql.Provider.ShenTong/ShenTongUtils.cs +++ b/Providers/FreeSql.Provider.ShenTong/ShenTongUtils.cs @@ -105,7 +105,7 @@ namespace FreeSql.ShenTong }); public override string FormatSql(string sql, params object[] args) => sql?.FormatShenTong(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs index 5a692876..987f0817 100644 --- a/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs +++ b/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs @@ -59,7 +59,7 @@ namespace FreeSql.SqlServer }); public override string FormatSql(string sql, params object[] args) => sql?.FormatSqlServer(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) { diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteUtils.cs b/Providers/FreeSql.Provider.Sqlite/SqliteUtils.cs index 631f6cb5..083df5aa 100644 --- a/Providers/FreeSql.Provider.Sqlite/SqliteUtils.cs +++ b/Providers/FreeSql.Provider.Sqlite/SqliteUtils.cs @@ -82,7 +82,7 @@ namespace FreeSql.Sqlite }); public override string FormatSql(string sql, params object[] args) => sql?.FormatSqlite(args); - public override string QuoteSqlName(params string[] name) + public override string QuoteSqlNameAdapter(params string[] name) { if (name.Length == 1) {