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

Author: mythz

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");

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");

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)

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;

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)

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) {}
     }
 }

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)

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>());
-        }
     }
 }
 

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)

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) {}
     }
 }