added schema prefix to JoinSqlBuilder for building queries

Lee337 · Lee337 · commit 869afc9fa4a1 · 2013-08-02T01:02:43.000+02:00
diff --git a/src/ServiceStack.OrmLite/JoinSqlBuilder.cs b/src/ServiceStack.OrmLite/JoinSqlBuilder.cs
@@ -14,12 +14,14 @@ public class JoinSqlBuilder<TNewPoco, TBasePoco>
         private bool isDistinct = false;
         private bool isAggregateUsed = false;
 
+        private string baseSchema = "";
         private string baseTableName = "";
         private Type basePocoType;
 
         public JoinSqlBuilder()
         {
             basePocoType = typeof(TBasePoco);
+            baseSchema = GetSchema(basePocoType);
             baseTableName = basePocoType.GetModelDefinition().ModelName;
         }
 
@@ -89,7 +91,7 @@ private void ProcessNew(string tableName, NewExpression nex, List<string> lst, b
                 throw new Exception("Only column list allowed");
 
             var expressionProperties = nex.Type.GetProperties();
-            for (int i=0; i< nex.Arguments.Count;i++)
+            for (int i = 0; i < nex.Arguments.Count; i++)
             {
                 var arg = nex.Arguments[i];
                 var alias = expressionProperties[i].Name;
@@ -319,8 +321,11 @@ public JoinSqlBuilder<TNewPoco, TBasePoco> CrossJoin<TSourceTable, TDestinationT
             else
                 join.RefType = join.Class1Type;
 
+            join.Class1Schema = GetSchema(join.Class1Type);
             join.Class1TableName = join.Class1Type.GetModelDefinition().ModelName;
+            join.Class2Schema = GetSchema(join.Class2Type);
             join.Class2TableName = join.Class2Type.GetModelDefinition().ModelName;
+            join.RefTypeSchema = GetSchema(join.RefType);
             join.RefTypeTableName = join.RefType.GetModelDefinition().ModelName;
 
             if (join.JoinType != JoinType.CROSS)
@@ -369,6 +374,11 @@ public JoinSqlBuilder<TNewPoco, TBasePoco> CrossJoin<TSourceTable, TDestinationT
             return this;
         }
 
+        private string GetSchema(Type type)
+        {
+            return string.IsNullOrEmpty(type.GetModelDefinition().Schema) ? string.Empty : string.Format("{0}.", type.GetModelDefinition().Schema);
+        }
+
         private Type PreviousAssociatedType(Type sourceTableType, Type destinationTableType)
         {
             if (sourceTableType == basePocoType || destinationTableType == basePocoType)
@@ -427,12 +437,12 @@ public string ToSql()
                     colSB.AppendFormat("{0}{1}", colSB.Length > 0 ? "," : "", String.IsNullOrEmpty(fi.BelongToModelName) ? (fi.FieldName) : ((OrmLiteConfig.DialectProvider.GetQuotedTableName(fi.BelongToModelName) + "." + OrmLiteConfig.DialectProvider.GetQuotedColumnName(fi.FieldName))));
                 }
                 if (colSB.Length == 0)
-                    colSB.AppendFormat("\"{0}\".*", OrmLiteConfig.DialectProvider.GetQuotedTableName(baseTableName));
+                    colSB.AppendFormat("\"{0}{1}\".*", baseSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(baseTableName));
             }
 
             sb.Append(colSB.ToString() + " \n");
 
