Use Schema in SqlExpressions

Author: mythz

src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs

@@ -107,17 +107,17 @@ private SqlExpression<T> InternalJoin(string joinType,
                 }
 
                 sqlExpr = "\n({0}.{1} = {2}.{3})".Fmt(
-                    SqlTable(parentDef.ModelName),
+                    DialectProvider.GetQuotedTableName(parentDef),
                     SqlColumn(parentDef.PrimaryKey.FieldName),
-                    SqlTable(childDef.ModelName),
+                    DialectProvider.GetQuotedTableName(childDef),
                     SqlColumn(refField.FieldName));
             }
 
             var joinDef = tableDefs.Contains(targetDef) && !tableDefs.Contains(sourceDef)
                               ? sourceDef
                               : targetDef;
 
-            sbJoin.Append(" {0} {1} ".Fmt(joinType, SqlTable(joinDef.ModelName)));
+            sbJoin.Append(" {0} {1} ".Fmt(joinType, SqlTable(joinDef)));
             sbJoin.Append(" ON ");
             sbJoin.Append(sqlExpr);
 
@@ -155,7 +155,7 @@ public string SelectInto<TModel>()
                                 sbSelect.Append(", ");
 
                             sbSelect.AppendFormat("{0}.{1}",
-                                SqlTable(tableDef.ModelName),
+                                SqlTable(tableDef),
                                 tableFieldDef.GetQuotedName(DialectProvider));
                             break;
                         }

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -597,9 +597,9 @@ public virtual SqlExpression<T> Insert()
             return this;
         }
 
-        public string SqlTable(string tableName)
+        public string SqlTable(ModelDefinition modelDef)
         {
-            return DialectProvider.GetQuotedTableName(tableName);
+            return DialectProvider.GetQuotedTableName(modelDef);
         }
 
         public string SqlColumn(string columnName)
@@ -1174,7 +1174,7 @@ protected virtual string GetQuotedColumnName(ModelDefinition tableDef, string me
                     : memberName;
 
                 return PrefixFieldWithTableName 
-                    ? DialectProvider.GetQuotedColumnName(tableDef.ModelName, fieldName)
+                    ? DialectProvider.GetQuotedColumnName(tableDef, fieldName)
                     : DialectProvider.GetQuotedColumnName(fieldName);
             }
             return memberName;

src/ServiceStack.OrmLite/OrmLiteDialectProviderExtensions.cs

@@ -42,9 +42,9 @@ public static string GetQuotedColumnName(this IOrmLiteDialectProvider dialect,
         }
 
         public static string GetQuotedColumnName(this IOrmLiteDialectProvider dialect,
-            string tableName, string fieldName)
+            ModelDefinition tableDef, string fieldName)
         {
-            return dialect.GetQuotedTableName(tableName) +
+            return dialect.GetQuotedTableName(tableDef) +
                 "." +
                 dialect.GetQuotedColumnName(fieldName);
         }

tests/ServiceStack.OrmLite.Tests/Issues/SchemaTests.cs

@@ -0,0 +1,71 @@
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+using ServiceStack.Logging;
+
+namespace ServiceStack.OrmLite.Tests.Issues
+{
+    [TestFixture]
+    public class SchemaTests : OrmLiteTestBase
+    {
+        public SchemaTests()
+        {
+            Dialect = Dialect.Sqlite; //Other DB Providers needs creating out-of-band 
+        }
+
+        [Schema("Schema")]
+        public class SchemaTable1
+        {
+            public int Id { get; set; }
+
+            public int SchemaTable2Id { get; set; }
+
+            [Reference]
+            public SchemaTable2 Child { get; set; }
+        }
+
+        [Schema("Schema")]
+        public class SchemaTable2
+        {
+            [AutoIncrement]
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+
+        [Test]
+        public void Can_join_on_table_with_schemas()
+        {
+            LogManager.LogFactory = new ConsoleLogFactory(debugEnabled: true);
+
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<SchemaTable1>();
+                db.DropAndCreateTable<SchemaTable2>();
+
+                db.Save(new SchemaTable1
+                {
+                    Id = 1,
+                    Child = new SchemaTable2 { Name = "Foo" }
+                }, references:true);
+
+                db.Save(new SchemaTable1
+                {
+                    Id = 2,
+                    Child = new SchemaTable2 { Name = "Bar" }
+                }, references: true);
+
+                var rows = db.Select<SchemaTable1>(q => q.Join<SchemaTable2>());
+                Assert.That(rows.Count, Is.EqualTo(2));
+                rows = db.Select<SchemaTable1>(q => q.Join<SchemaTable2>()
+                    .Where<SchemaTable2>(x => x.Name == "Foo"));
+                Assert.That(rows.Count, Is.EqualTo(1));
+
+                rows = db.Select<SchemaTable1>(q => q.LeftJoin<SchemaTable2>());
+                Assert.That(rows.Count, Is.EqualTo(2));
+                rows = db.Select<SchemaTable1>(q => q.LeftJoin<SchemaTable2>()
+                    .Where<SchemaTable2>(x => x.Name == "Foo"));
+                Assert.That(rows.Count, Is.EqualTo(1));
+            }
+        }
+    }
+}

tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

@@ -127,6 +127,7 @@
     <Compile Include="Expression\SelectExpressionTests.cs" />
     <Compile Include="Issues\MismatchSchemaTests.cs" />
     <Compile Include="Issues\MultithreadingIssueTests.cs" />
+    <Compile Include="Issues\SchemaTests.cs" />
     <Compile Include="Issues\SelectIntoTests.cs" />
     <Compile Include="LicenseUsageTests.cs" />
     <Compile Include="LoadReferencesJoinTests.cs" />