v0.1.1 增加选项 IsQuoteSqlName 控制是否使用 [] 或 "" 或 `` 包含数据库名称 #6

dotnetcore · Feb 21, 2019 · ae347d4 · ae347d4
1 parent 204ab9f
commit ae347d4
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 7 deletions.
diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.1.0</Version>
+    <Version>0.1.1</Version>
     <Authors>YeXiangQin</Authors>
     <Description>打造 .NETCore 最方便的 ORM，DbFirst 与 CodeFirst 混合使用，提供从实体同步数据库，或者从数据库生成实体代码，支持 MySql/SqlServer/PostgreSQL/Oracle/Sqlite 数据库。</Description>
     <PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>

diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.1.0</Version>
+    <Version>0.1.1</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>YeXiangQin</Authors>
     <Description>打造 .NETCore 最方便的 ORM，DbFirst 与 CodeFirst 混合使用，提供从实体同步数据库，或者从数据库生成实体代码，支持 MySql/SqlServer/PostgreSQL/Oracle/Sqlite 数据库。</Description>

diff --git a/FreeSql/FreeSqlBuilder.cs b/FreeSql/FreeSqlBuilder.cs
@@ -13,6 +13,7 @@ public class FreeSqlBuilder {
 		string _masterConnectionString;
 		string[] _slaveConnectionString;
 		bool _isAutoSyncStructure = false;
+		bool _isQuoteSqlName = true;
 		bool _isSyncStructureToLower = false;
 		bool _isLazyLoading = false;
 		Action<DbCommand> _aopCommandExecuting = null;
@@ -67,6 +68,15 @@ public FreeSqlBuilder UseAutoSyncStructure(bool value) {
 			return this;
 		}
 		/// <summary>
+		/// 数据库名称使用 [] 或 `` 或 "" 包含起来，取决于数据库类别
+		/// </summary>
+		/// <param name="value">true:转小写, false:不转</param>
+		/// <returns></returns>
+		public FreeSqlBuilder UseQuoteSqlName(bool value) {
+			_isQuoteSqlName = value;
+			return this;
+		}
+		/// <summary>
 		/// 转小写同步结构
 		/// </summary>
 		/// <param name="value">true:转小写, false:不转</param>
@@ -107,6 +117,7 @@ public IFreeSql Build() {
 			}
 			if (ret != null) {
 				ret.CodeFirst.IsAutoSyncStructure = _isAutoSyncStructure;
+				ret.CodeFirst.IsQuoteSqlName = _isQuoteSqlName;
 				ret.CodeFirst.IsSyncStructureToLower = _isSyncStructureToLower;
 				ret.CodeFirst.IsLazyLoading = _isLazyLoading;
 				var ado = ret.Ado as Internal.CommonProvider.AdoProvider;

diff --git a/FreeSql/Interface/ICodeFirst.cs b/FreeSql/Interface/ICodeFirst.cs
@@ -9,6 +9,10 @@ public interface ICodeFirst {
 		/// </summary>
 		bool IsAutoSyncStructure { get; set; }
 
+		/// <summary>
+		/// 数据库名称使用 [] 或 `` 或 "" 包含起来，取决于数据库类别
+		/// </summary>
+		bool IsQuoteSqlName { get; set; }
 		/// <summary>
 		/// 转小写同步结构
 		/// </summary>

diff --git a/FreeSql/MySql/MySqlCodeFirst.cs b/FreeSql/MySql/MySqlCodeFirst.cs
@@ -24,6 +24,7 @@ public MySqlCodeFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression co
 		}
 
 		public bool IsAutoSyncStructure { get; set; } = true;
+		public bool IsQuoteSqlName { get; set; } = true;
 		public bool IsSyncStructureToLower { get; set; } = false;
 		public bool IsLazyLoading { get; set; } = false;
 

diff --git a/FreeSql/MySql/MySqlUtils.cs b/FreeSql/MySql/MySqlUtils.cs
@@ -42,7 +42,7 @@ internal override DbParameter[] GetDbParamtersByObject(string sql, object obj) =
 			});
 
 		internal override string FormatSql(string sql, params object[] args) => sql?.FormatMySql(args);
-		internal override string QuoteSqlName(string name) => $"`{name.Trim('`').Replace(".", "`.`")}`";
+		internal override string QuoteSqlName(string name) => _orm.CodeFirst.IsQuoteSqlName ? $"`{name.Trim('`').Replace(".", "`.`")}`" : name;
 		internal override string QuoteParamterName(string name) => $"?{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
 		internal override string IsNull(string sql, object value) => $"ifnull({sql}, {value})";
 		internal override string StringConcat(string left, string right, Type leftType, Type rightType) => $"concat({left}, {right})";

diff --git a/FreeSql/Oracle/OracleCodeFirst.cs b/FreeSql/Oracle/OracleCodeFirst.cs
@@ -24,6 +24,7 @@ public OracleCodeFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression c
 		}
 
 		public bool IsAutoSyncStructure { get; set; } = true;
+		public bool IsQuoteSqlName { get; set; } = true;
 		public bool IsSyncStructureToLower { get; set; } = false;
 		public bool IsLazyLoading { get; set; } = false;
 

