- 增加 FreeSqlBuilder UseQuoteSqlName 设置不使用 [] `` "" 限定符号;

This commit is contained in:
2881099 2022-12-23 08:22:11 +08:00
parent 9fefbb94ec
commit ef6d790dcc
33 changed files with 56 additions and 224 deletions

View File

@ -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") .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") //.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")

View File

@ -733,6 +733,15 @@
<param name="modelBuilder"></param> <param name="modelBuilder"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSqlDbContextExtensions.ApplyConfigurationsFromAssembly(FreeSql.ICodeFirst,System.Reflection.Assembly,System.Func{System.Type,System.Boolean})">
<summary>
根据Assembly扫描所有继承IEntityTypeConfiguration&lt;T&gt;的配置类
</summary>
<param name="codeFirst"></param>
<param name="assembly"></param>
<param name="predicate"></param>
<returns></returns>
</member>
<member name="M:FreeSqlDbContextExtensions.CreateDbContext(IFreeSql)"> <member name="M:FreeSqlDbContextExtensions.CreateDbContext(IFreeSql)">
<summary> <summary>
创建普通数据上下文档对象 创建普通数据上下文档对象

View File

@ -1336,7 +1336,7 @@
</summary> </summary>
<param name="dataType">数据库类型</param> <param name="dataType">数据库类型</param>
<param name="connectionString">数据库连接串</param> <param name="connectionString">数据库连接串</param>
<param name="providerType">提供者的类型,一般不需要指定,如果一直提示“缺少 FreeSql 数据库实现包FreeSql.Provider.MySql.dll可前往 nuget 下载”的错误,说明反射获取不到类型,此时该参数可排上用场</param> <param name="providerType">提供者的类型,一般不需要指定,如果一直提示“缺少 FreeSql 数据库实现包FreeSql.Provider.MySql.dll可前往 nuget 下载”的错误,说明反射获取不到类型,此时该参数可排上用场<para></para>例如typeof(FreeSql.SqlServer.SqlServerProvider&lt;&gt;)</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.FreeSqlBuilder.UseSlave(System.String[])"> <member name="M:FreeSql.FreeSqlBuilder.UseSlave(System.String[])">
@ -1352,7 +1352,7 @@
</summary> </summary>
<param name="dataType">数据库类型</param> <param name="dataType">数据库类型</param>
<param name="connectionFactory">数据库连接对象创建器</param> <param name="connectionFactory">数据库连接对象创建器</param>
<param name="providerType">提供者的类型,一般不需要指定,如果一直提示“缺少 FreeSql 数据库实现包FreeSql.Provider.MySql.dll可前往 nuget 下载”的错误,说明反射获取不到类型,此时该参数可排上用场</param> <param name="providerType">提供者的类型,一般不需要指定,如果一直提示“缺少 FreeSql 数据库实现包FreeSql.Provider.MySql.dll可前往 nuget 下载”的错误,说明反射获取不到类型,此时该参数可排上用场<para></para>例如typeof(FreeSql.SqlServer.SqlServerProvider&lt;&gt;)</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.FreeSqlBuilder.UseAutoSyncStructure(System.Boolean)"> <member name="M:FreeSql.FreeSqlBuilder.UseAutoSyncStructure(System.Boolean)">
@ -1439,29 +1439,6 @@
<param name="value"></param> <param name="value"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.FreeSqlBuilder.UseSyncStructureToLower(System.Boolean)">
<summary>
转小写同步结构
</summary>
<param name="value">true:转小写, false:不转</param>
<returns></returns>
</member>
<member name="M:FreeSql.FreeSqlBuilder.UseSyncStructureToUpper(System.Boolean)">
<summary>
转大写同步结构
</summary>
<param name="value">true:转大写, false:不转</param>
<returns></returns>
</member>
<member name="M:FreeSql.FreeSqlBuilder.UseEntityPropertyNameConvert(FreeSql.Internal.StringConvertType)">
<summary>
自动转换实体属性名称 Entity Property -> Db Filed
<para></para>
*不会覆盖 [Column] 特性设置的Name
</summary>
<param name="convertType"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IDelete`1.WithTransaction(System.Data.Common.DbTransaction)"> <member name="M:FreeSql.IDelete`1.WithTransaction(System.Data.Common.DbTransaction)">
<summary> <summary>
指定事务对象 指定事务对象
@ -4174,46 +4151,6 @@
BigApple -> bigapple BigApple -> bigapple
</summary> </summary>
</member> </member>
<member name="F:FreeSql.Internal.StringConvertType.None">
<summary>
不进行任何处理
</summary>
</member>
<member name="F:FreeSql.Internal.StringConvertType.PascalCaseToUnderscore">
<summary>
将帕斯卡命名字符串转换为下划线分隔字符串
<para></para>
BigApple -> Big_Apple
</summary>
</member>
<member name="F:FreeSql.Internal.StringConvertType.PascalCaseToUnderscoreWithUpper">
<summary>
将帕斯卡命名字符串转换为下划线分隔字符串,且转换为全大写
<para></para>
BigApple -> BIG_APPLE
</summary>
</member>
<member name="F:FreeSql.Internal.StringConvertType.PascalCaseToUnderscoreWithLower">
<summary>
将帕斯卡命名字符串转换为下划线分隔字符串,且转换为全小写
<para></para>
BigApple -> big_apple
</summary>
</member>
<member name="F:FreeSql.Internal.StringConvertType.Upper">
<summary>
将字符串转换为大写
<para></para>
BigApple -> BIGAPPLE
</summary>
</member>
<member name="F:FreeSql.Internal.StringConvertType.Lower">
<summary>
将字符串转换为小写
<para></para>
BigApple -> bigapple
</summary>
</member>
<member name="M:FreeSql.Internal.GlobalFilter.Apply``1(System.String,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})"> <member name="M:FreeSql.Internal.GlobalFilter.Apply``1(System.String,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
<summary> <summary>
创建一个过滤器<para></para> 创建一个过滤器<para></para>

