Force SqlExpression to be bound to DialectProvider at creation, change Clone() to call dialect factory, remove redundant overloads

mythz · mythz · commit e1f62a18661c · 2014-06-16T21:25:40.000-04:00
diff --git a/src/FirebirdTests/TestLiteFirebird04/Main.cs b/src/FirebirdTests/TestLiteFirebird04/Main.cs
@@ -16,8 +16,8 @@ public static void Main (string[] args)
 			
 			OrmLiteConfig.DialectProvider = new FirebirdOrmLiteDialectProvider();
 			
-			ServiceStack.OrmLite.SqlExpression<Company> sql= 
-				new  FirebirdSqlExpression<Company>();
+			ServiceStack.OrmLite.SqlExpression<Company> sql =
+                OrmLiteConfig.DialectProvider.SqlExpression<Company>();
 			
 			List<Object> names = new List<Object>();
 			names.Add("SOME COMPANY");
diff --git a/src/OracleTests/TestLiteOracle04/Main.cs b/src/OracleTests/TestLiteOracle04/Main.cs
@@ -17,8 +17,8 @@ public static void Main (string[] args)
 
             OrmLiteConfig.DialectProvider = new OracleOrmLiteDialectProvider();
 			
-			ServiceStack.OrmLite.SqlExpression<Company> sql=
-                new OracleSqlExpression<Company>();
+			ServiceStack.OrmLite.SqlExpression<Company> sql =
+                OrmLiteConfig.DialectProvider.SqlExpression<Company>();
 			
 			List<Object> names = new List<Object>();
 			names.Add("SOME COMPANY");
diff --git a/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs
@@ -728,7 +728,7 @@ private string Sequence(string modelName, string fieldName, string sequence)
 
         public override SqlExpression<T> SqlExpression<T>()
         {
-            return new FirebirdSqlExpression<T>();
+            return new FirebirdSqlExpression<T>(this);
         }
 
         public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
diff --git a/src/ServiceStack.OrmLite.Firebird/FirebirdSqlExpression.cs b/src/ServiceStack.OrmLite.Firebird/FirebirdSqlExpression.cs
@@ -9,17 +9,13 @@ public class FirebirdSqlExpression<T> : SqlExpression<T>
         private readonly string _trueExpression;
         private readonly string _falseExpression;
 
-        public FirebirdSqlExpression()
+        public FirebirdSqlExpression(IOrmLiteDialectProvider dialectProvider) 
+            : base(dialectProvider) 
         {
             _trueExpression = string.Format("({0}={1})", GetQuotedTrueValue(), GetQuotedTrueValue());
             _falseExpression = string.Format("({0}={1})", GetQuotedTrueValue(), GetQuotedFalseValue());
         }
 
-        public override SqlExpression<T> Clone()
-        {
-            return CopyTo(new FirebirdSqlExpression<T>());
-        }
-
         protected override object VisitBinary(BinaryExpression b)
         {
             object left, right;
diff --git a/src/ServiceStack.OrmLite.MySql/MySqlDialectProvider.cs b/src/ServiceStack.OrmLite.MySql/MySqlDialectProvider.cs
@@ -141,7 +141,7 @@ public override string GetQuotedName(string name)
 
         public override SqlExpression<T> SqlExpression<T>()
         {
-            return new MySqlExpression<T>();
+            return new MySqlExpression<T>(this);
         }
 
         public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
diff --git a/src/ServiceStack.OrmLite.MySql/MySqlExpression.cs b/src/ServiceStack.OrmLite.MySql/MySqlExpression.cs
@@ -5,9 +5,7 @@
     /// </summary>
     public class MySqlExpression<T> : SqlExpression<T>
     {
-        public override SqlExpression<T> Clone()
-        {
-            return CopyTo(new MySqlExpression<T>());
-        }
+        public MySqlExpression(IOrmLiteDialectProvider dialectProvider)
+            : base(dialectProvider) {}
     }
 }
diff --git a/src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs
@@ -1050,7 +1050,7 @@ private string Sequence(string modelName, string fieldName, string sequence)
 
         public override SqlExpression<T> SqlExpression<T>()
         {
-            return new OracleSqlExpression<T>();
+            return new OracleSqlExpression<T>(this);
         }
 
         public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