-            sb.AppendFormat("FROM {0} \n", OrmLiteConfig.DialectProvider.GetQuotedTableName(baseTableName));
+            sb.AppendFormat("FROM {0}{1} \n", baseSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(baseTableName));
             int i = 0;
             foreach (var join in joinList)
             {
@@ -452,17 +462,17 @@ public string ToSql()
 
                 if (join.JoinType == JoinType.CROSS)
                 {
-                    sb.AppendFormat(" {0} ON {1} = {2}  \n", OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName));
+                    sb.AppendFormat(" {0}{1} ON {2} = {3}  \n", join.RefTypeSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName));
                 }
                 else
                 {
                     if (join.JoinType != JoinType.SELF)
                     {
-                        sb.AppendFormat(" {0} ON {1} = {2}  \n", OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName), join.Class1ColumnName, join.Class2ColumnName);
+                        sb.AppendFormat(" {0}{1} ON {2} = {3}  \n", join.RefTypeSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName), join.Class1ColumnName, join.Class2ColumnName);
                     }
                     else
                     {
-                        sb.AppendFormat(" {0} AS {1} ON {1}.{2} = \"{0}\".{3}  \n", OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName), OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName) + "_" + i.ToString(), join.Class1ColumnName, join.Class2ColumnName);
+                        sb.AppendFormat(" {0}{1} AS {2} ON {2}.{3} = \"{1}\".{4}  \n", join.RefTypeSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName), OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName) + "_" + i.ToString(), join.Class1ColumnName, join.Class2ColumnName);
                     }
                 }
             }
@@ -514,8 +524,11 @@ class Join
         public Type Class2Type { get; set; }
         public Type RefType { get; set; }
         public JoinType JoinType { get; set; }
+        public string Class1Schema { get; set; }
+        public string Class2Schema { get; set; }
         public string Class1TableName { get; set; }
         public string Class2TableName { get; set; }