View File

@ -18,15 +18,13 @@ namespace FreeSql
int[] _slaveWeights; int[] _slaveWeights;
Func<DbConnection> _connectionFactory; Func<DbConnection> _connectionFactory;
bool _isAutoSyncStructure = false; bool _isAutoSyncStructure = false;
bool _isSyncStructureToLower = false;
bool _isSyncStructureToUpper = false;
bool _isConfigEntityFromDbFirst = false; bool _isConfigEntityFromDbFirst = false;
bool _isNoneCommandParameter = false; bool _isNoneCommandParameter = false;
bool _isGenerateCommandParameterWithLambda = false; bool _isGenerateCommandParameterWithLambda = false;
bool _isLazyLoading = false; bool _isLazyLoading = false;
bool _isExitAutoDisposePool = true; bool _isExitAutoDisposePool = true;
bool _isQuoteSqlName = true;
MappingPriorityType[] _mappingPriorityTypes; MappingPriorityType[] _mappingPriorityTypes;
StringConvertType _entityPropertyConvertType = StringConvertType.None;
NameConvertType _nameConvertType = NameConvertType.None; NameConvertType _nameConvertType = NameConvertType.None;
Action<DbCommand> _aopCommandExecuting = null; Action<DbCommand> _aopCommandExecuting = null;
Action<DbCommand, string> _aopCommandExecuted = null; Action<DbCommand, string> _aopCommandExecuted = null;
@ -37,7 +35,7 @@ namespace FreeSql
/// </summary> /// </summary>
/// <param name="dataType">数据库类型</param> /// <param name="dataType">数据库类型</param>
/// <param name="connectionString">数据库连接串</param> /// <param name="connectionString">数据库连接串</param>
/// <param name="providerType">提供者的类型,一般不需要指定,如果一直提示“缺少 FreeSql 数据库实现包FreeSql.Provider.MySql.dll可前往 nuget 下载”的错误,说明反射获取不到类型,此时该参数可排上用场</param> /// <param name="providerType">提供者的类型,一般不需要指定,如果一直提示“缺少 FreeSql 数据库实现包FreeSql.Provider.MySql.dll可前往 nuget 下载”的错误,说明反射获取不到类型,此时该参数可排上用场<para></para>例如typeof(FreeSql.SqlServer.SqlServerProvider&lt;&gt;)</param>
/// <returns></returns> /// <returns></returns>
public FreeSqlBuilder UseConnectionString(DataType dataType, string connectionString, Type providerType = null) public FreeSqlBuilder UseConnectionString(DataType dataType, string connectionString, Type providerType = null)
{ {
@ -69,7 +67,7 @@ namespace FreeSql
/// </summary> /// </summary>
/// <param name="dataType">数据库类型</param> /// <param name="dataType">数据库类型</param>
/// <param name="connectionFactory">数据库连接对象创建器</param> /// <param name="connectionFactory">数据库连接对象创建器</param>
/// <param name="providerType">提供者的类型,一般不需要指定,如果一直提示“缺少 FreeSql 数据库实现包FreeSql.Provider.MySql.dll可前往 nuget 下载”的错误,说明反射获取不到类型,此时该参数可排上用场</param> /// <param name="providerType">提供者的类型,一般不需要指定,如果一直提示“缺少 FreeSql 数据库实现包FreeSql.Provider.MySql.dll可前往 nuget 下载”的错误,说明反射获取不到类型,此时该参数可排上用场<para></para>例如typeof(FreeSql.SqlServer.SqlServerProvider&lt;&gt;)</param>
/// <returns></returns> /// <returns></returns>
public FreeSqlBuilder UseConnectionFactory(DataType dataType, Func<DbConnection> connectionFactory, Type providerType = null) public FreeSqlBuilder UseConnectionFactory(DataType dataType, Func<DbConnection> connectionFactory, Type providerType = null)
{ {
@ -161,6 +159,11 @@ namespace FreeSql
_nameConvertType = convertType; _nameConvertType = convertType;
return this; return this;
} }
public FreeSqlBuilder UseQuoteSqlName(bool value)
{
_isQuoteSqlName = value;
return this;
}
/// <summary> /// <summary>
/// 指定映射优先级<para></para> /// 指定映射优先级<para></para>
@ -337,8 +340,6 @@ namespace FreeSql
{ {
ret.CodeFirst.IsAutoSyncStructure = _isAutoSyncStructure; ret.CodeFirst.IsAutoSyncStructure = _isAutoSyncStructure;
ret.CodeFirst.IsSyncStructureToLower = _isSyncStructureToLower;
ret.CodeFirst.IsSyncStructureToUpper = _isSyncStructureToUpper;
ret.CodeFirst.IsConfigEntityFromDbFirst = _isConfigEntityFromDbFirst; ret.CodeFirst.IsConfigEntityFromDbFirst = _isConfigEntityFromDbFirst;
ret.CodeFirst.IsNoneCommandParameter = _isNoneCommandParameter; ret.CodeFirst.IsNoneCommandParameter = _isNoneCommandParameter;
ret.CodeFirst.IsGenerateCommandParameterWithLambda = _isGenerateCommandParameterWithLambda; ret.CodeFirst.IsGenerateCommandParameterWithLambda = _isGenerateCommandParameterWithLambda;
@ -352,7 +353,6 @@ namespace FreeSql
if (_aopCommandExecuted != null) if (_aopCommandExecuted != null)
ret.Aop.CommandAfter += new EventHandler<Aop.CommandAfterEventArgs>((s, e) => _aopCommandExecuted?.Invoke(e.Command, e.Log)); ret.Aop.CommandAfter += new EventHandler<Aop.CommandAfterEventArgs>((s, e) => _aopCommandExecuted?.Invoke(e.Command, e.Log));
this.EntityPropertyNameConvert(ret);
//添加实体属性名全局AOP转换处理 //添加实体属性名全局AOP转换处理
if (_nameConvertType != NameConvertType.None) if (_nameConvertType != NameConvertType.None)
{ {
@ -517,6 +517,8 @@ namespace FreeSql
if (_slaveWeights != null) if (_slaveWeights != null)
for (var x = 0; x < _slaveWeights.Length; x++) for (var x = 0; x < _slaveWeights.Length; x++)
ret.Ado.SlavePools[x].Policy.Weight = _slaveWeights[x]; ret.Ado.SlavePools[x].Policy.Weight = _slaveWeights[x];
(ret.Select<object>() as Select0Provider)._commonUtils.IsQuoteSqlName = _isQuoteSqlName;
} }
return ret; return ret;

View File

@ -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
{
/// <summary>
/// 转小写同步结构
/// </summary>
/// <param name="value">true:转小写, false:不转</param>
/// <returns></returns>
[Obsolete("请使用 UseNameConvert(NameConvertType.ToLower),或者 fsql.CodeFirst.IsSyncStructureToLower = value")]
public FreeSqlBuilder UseSyncStructureToLower(bool value)
{
_isSyncStructureToLower = value;
return this;
}
/// <summary>
/// 转大写同步结构
/// </summary>
/// <param name="value">true:转大写, false:不转</param>
/// <returns></returns>
[Obsolete("请使用 UseNameConvert(NameConvertType.ToUpper),或者 fsql.CodeFirst.IsSyncStructureToUpper = value")]
public FreeSqlBuilder UseSyncStructureToUpper(bool value)
{
_isSyncStructureToUpper = value;
return this;
}
/// <summary>
/// 自动转换实体属性名称 Entity Property -> Db Filed
/// <para></para>
/// *不会覆盖 [Column] 特性设置的Name
/// </summary>
/// <param name="convertType"></param>
/// <returns></returns>
[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;
}
}
}
}
}

View File

@ -28,7 +28,14 @@ namespace FreeSql.Internal
public abstract DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value); public abstract DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value);
public abstract DbParameter[] GetDbParamtersByObject(string sql, object obj); public abstract DbParameter[] GetDbParamtersByObject(string sql, object obj);
public abstract string FormatSql(string sql, params object[] args); 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 TrimQuoteSqlName(string name);
public abstract string[] SplitTableName(string name); public abstract string[] SplitTableName(string name);
public static string[] GetSplitTableNames(string name, char leftQuote, char rightQuote, int size) public static string[] GetSplitTableNames(string name, char leftQuote, char rightQuote, int size)