diff --git a/src/ServiceStack.OrmLite.Oracle/OracleSqlExpression.cs b/src/ServiceStack.OrmLite.Oracle/OracleSqlExpression.cs
@@ -6,6 +6,9 @@ namespace ServiceStack.OrmLite.Oracle
 {
     public class OracleSqlExpression<T> : SqlExpression<T>
     {
+        public OracleSqlExpression(IOrmLiteDialectProvider dialectProvider)
+            : base(dialectProvider) {}
+
         protected override object VisitColumnAccessMethod(MethodCallExpression m)
         {
             if (m.Method.Name == "Substring")
@@ -28,11 +31,6 @@ protected override object VisitColumnAccessMethod(MethodCallExpression m)
             }
             return base.VisitColumnAccessMethod(m);
         }
-
-        public override SqlExpression<T> Clone()
-        {
-            return CopyTo(new OracleSqlExpression<T>());
-        }
     }
 }
 
diff --git a/src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs b/src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs
@@ -200,7 +200,7 @@ public override object ConvertDbValue(object value, Type type)
 
         public override SqlExpression<T> SqlExpression<T>()
         {
-            return new PostgreSqlExpression<T>();
+            return new PostgreSqlExpression<T>(this);
         }
 
         public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
diff --git a/src/ServiceStack.OrmLite.PostgreSQL/PostgreSqlExpression.cs b/src/ServiceStack.OrmLite.PostgreSQL/PostgreSqlExpression.cs
@@ -2,9 +2,7 @@ namespace ServiceStack.OrmLite.PostgreSQL
 {
     public class PostgreSqlExpression<T> : SqlExpression<T>
     {
-        public override SqlExpression<T> Clone()
-        {
-            return CopyTo(new PostgreSqlExpression<T>());
-        }
+        public PostgreSqlExpression(IOrmLiteDialectProvider dialectProvider)
+            : base(dialectProvider) {}
     }
 }
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerExpression.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerExpression.cs
@@ -4,12 +4,10 @@ namespace ServiceStack.OrmLite.SqlServer
 {
 	public class SqlServerExpression<T> : SqlExpression<T>
 	{
-	    public override SqlExpression<T> Clone()
-	    {
-	        return CopyTo(new SqlServerExpression<T>());
-	    }
+        public SqlServerExpression(IOrmLiteDialectProvider dialectProvider)
+            : base(dialectProvider) {}
 
-	    public override string ToUpdateStatement(T item, bool excludeDefaults = false)
+        public override string ToUpdateStatement(T item, bool excludeDefaults = false)
         {
             var setFields = new StringBuilder();
             var dialectProvider = OrmLiteConfig.DialectProvider;
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs
@@ -221,7 +221,7 @@ public void EnsureUtc(bool shouldEnsureUtc)
 
         public override SqlExpression<T> SqlExpression<T>()
         {
-            return new SqlServerExpression<T>();
+            return new SqlServerExpression<T>(this);
         }
 
         public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
diff --git a/src/ServiceStack.OrmLite.Sqlite/SqliteExpression.cs b/src/ServiceStack.OrmLite.Sqlite/SqliteExpression.cs
@@ -11,6 +11,9 @@ namespace ServiceStack.OrmLite.Sqlite
     /// </summary>
     public class SqliteExpression<T> : SqlExpression<T>
     {
+        public SqliteExpression(IOrmLiteDialectProvider dialectProvider) 
+            : base(dialectProvider) {}
+
         protected override object VisitColumnAccessMethod(MethodCallExpression m)
         {
             List<Object> args = this.VisitExpressionList(m.Arguments);
@@ -84,10 +87,5 @@ protected override object VisitSqlMethodCall(MethodCallExpression m)
 
             return new PartialSqlString(statement);
         }
-
-        public override SqlExpression<T> Clone()
-        {
-            return CopyTo(new SqliteExpression<T>());
-        }
     }
 }
diff --git a/src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs
@@ -223,7 +223,7 @@ protected override object GetValueOrDbNull<T>(FieldDefinition fieldDef, object o
 
         public override SqlExpression<T> SqlExpression<T>()
         {
-            return new SqliteExpression<T>();
+            return new SqliteExpression<T>(this);
         }
 
         public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
diff --git a/src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs b/src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs
@@ -89,17 +89,17 @@ private SqlExpression<T> InternalJoin<Source, Target>(string joinType,
                 }
 
                 sqlExpr = "\n({0}.{1} = {2}.{3})".Fmt(
-                    parentDef.ModelName.SqlTable(),
-                    parentDef.PrimaryKey.FieldName.SqlColumn(),
-                    childDef.ModelName.SqlTable(),
-                    refField.FieldName.SqlColumn());
+                    SqlTable(parentDef.ModelName),
+                    SqlColumn(parentDef.PrimaryKey.FieldName),
+                    SqlTable(childDef.ModelName),
+                    SqlColumn(refField.FieldName));
             }
 
             var joinDef = tableDefs.Contains(targetDef) && !tableDefs.Contains(sourceDef)
                 ? sourceDef
                 : targetDef;
 
-            sbJoin.Append(" {0} {1} ".Fmt(joinType, joinDef.ModelName.SqlTable()));
+            sbJoin.Append(" {0} {1} ".Fmt(joinType, SqlTable(joinDef.ModelName)));
             sbJoin.Append(" ON ");
             sbJoin.Append(sqlExpr);
 
@@ -141,9 +141,9 @@ public string SelectInto<TModel>()
                             if (sbSelect.Length > 0)
                                 sbSelect.Append(", ");
 
-                            sbSelect.AppendFormat("{0}.{1}", 
-                                tableDef.ModelName.SqlTable(),
-                                tableFieldDef.GetQuotedName());
+                            sbSelect.AppendFormat("{0}.{1}",
+                                SqlTable(tableDef.ModelName),
+                                tableFieldDef.GetQuotedName(DialectProvider));
                             break;
                         }
                     }
