From 5a115243ca59a45ca86239df1e760ec6b88b4d92 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Fri, 25 Aug 2017 22:46:56 +0800
Subject: [PATCH] Code optimization

---
 .../ExpressionsToSql/ExpressionContext.cs     |  8 ++--
 .../SqlBuilder/MySqlExpressionContext.cs      | 44 +------------------
 .../SqlBuilder/SqliteExpressionContext.cs     | 44 +------------------
 3 files changed, 9 insertions(+), 87 deletions(-)

diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs
index 0a142ea3d..506170fc7 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs
@@ -96,6 +96,8 @@ namespace SqlSugar
                 return "@";
             }
         }
+        public virtual string SqlTranslationLeft { get { return "["; } }
+        public virtual string SqlTranslationRight { get { return "]"; } }
         #endregion
 
         #region public functions
@@ -118,7 +120,7 @@ namespace SqlSugar
                 else
                 {
                     var mappingInfo = this.MappingTables.FirstOrDefault(it => it.EntityName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase));
-                    return "[" + (mappingInfo == null ? entityName : mappingInfo.EntityName) + "]";
+                    return SqlTranslationLeft+ (mappingInfo == null ? entityName : mappingInfo.EntityName) + SqlTranslationRight;
                 }
             }
             else
@@ -164,11 +166,11 @@ namespace SqlSugar
         }
         public virtual bool IsTranslationText(string name)
         {
-            return name.Contains("[") && name.Contains("]");
+            return name.Contains(SqlTranslationLeft) && name.Contains(SqlTranslationRight);
         }
         public virtual string GetTranslationText(string name)
         {
-            return "[" + name + "]";
+            return SqlTranslationLeft + name + SqlTranslationRight;
         }
         public virtual void Resolve(Expression expression, ResolveExpressType resolveType)
         {
diff --git a/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs b/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs
index 93fb76c90..4e3a64154 100644
--- a/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs
@@ -9,48 +9,8 @@ namespace SqlSugar
         {
             base.DbMehtods = new MySqlMethod();
         }
-        public override string GetTranslationTableName(string entityName, bool isMapping = true)
-        {
-            Check.ArgumentNullException(entityName, string.Format(ErrorMessage.ObjNotExist, "Table Name"));
-            if (IsTranslationText(entityName)) return entityName;
-            if (isMapping && this.MappingTables.IsValuable())
-            {
-                if (entityName.Contains("."))
-                {
-                    var columnInfo = entityName.Split('.');
-                    var mappingInfo = this.MappingTables.FirstOrDefault(it => it.EntityName.Equals(columnInfo.Last(), StringComparison.CurrentCultureIgnoreCase));
-                    if (mappingInfo != null)
-                    {
-                        columnInfo[columnInfo.Length - 1] = mappingInfo.EntityName;
-                    }
-                    return string.Join(".", columnInfo.Select(it => GetTranslationText(it)));
-                }
-                else
-                {
-                    var mappingInfo = this.MappingTables.FirstOrDefault(it => it.EntityName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase));
-                    return "`" + (mappingInfo == null ? entityName : mappingInfo.EntityName) + "`";
-                }
-            }
-            else
-            {
-                if (entityName.Contains("."))
-                {
-                    return string.Join(".", entityName.Split('.').Select(it => GetTranslationText(it)));
-                }
-                else
-                {
-                    return GetTranslationText(entityName);
-                }
-            }
-        }
-        public override bool IsTranslationText(string name)
-        {
-            return name.Contains("`") && name.Contains("`");
-        }
-        public override string GetTranslationText(string name)
-        {
-            return "`" + name + "`";
-        }
+        public override string SqlTranslationLeft { get { return "`"; } }
+        public override string SqlTranslationRight { get { return "`"; } }
     }
     public class MySqlMethod : DefaultDbMethod, IDbMethods
     {
diff --git a/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteExpressionContext.cs b/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteExpressionContext.cs
index 0ae45ca80..a308637e4 100644
--- a/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteExpressionContext.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteExpressionContext.cs
@@ -9,48 +9,8 @@ namespace SqlSugar
         {
             base.DbMehtods = new SqliteMethod();
         }
-        public override string GetTranslationTableName(string entityName, bool isMapping = true)
-        {
-            Check.ArgumentNullException(entityName, string.Format(ErrorMessage.ObjNotExist, "Table Name"));
-            if (IsTranslationText(entityName)) return entityName;
-            if (isMapping && this.MappingTables.IsValuable())
-            {
-                if (entityName.Contains("."))
-                {
-                    var columnInfo = entityName.Split('.');
-                    var mappingInfo = this.MappingTables.FirstOrDefault(it => it.EntityName.Equals(columnInfo.Last(), StringComparison.CurrentCultureIgnoreCase));
-                    if (mappingInfo != null)
-                    {
-                        columnInfo[columnInfo.Length - 1] = mappingInfo.EntityName;
-                    }
-                    return string.Join(".", columnInfo.Select(it => GetTranslationText(it)));
-                }
-                else
-                {
-                    var mappingInfo = this.MappingTables.FirstOrDefault(it => it.EntityName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase));
-                    return "`" + (mappingInfo == null ? entityName : mappingInfo.EntityName) + "`";
-                }
-            }
-            else
-            {
-                if (entityName.Contains("."))
-                {
-                    return string.Join(".", entityName.Split('.').Select(it => GetTranslationText(it)));
-                }
-                else
-                {
-                    return GetTranslationText(entityName);
-                }
-            }
-        }
-        public override bool IsTranslationText(string name)
-        {
-            return name.Contains("`") && name.Contains("`");
-        }
-        public override string GetTranslationText(string name)
-        {
-            return "`" + name + "`";
-        }
+        public override string SqlTranslationLeft { get { return "`"; } }
+        public override string SqlTranslationRight { get { return "`"; } }
     }
     public class SqliteMethod : DefaultDbMethod, IDbMethods
     {