View File

@ -79,47 +79,4 @@ namespace FreeSql.Internal
ToLower ToLower
} }
public enum StringConvertType
{
/// <summary>
/// 不进行任何处理
/// </summary>
None = 0,
/// <summary>
/// 将帕斯卡命名字符串转换为下划线分隔字符串
/// <para></para>
/// BigApple -> Big_Apple
/// </summary>
PascalCaseToUnderscore,
/// <summary>
/// 将帕斯卡命名字符串转换为下划线分隔字符串,且转换为全大写
/// <para></para>
/// BigApple -> BIG_APPLE
/// </summary>
PascalCaseToUnderscoreWithUpper,
/// <summary>
/// 将帕斯卡命名字符串转换为下划线分隔字符串,且转换为全小写
/// <para></para>
/// BigApple -> big_apple
/// </summary>
PascalCaseToUnderscoreWithLower,
/// <summary>
/// 将字符串转换为大写
/// <para></para>
/// BigApple -> BIGAPPLE
/// </summary>
Upper,
/// <summary>
/// 将字符串转换为小写
/// <para></para>
/// BigApple -> bigapple
/// </summary>
Lower
}
} }

View File

@ -79,7 +79,7 @@ namespace FreeSql.ClickHouse
public override string FormatSql(string sql, params object[] args) => sql?.FormatClickHouse(args); 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) if (name.Length == 1)
{ {

View File

@ -41,7 +41,7 @@ namespace FreeSql.Custom
static FreeSql.Custom.CustomAdo _customAdo = new FreeSql.Custom.CustomAdo(); 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 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) if (name.Length == 1)
{ {

View File

@ -41,7 +41,7 @@ namespace FreeSql.Custom.MySql
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatCustomMySql(args); 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) if (name.Length == 1)
{ {

View File

@ -71,7 +71,7 @@ namespace FreeSql.Custom.Oracle
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatCustomOracle(args); 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) if (name.Length == 1)
{ {

View File

@ -97,7 +97,7 @@ namespace FreeSql.Custom.PostgreSQL
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatCustomPostgreSQL(args); 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) if (name.Length == 1)
{ {

View File

@ -49,7 +49,7 @@ namespace FreeSql.Custom.SqlServer
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatCustomSqlServer(args); 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) if (name.Length == 1)
{ {

View File

@ -82,7 +82,7 @@ namespace FreeSql.Dameng
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatDameng(args); 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) if (name.Length == 1)
{ {

View File

@ -52,7 +52,7 @@ namespace FreeSql.Firebird
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatFirebird(args); 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) if (name.Length == 1)
{ {

View File

@ -56,7 +56,7 @@ namespace FreeSql.GBase
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatGBase(args); 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) if (name.Length == 1)
{ {

View File

@ -92,7 +92,7 @@ namespace FreeSql.KingbaseES
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatKingbaseES(args); 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) if (name.Length == 1)
{ {

View File

@ -38,7 +38,7 @@ namespace FreeSql.MsAccess
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatAccess(args); 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) if (name.Length == 1)
{ {

View File

@ -73,7 +73,7 @@ namespace FreeSql.MySql
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatMySql(args); 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) if (name.Length == 1)
{ {

View File

@ -91,7 +91,7 @@ namespace FreeSql.MySql
} }
public override string FormatSql(string sql, params object[] args) => sql?.FormatMySql(args); 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) if (name.Length == 1)
{ {

View File

@ -71,7 +71,7 @@ namespace FreeSql.Odbc.Dameng
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcDameng(args); 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) if (name.Length == 1)
{ {

View File

@ -39,7 +39,7 @@ namespace FreeSql.Odbc.Default
static FreeSql.Odbc.Default.OdbcAdo _customAdo = new FreeSql.Odbc.Default.OdbcAdo(); 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 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) if (name.Length == 1)
{ {

View File

@ -91,7 +91,7 @@ namespace FreeSql.Odbc.KingbaseES
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcKingbaseES(args); 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) if (name.Length == 1)
{ {

View File

@ -37,7 +37,7 @@ namespace FreeSql.Odbc.MySql
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcMySql(args); 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) if (name.Length == 1)
{ {

View File

@ -71,7 +71,7 @@ namespace FreeSql.Odbc.Oracle
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcOracle(args); 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) if (name.Length == 1)
{ {

View File

@ -91,7 +91,7 @@ namespace FreeSql.Odbc.PostgreSQL
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcPostgreSQL(args); 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) if (name.Length == 1)
{ {

View File

@ -43,7 +43,7 @@ namespace FreeSql.Odbc.SqlServer
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatOdbcSqlServer(args); 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) if (name.Length == 1)
{ {

View File

@ -100,7 +100,7 @@ namespace FreeSql.Oracle
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatOracle(args); 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) if (name.Length == 1)
{ {

View File

@ -104,7 +104,7 @@ namespace FreeSql.Oracle
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatOracle(args); 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) if (name.Length == 1)
{ {

View File

@ -132,7 +132,7 @@ namespace FreeSql.PostgreSQL
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatPostgreSQL(args); 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) if (name.Length == 1)
{ {

View File

@ -105,7 +105,7 @@ namespace FreeSql.ShenTong
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatShenTong(args); 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) if (name.Length == 1)
{ {

View File

@ -59,7 +59,7 @@ namespace FreeSql.SqlServer
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatSqlServer(args); 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) if (name.Length == 1)
{ {

View File

@ -82,7 +82,7 @@ namespace FreeSql.Sqlite
}); });
public override string FormatSql(string sql, params object[] args) => sql?.FormatSqlite(args); 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) if (name.Length == 1)
{ {