diff --git a/src/ServiceStack.OrmLite/Expressions/SqlExpression.cs b/src/ServiceStack.OrmLite/Expressions/SqlExpression.cs
diff --git a/src/ServiceStack.OrmLite/FieldDefinition.cs b/src/ServiceStack.OrmLite/FieldDefinition.cs
diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
diff --git a/tests/ServiceStack.OrmLite.Tests/ExpressionTests.cs b/tests/ServiceStack.OrmLite.Tests/ExpressionTests.cs

Original file line number	Diff line number	Diff line change
`@@ -728,7 +728,7 @@ private string Sequence(string modelName, string fieldName, string sequence)`
`728`	`728`
`729`	`729`	`public override SqlExpression<T> SqlExpression<T>()`
`730`	`730`	`{`
`731`		`- return new FirebirdSqlExpression<T>();`
	`731`	`+ return new FirebirdSqlExpression<T>(this);`
`732`	`732`	`}`
`733`	`733`
`734`	`734`	`public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`
Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,13 @@ public class FirebirdSqlExpression<T> : SqlExpression<T>`
`9`	`9`	`private readonly string _trueExpression;`
`10`	`10`	`private readonly string _falseExpression;`
`11`	`11`
`12`		`- public FirebirdSqlExpression()`
	`12`	`+ public FirebirdSqlExpression(IOrmLiteDialectProvider dialectProvider)`
	`13`	`+ : base(dialectProvider)`
`13`	`14`	`{`
`14`	`15`	`_trueExpression = string.Format("({0}={1})", GetQuotedTrueValue(), GetQuotedTrueValue());`
`15`	`16`	`_falseExpression = string.Format("({0}={1})", GetQuotedTrueValue(), GetQuotedFalseValue());`
`16`	`17`	`}`
`17`	`18`
`18`		`- public override SqlExpression<T> Clone()`
`19`		`- {`
`20`		`- return CopyTo(new FirebirdSqlExpression<T>());`
`21`		`- }`
`22`		`-`
`23`	`19`	`protected override object VisitBinary(BinaryExpression b)`
`24`	`20`	`{`
`25`	`21`	`object left, right;`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public override string GetQuotedName(string name)`
`141`	`141`
`142`	`142`	`public override SqlExpression<T> SqlExpression<T>()`
`143`	`143`	`{`
`144`		`- return new MySqlExpression<T>();`
	`144`	`+ return new MySqlExpression<T>(this);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,7 @@`
`5`	`5`	`/// </summary>`
`6`	`6`	`public class MySqlExpression<T> : SqlExpression<T>`
`7`	`7`	`{`
`8`		`- public override SqlExpression<T> Clone()`
`9`		`- {`
`10`		`- return CopyTo(new MySqlExpression<T>());`
`11`		`- }`
	`8`	`+ public MySqlExpression(IOrmLiteDialectProvider dialectProvider)`
	`9`	`+ : base(dialectProvider) {}`
`12`	`10`	`}`
`13`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1050,7 +1050,7 @@ private string Sequence(string modelName, string fieldName, string sequence)`
`1050`	`1050`
`1051`	`1051`	`public override SqlExpression<T> SqlExpression<T>()`
`1052`	`1052`	`{`
`1053`		`- return new OracleSqlExpression<T>();`
	`1053`	`+ return new OracleSqlExpression<T>(this);`
`1054`	`1054`	`}`
`1055`	`1055`
`1056`	`1056`	`public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@ namespace ServiceStack.OrmLite.Oracle`
`6`	`6`	`{`
`7`	`7`	`public class OracleSqlExpression<T> : SqlExpression<T>`
`8`	`8`	`{`
	`9`	`+ public OracleSqlExpression(IOrmLiteDialectProvider dialectProvider)`
	`10`	`+ : base(dialectProvider) {}`
	`11`	`+`
`9`	`12`	`protected override object VisitColumnAccessMethod(MethodCallExpression m)`
`10`	`13`	`{`
`11`	`14`	`if (m.Method.Name == "Substring")`
`@@ -28,11 +31,6 @@ protected override object VisitColumnAccessMethod(MethodCallExpression m)`
`28`	`31`	`}`
`29`	`32`	`return base.VisitColumnAccessMethod(m);`
`30`	`33`	`}`
`31`		`-`
`32`		`- public override SqlExpression<T> Clone()`
`33`		`- {`
`34`		`- return CopyTo(new OracleSqlExpression<T>());`
`35`		`- }`
`36`	`34`	`}`
`37`	`35`	`}`
`38`	`36`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public override object ConvertDbValue(object value, Type type)`
`200`	`200`
`201`	`201`	`public override SqlExpression<T> SqlExpression<T>()`
`202`	`202`	`{`
`203`		`- return new PostgreSqlExpression<T>();`
	`203`	`+ return new PostgreSqlExpression<T>(this);`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@ namespace ServiceStack.OrmLite.PostgreSQL`
`2`	`2`	`{`
`3`	`3`	`public class PostgreSqlExpression<T> : SqlExpression<T>`
`4`	`4`	`{`
`5`		`- public override SqlExpression<T> Clone()`
`6`		`- {`
`7`		`- return CopyTo(new PostgreSqlExpression<T>());`
`8`		`- }`
	`5`	`+ public PostgreSqlExpression(IOrmLiteDialectProvider dialectProvider)`
	`6`	`+ : base(dialectProvider) {}`
`9`	`7`	`}`
`10`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,10 @@ namespace ServiceStack.OrmLite.SqlServer`
`4`	`4`	`{`
`5`	`5`	`public class SqlServerExpression<T> : SqlExpression<T>`
`6`	`6`	`{`
`7`		`- public override SqlExpression<T> Clone()`
`8`		`- {`
`9`		`- return CopyTo(new SqlServerExpression<T>());`
`10`		`- }`
	`7`	`+ public SqlServerExpression(IOrmLiteDialectProvider dialectProvider)`
	`8`	`+ : base(dialectProvider) {}`
`11`	`9`
`12`		`- public override string ToUpdateStatement(T item, bool excludeDefaults = false)`
	`10`	`+ public override string ToUpdateStatement(T item, bool excludeDefaults = false)`
`13`	`11`	`{`
`14`	`12`	`var setFields = new StringBuilder();`
`15`	`13`	`var dialectProvider = OrmLiteConfig.DialectProvider;`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ public void EnsureUtc(bool shouldEnsureUtc)`
`221`	`221`
`222`	`222`	`public override SqlExpression<T> SqlExpression<T>()`
`223`	`223`	`{`
`224`		`- return new SqlServerExpression<T>();`
	`224`	`+ return new SqlServerExpression<T>(this);`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`