+        public string RefTypeSchema { get; set; }
         public string RefTypeTableName { get; set; }
         public string Class1ColumnName { get; set; }
         public string Class2ColumnName { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,14 @@ public class JoinSqlBuilder<TNewPoco, TBasePoco>`
`14`	`14`	`private bool isDistinct = false;`
`15`	`15`	`private bool isAggregateUsed = false;`
`16`	`16`
	`17`	`+ private string baseSchema = "";`
`17`	`18`	`private string baseTableName = "";`
`18`	`19`	`private Type basePocoType;`
`19`	`20`
`20`	`21`	`public JoinSqlBuilder()`
`21`	`22`	`{`
`22`	`23`	`basePocoType = typeof(TBasePoco);`
	`24`	`+ baseSchema = GetSchema(basePocoType);`
`23`	`25`	`baseTableName = basePocoType.GetModelDefinition().ModelName;`
`24`	`26`	`}`
`25`	`27`
`@@ -89,7 +91,7 @@ private void ProcessNew(string tableName, NewExpression nex, List<string> lst, b`
`89`	`91`	`throw new Exception("Only column list allowed");`
`90`	`92`
`91`	`93`	`var expressionProperties = nex.Type.GetProperties();`
`92`		`- for (int i=0; i< nex.Arguments.Count;i++)`
	`94`	`+ for (int i = 0; i < nex.Arguments.Count; i++)`
`93`	`95`	`{`
`94`	`96`	`var arg = nex.Arguments[i];`
`95`	`97`	`var alias = expressionProperties[i].Name;`
`@@ -319,8 +321,11 @@ public JoinSqlBuilder<TNewPoco, TBasePoco> CrossJoin<TSourceTable, TDestinationT`
`319`	`321`	`else`
`320`	`322`	`join.RefType = join.Class1Type;`
`321`	`323`
	`324`	`+ join.Class1Schema = GetSchema(join.Class1Type);`
`322`	`325`	`join.Class1TableName = join.Class1Type.GetModelDefinition().ModelName;`
	`326`	`+ join.Class2Schema = GetSchema(join.Class2Type);`
`323`	`327`	`join.Class2TableName = join.Class2Type.GetModelDefinition().ModelName;`
	`328`	`+ join.RefTypeSchema = GetSchema(join.RefType);`
`324`	`329`	`join.RefTypeTableName = join.RefType.GetModelDefinition().ModelName;`
`325`	`330`
`326`	`331`	`if (join.JoinType != JoinType.CROSS)`
`@@ -369,6 +374,11 @@ public JoinSqlBuilder<TNewPoco, TBasePoco> CrossJoin<TSourceTable, TDestinationT`
`369`	`374`	`return this;`
`370`	`375`	`}`
`371`	`376`
	`377`	`+ private string GetSchema(Type type)`
	`378`	`+ {`
	`379`	`+ return string.IsNullOrEmpty(type.GetModelDefinition().Schema) ? string.Empty : string.Format("{0}.", type.GetModelDefinition().Schema);`
	`380`	`+ }`
	`381`	`+`
`372`	`382`	`private Type PreviousAssociatedType(Type sourceTableType, Type destinationTableType)`
`373`	`383`	`{`
`374`	`384`	`if (sourceTableType == basePocoType \|\| destinationTableType == basePocoType)`
`@@ -427,12 +437,12 @@ public string ToSql()`
`427`	`437`	`colSB.AppendFormat("{0}{1}", colSB.Length > 0 ? "," : "", String.IsNullOrEmpty(fi.BelongToModelName) ? (fi.FieldName) : ((OrmLiteConfig.DialectProvider.GetQuotedTableName(fi.BelongToModelName) + "." + OrmLiteConfig.DialectProvider.GetQuotedColumnName(fi.FieldName))));`
`428`	`438`	`}`
`429`	`439`	`if (colSB.Length == 0)`
`430`		`- colSB.AppendFormat("\"{0}\".*", OrmLiteConfig.DialectProvider.GetQuotedTableName(baseTableName));`
	`440`	`+ colSB.AppendFormat("\"{0}{1}\".*", baseSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(baseTableName));`
`431`	`441`	`}`
`432`	`442`
`433`	`443`	`sb.Append(colSB.ToString() + " \n");`
`434`	`444`
`435`		`- sb.AppendFormat("FROM {0} \n", OrmLiteConfig.DialectProvider.GetQuotedTableName(baseTableName));`
	`445`	`+ sb.AppendFormat("FROM {0}{1} \n", baseSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(baseTableName));`
`436`	`446`	`int i = 0;`
`437`	`447`	`foreach (var join in joinList)`
`438`	`448`	`{`
`@@ -452,17 +462,17 @@ public string ToSql()`
`452`	`462`
`453`	`463`	`if (join.JoinType == JoinType.CROSS)`
`454`	`464`	`{`
`455`		`- sb.AppendFormat(" {0} ON {1} = {2} \n", OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName));`
	`465`	`+ sb.AppendFormat(" {0}{1} ON {2} = {3} \n", join.RefTypeSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName));`
`456`	`466`	`}`
`457`	`467`	`else`
`458`	`468`	`{`
`459`	`469`	`if (join.JoinType != JoinType.SELF)`
`460`	`470`	`{`
`461`		`- sb.AppendFormat(" {0} ON {1} = {2} \n", OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName), join.Class1ColumnName, join.Class2ColumnName);`
	`471`	`+ sb.AppendFormat(" {0}{1} ON {2} = {3} \n", join.RefTypeSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName), join.Class1ColumnName, join.Class2ColumnName);`
`462`	`472`	`}`
`463`	`473`	`else`
`464`	`474`	`{`
`465`		`- sb.AppendFormat(" {0} AS {1} ON {1}.{2} = \"{0}\".{3} \n", OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName), OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName) + "_" + i.ToString(), join.Class1ColumnName, join.Class2ColumnName);`
	`475`	`+ sb.AppendFormat(" {0}{1} AS {2} ON {2}.{3} = \"{1}\".{4} \n", join.RefTypeSchema, OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName), OrmLiteConfig.DialectProvider.GetQuotedTableName(join.RefTypeTableName) + "_" + i.ToString(), join.Class1ColumnName, join.Class2ColumnName);`
`466`	`476`	`}`
`467`	`477`	`}`
`468`	`478`	`}`
`@@ -514,8 +524,11 @@ class Join`
`514`	`524`	`public Type Class2Type { get; set; }`
`515`	`525`	`public Type RefType { get; set; }`
`516`	`526`	`public JoinType JoinType { get; set; }`
	`527`	`+ public string Class1Schema { get; set; }`
	`528`	`+ public string Class2Schema { get; set; }`
`517`	`529`	`public string Class1TableName { get; set; }`
`518`	`530`	`public string Class2TableName { get; set; }`
	`531`	`+ public string RefTypeSchema { get; set; }`
`519`	`532`	`public string RefTypeTableName { get; set; }`
`520`	`533`	`public string Class1ColumnName { get; set; }`
`521`	`534`	`public string Class2ColumnName { get; set; }`