diff --git a/FreeSql/Oracle/OracleUtils.cs b/FreeSql/Oracle/OracleUtils.cs
@@ -38,7 +38,7 @@ internal override DbParameter[] GetDbParamtersByObject(string sql, object obj) =
 			});
 
 		internal override string FormatSql(string sql, params object[] args) => sql?.FormatOracleSQL(args);
-		internal override string QuoteSqlName(string name) => $"\"{name.Trim('"').Replace(".", "\".\"")}\"";
+		internal override string QuoteSqlName(string name) => _orm.CodeFirst.IsQuoteSqlName ? $"\"{name.Trim('"').Replace(".", "\".\"")}\"" : name;
 		internal override string QuoteParamterName(string name) => $":{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
 		internal override string IsNull(string sql, object value) => $"nvl({sql}, {value})";
 		internal override string StringConcat(string left, string right, Type leftType, Type rightType) => $"{left} || {right}";

diff --git a/FreeSql/PostgreSQL/PostgreSQLCodeFirst.cs b/FreeSql/PostgreSQL/PostgreSQLCodeFirst.cs
@@ -29,6 +29,7 @@ public PostgreSQLCodeFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpressi
 		}
 
 		public bool IsAutoSyncStructure { get; set; } = true;
+		public bool IsQuoteSqlName { get; set; } = true;
 		public bool IsSyncStructureToLower { get; set; } = false;
 		public bool IsLazyLoading { get; set; } = false;
 

diff --git a/FreeSql/PostgreSQL/PostgreSQLUtils.cs b/FreeSql/PostgreSQL/PostgreSQLUtils.cs
@@ -94,7 +94,7 @@ internal override DbParameter[] GetDbParamtersByObject(string sql, object obj) =
 			});
 
 		internal override string FormatSql(string sql, params object[] args) => sql?.FormatPostgreSQL(args);
-		internal override string QuoteSqlName(string name) => $"\"{name.Trim('"').Replace(".", "\".\"")}\"";
+		internal override string QuoteSqlName(string name) => _orm.CodeFirst.IsQuoteSqlName ? $"\"{name.Trim('"').Replace(".", "\".\"")}\"" : name;
 		internal override string QuoteParamterName(string name) => $"@{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
 		internal override string IsNull(string sql, object value) => $"coalesce({sql}, {value})";
 		internal override string StringConcat(string left, string right, Type leftType, Type rightType) => $"{left} || {right}";

diff --git a/FreeSql/SqlServer/SqlServerCodeFirst.cs b/FreeSql/SqlServer/SqlServerCodeFirst.cs
@@ -23,6 +23,7 @@ public SqlServerCodeFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpressio
 		}
 
 		public bool IsAutoSyncStructure { get; set; } = true;
+		public bool IsQuoteSqlName { get; set; } = true;
 		public bool IsSyncStructureToLower { get; set; } = false;
 		public bool IsLazyLoading { get; set; } = false;
 

diff --git a/FreeSql/SqlServer/SqlServerUtils.cs b/FreeSql/SqlServer/SqlServerUtils.cs
@@ -32,7 +32,7 @@ internal override DbParameter[] GetDbParamtersByObject(string sql, object obj) =
 			});
 
 		internal override string FormatSql(string sql, params object[] args) => sql?.FormatSqlServer(args);
-		internal override string QuoteSqlName(string name) => $"[{name.TrimStart('[').TrimEnd(']').Replace(".", "].[")}]";
+		internal override string QuoteSqlName(string name) => _orm.CodeFirst.IsQuoteSqlName ? $"[{name.TrimStart('[').TrimEnd(']').Replace(".", "].[")}]" : name;
 		internal override string QuoteParamterName(string name) => $"@{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
 		internal override string IsNull(string sql, object value) => $"isnull({sql}, {value})";
 		internal override string StringConcat(string left, string right, Type leftType, Type rightType) => $"{(leftType.FullName == "System.String" ? left : $"cast({left} as nvarchar)")} + {(rightType.FullName == "System.String" ? right : $"cast({right} as nvarchar)")}";

diff --git a/FreeSql/Sqlite/SqliteCodeFirst.cs b/FreeSql/Sqlite/SqliteCodeFirst.cs
@@ -23,6 +23,7 @@ public SqliteCodeFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression c
 		}
 
 		public bool IsAutoSyncStructure { get; set; } = true;
+		public bool IsQuoteSqlName { get; set; } = true;
 		public bool IsSyncStructureToLower { get; set; } = false;
 		public bool IsLazyLoading { get; set; } = false;
 

diff --git a/FreeSql/Sqlite/SqliteUtils.cs b/FreeSql/Sqlite/SqliteUtils.cs
@@ -53,7 +53,7 @@ internal override DbParameter[] GetDbParamtersByObject(string sql, object obj) =
 			});
 
 		internal override string FormatSql(string sql, params object[] args) => sql?.FormatSqlite(args);
-		internal override string QuoteSqlName(string name) => $"\"{name.Trim('"').Replace(".", "\".\"")}\"";
+		internal override string QuoteSqlName(string name) => _orm.CodeFirst.IsQuoteSqlName ? $"\"{name.Trim('"').Replace(".", "\".\"")}\"" : name;
 		internal override string QuoteParamterName(string name) => $"@{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
 		internal override string IsNull(string sql, object value) => $"ifnull({sql}, {value})";
 		internal override string StringConcat(string left, string right, Type leftType, Type rightType) => $"{left} || {right}";