Add optional schema to DoesTableExist and use in Create and Drop Table API's

mythz · mythz · commit 103c0410c39d · 2015-01-17T16:04:11.000-05:00
diff --git a/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs
@@ -233,7 +233,7 @@ public override string ToInsertRowStatement(IDbCommand dbCommand, object objWith
             }
 
             var sql = string.Format("INSERT INTO {0} ({1}) VALUES ({2});",
-                                    GetQuotedTableName(modelDef), sbColumnNames, sbColumnValues);
+                GetQuotedTableName(modelDef), sbColumnNames, sbColumnValues);
 
             return sql;
         }
@@ -699,18 +699,26 @@ public override string GetQuotedName(string fieldName)
             return Quote(fieldName);
         }
 
-        public override string GetQuotedTableName(ModelDefinition modelDef)
+        public virtual string GetTableName(string table, string schema = null)
         {
-            if (!modelDef.IsInSchema)
-                return Quote(NamingStrategy.GetTableName(modelDef.ModelName));
+            return schema != null
+                ? string.Format("{0}_{1}",
+                    NamingStrategy.GetSchemaName(schema),
+                    NamingStrategy.GetTableName(table))
+                : NamingStrategy.GetTableName(table);
+        }
 
-            return Quote(string.Format("{0}_{1}", modelDef.Schema,
-                NamingStrategy.GetTableName(modelDef.ModelName)));
+        public virtual string GetTableName(ModelDefinition modelDef)
+        {
+            return GetTableName(modelDef.ModelName, modelDef.Schema);
         }
 
-        public override string GetQuotedTableName(string tableName)
+        public override string GetQuotedTableName(ModelDefinition modelDef)
         {
-            return Quote(NamingStrategy.GetTableName(tableName));
+            if (!modelDef.IsInSchema)
+                return Quote(NamingStrategy.GetTableName(modelDef.ModelName));
+
+            return Quote(GetTableName(modelDef.ModelName, modelDef.Schema));
         }
 
         public override string GetQuotedColumnName(string fieldName)
@@ -730,7 +738,7 @@ public override SqlExpression<T> SqlExpression<T>()
             return new FirebirdSqlExpression<T>(this);
         }
 
-        public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
+        public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
         {
             if (!QuoteNames & !RESERVED.Contains(tableName.ToUpper()))
             {
@@ -773,7 +781,7 @@ public override string ToAddColumnStatement(Type modelType, FieldDefinition fiel
                                              fieldDef.DefaultValue,
                                              fieldDef.CustomFieldDefinition);
             return string.Format("ALTER TABLE {0} ADD {1} ;",
-                                 GetQuotedTableName(GetModel(modelType).ModelName),
+                                 GetQuotedTableName(GetModel(modelType)),
                                  column);
         }
 
@@ -791,7 +799,7 @@ public override string ToAlterColumnStatement(Type modelType, FieldDefinition fi
                                              fieldDef.DefaultValue,
                                              fieldDef.CustomFieldDefinition);
             return string.Format("ALTER TABLE {0} ALTER {1} ;",
-                                 GetQuotedTableName(GetModel(modelType).ModelName),
+                                 GetQuotedTableName(GetModel(modelType)),
                                  column);
         }
 
@@ -800,7 +808,7 @@ public override string ToChangeColumnNameStatement(Type modelType,
                                                            string oldColumnName)
         {
             return string.Format("ALTER TABLE {0} ALTER {1} TO {2} ;",
-                                 GetQuotedTableName(GetModel(modelType).ModelName),
+                                 GetQuotedTableName(GetModel(modelType)),
                                  GetQuotedColumnName(oldColumnName),
                                  GetQuotedColumnName(fieldDef.FieldName));
         }
diff --git a/src/ServiceStack.OrmLite.MySql/MySqlDialectProvider.cs b/src/ServiceStack.OrmLite.MySql/MySqlDialectProvider.cs
@@ -147,7 +147,7 @@ public override SqlExpression<T> SqlExpression<T>()
             return new MySqlExpression<T>(this);
         }
 
-        public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
+        public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
         {
             //Same as SQL Server apparently?
             var sql = ("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES " +
diff --git a/src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs
@@ -982,7 +982,7 @@ public override SqlExpression<T> SqlExpression<T>()
             return new OracleSqlExpression<T>(this);
         }
 
-        public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
+        public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
         {
             if (!WillQuote(tableName)) tableName = tableName.ToUpper();
 
diff --git a/src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs b/src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs
@@ -216,19 +216,24 @@ public override SqlExpression<T> SqlExpression<T>()
             return new PostgreSqlExpression<T>(this);
         }
 
-        public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
+        public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
         {
             var sql = "SELECT COUNT(*) FROM pg_class WHERE relname = {0}"
                 .SqlFmt(tableName);
+
             var conn = dbCmd.Connection;
             if (conn != null)
             {
                 var builder = new NpgsqlConnectionStringBuilder(conn.ConnectionString);
+                if (schema == null)
+                    schema = builder.SearchPath;
+                
                 // If a search path (schema) is specified, and there is only one, then assume the CREATE TABLE directive should apply to that schema.
-                if (!String.IsNullOrEmpty(builder.SearchPath) && !builder.SearchPath.Contains(","))
+                if (!string.IsNullOrEmpty(schema) && !schema.Contains(","))
                     sql = "SELECT COUNT(*) FROM pg_class JOIN pg_catalog.pg_namespace n ON n.oid = pg_class.relnamespace WHERE relname = {0} AND nspname = {1}"
-                          .SqlFmt(tableName, builder.SearchPath);
+                          .SqlFmt(tableName, schema);
             }
+
             dbCmd.CommandText = sql;
             var result = dbCmd.LongScalar();
 
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs
@@ -226,13 +226,13 @@ public override SqlExpression<T> SqlExpression<T>()
             return new SqlServerExpression<T>(this);
         }
 
-        public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
+        public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
         {
             var sql = "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = {0}"
                 .SqlFmt(tableName);
 
-            //if (!string.IsNullOrEmpty(schemaName))
-            //    sql += " AND TABLE_SCHEMA = {0}".SqlFmt(schemaName);
+            if (schema != null)
+                sql += " AND TABLE_SCHEMA = {0}".SqlFmt(schema);
 
             dbCmd.CommandText = sql;
             var result = dbCmd.LongScalar();
diff --git a/src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs
@@ -134,20 +134,27 @@ public override IDbConnection CreateConnection(string connectionString, Dictiona
 
         protected abstract IDbConnection CreateConnection(string connectionString);
 
+        public virtual string GetTableName(string table, string schema=null)
+        {
+            return schema != null
+                ? string.Format("{0}_{1}", 
+                    NamingStrategy.GetSchemaName(schema),
+                    NamingStrategy.GetTableName(table))
+                : NamingStrategy.GetTableName(table);
+        }
+
         public virtual string GetTableName(ModelDefinition modelDef)
         {
-            var tableName = NamingStrategy.GetTableName(modelDef.ModelName);
-            return !modelDef.IsInSchema 
-                ? tableName
-                : string.Format("{0}_{1}", modelDef.Schema, tableName);
+            return GetTableName(modelDef.ModelName, modelDef.Schema);
         }
 
         public override string GetQuotedTableName(ModelDefinition modelDef)
         {
             if (!modelDef.IsInSchema)
                 return base.GetQuotedTableName(modelDef);
 
-            return string.Format("\"{0}_{1}\"", modelDef.Schema, modelDef.ModelName);
+            return string.Format("\"{0}\"",
+                GetTableName(modelDef.ModelName, modelDef.Schema));
         }
 
         public override object ConvertDbValue(object value, Type type)
@@ -245,10 +252,10 @@ public override SqlExpression<T> SqlExpression<T>()
             return new SqliteExpression<T>(this);
         }
 
-        public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
+        public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
         {
             var sql = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name = {0}"
-                .SqlFmt(tableName);
+                .SqlFmt(GetTableName(tableName, schema));
 
             dbCmd.CommandText = sql;
             var result = dbCmd.LongScalar();
diff --git a/src/ServiceStack.OrmLite.VistaDB/VistaDbDialectProvider.cs b/src/ServiceStack.OrmLite.VistaDB/VistaDbDialectProvider.cs
@@ -320,7 +320,7 @@ public override SqlExpression<T> SqlExpression<T>()
             return new VistaDbExpression<T>(this);
         }
 
-        public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
+        public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
         {
             dbCmd.CommandText = "SELECT COUNT(*) FROM [database schema] WHERE typeid = 1 AND name = {0}"
                 .SqlFmt(tableName);
diff --git a/src/ServiceStack.OrmLite/INamingStrategy.cs b/src/ServiceStack.OrmLite/INamingStrategy.cs
@@ -3,6 +3,8 @@ namespace ServiceStack.OrmLite
 {
     public interface INamingStrategy
     {
+        string GetSchemaName(string name);
+        string GetSchemaName(ModelDefinition modelDef);
         string GetTableName(string name);
         string GetTableName(ModelDefinition modelDef);
         string GetColumnName(string name);
diff --git a/src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs
@@ -123,8 +123,8 @@ string ToSelectFromProcedureStatement(object fromObjWithProperties,
 
         List<string> SequenceList(Type tableType);
 
-        bool DoesTableExist(IDbConnection db, string tableName);
-        bool DoesTableExist(IDbCommand dbCmd, string tableName);
+        bool DoesTableExist(IDbConnection db, string tableName, string schema = null);
+        bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null);
 
         bool DoesSequenceExist(IDbCommand dbCmd, string sequencName);
 
diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -1032,12 +1032,12 @@ public virtual string GetColumnTypeDefinition(Type fieldType)
             return fieldDefinition ?? GetUndefinedColumnDefinition(fieldType, null);
         }
 
-        public virtual bool DoesTableExist(IDbConnection db, string tableName)
+        public virtual bool DoesTableExist(IDbConnection db, string tableName, string schema = null)
         {
-            return db.Exec(dbCmd => DoesTableExist(dbCmd, tableName));
+            return db.Exec(dbCmd => DoesTableExist(dbCmd, tableName, schema));
         }
 
-        public virtual bool DoesTableExist(IDbCommand dbCmd, string tableName)
+        public virtual bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
         {
             return false;
         }
diff --git a/src/ServiceStack.OrmLite/OrmLiteNamingStrategyBase.cs b/src/ServiceStack.OrmLite/OrmLiteNamingStrategyBase.cs
@@ -14,6 +14,16 @@ namespace ServiceStack.OrmLite
 {
     public class OrmLiteNamingStrategyBase : INamingStrategy
     {
+        public virtual string GetSchemaName(string name)
+        {
+            return name;
+        }
+
+        public virtual string GetSchemaName(ModelDefinition modelDef)
+        {
+            return GetSchemaName(modelDef.Schema);
+        }
+
         public virtual string GetTableName(string name)
         {
             return name;
diff --git a/src/ServiceStack.OrmLite/OrmLiteSchemaApi.cs b/src/ServiceStack.OrmLite/OrmLiteSchemaApi.cs
@@ -9,9 +9,9 @@ public static class OrmLiteSchemaApi
         /// Checks whether a Table Exists. E.g:
         /// <para>db.TableExists("Person")</para>
         /// </summary>
-        public static bool TableExists(this IDbConnection dbConn, string tableName)
+        public static bool TableExists(this IDbConnection dbConn, string tableName, string schema=null)
         {
-            return dbConn.GetDialectProvider().DoesTableExist(dbConn, tableName);
+            return dbConn.GetDialectProvider().DoesTableExist(dbConn, tableName, schema);
         }
 
         /// <summary>
@@ -23,7 +23,7 @@ public static bool TableExists<T>(this IDbConnection dbConn)
             var dialectProvider = dbConn.GetDialectProvider();
             var modelDef = typeof(T).GetModelDefinition();
             var tableName = dialectProvider.NamingStrategy.GetTableName(modelDef);
-            return dialectProvider.DoesTableExist(dbConn, tableName);
+            return dialectProvider.DoesTableExist(dbConn, tableName, modelDef.Schema);
         }
 
         /// <summary>
diff --git a/src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs
@@ -50,7 +50,8 @@ internal static void CreateTable(this IDbCommand dbCmd, bool overwrite, Type mod
 
             var dialectProvider = dbCmd.GetDialectProvider();
             var tableName = dialectProvider.NamingStrategy.GetTableName(modelDef);
-            var tableExists = dialectProvider.DoesTableExist(dbCmd, tableName);
+            var schema = dialectProvider.NamingStrategy.GetSchemaName(modelDef);
+            var tableExists = dialectProvider.DoesTableExist(dbCmd, tableName, schema);
             if (overwrite && tableExists)
             {
                 if (modelDef.PreDropTableSql != null)
@@ -184,8 +185,9 @@ private static void DropTable(IDbCommand dbCmd, ModelDefinition modelDef)
             {
                 var dialectProvider = dbCmd.GetDialectProvider();
                 var tableName = dialectProvider.NamingStrategy.GetTableName(modelDef);
+                var schema = dialectProvider.NamingStrategy.GetSchemaName(modelDef);
 
-                if (dialectProvider.DoesTableExist(dbCmd, tableName))
+                if (dialectProvider.DoesTableExist(dbCmd, tableName, schema))
                 {
                     if (modelDef.PreDropTableSql != null)
                     {
diff --git a/tests/ServiceStack.OrmLite.Tests/Issues/JoinsWithSchemas.cs b/tests/ServiceStack.OrmLite.Tests/Issues/JoinsWithSchemas.cs
@@ -27,6 +27,32 @@ public class PlainModel
 
     public class JoinsWithSchemas : OrmLiteTestBase
     {
+        [Test]
+        public void Can_detect_if_table_with_schema_exists()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropTable<Entity1>();
+                db.DropTable<Entity2>();
+
+                var exists = db.TableExists<Entity1>();
+                Assert.That(exists, Is.False);
+
+                exists = db.TableExists<Entity2>();
+                Assert.That(exists, Is.False);
+
+                db.CreateTable<Entity1>();
+                db.CreateTable<Entity2>();
+
+                exists = db.TableExists<Entity1>();
+                Assert.That(exists, Is.True);
+
+                exists = db.TableExists<Entity2>();
+                Assert.That(exists, Is.True);
+
+            }
+        }
+
         [Test]
         public void Can_join_entities_with_Schema()
         {

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public override string ToInsertRowStatement(IDbCommand dbCommand, object objWith`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`var sql = string.Format("INSERT INTO {0} ({1}) VALUES ({2});",`
`236`		`- GetQuotedTableName(modelDef), sbColumnNames, sbColumnValues);`
	`236`	`+ GetQuotedTableName(modelDef), sbColumnNames, sbColumnValues);`
`237`	`237`
`238`	`238`	`return sql;`
`239`	`239`	`}`
`@@ -699,18 +699,26 @@ public override string GetQuotedName(string fieldName)`
`699`	`699`	`return Quote(fieldName);`
`700`	`700`	`}`
`701`	`701`
`702`		`- public override string GetQuotedTableName(ModelDefinition modelDef)`
	`702`	`+ public virtual string GetTableName(string table, string schema = null)`
`703`	`703`	`{`
`704`		`- if (!modelDef.IsInSchema)`
`705`		`- return Quote(NamingStrategy.GetTableName(modelDef.ModelName));`
	`704`	`+ return schema != null`
	`705`	`+ ? string.Format("{0}_{1}",`
	`706`	`+ NamingStrategy.GetSchemaName(schema),`
	`707`	`+ NamingStrategy.GetTableName(table))`
	`708`	`+ : NamingStrategy.GetTableName(table);`
	`709`	`+ }`
`706`	`710`
`707`		`- return Quote(string.Format("{0}_{1}", modelDef.Schema,`
`708`		`- NamingStrategy.GetTableName(modelDef.ModelName)));`
	`711`	`+ public virtual string GetTableName(ModelDefinition modelDef)`
	`712`	`+ {`
	`713`	`+ return GetTableName(modelDef.ModelName, modelDef.Schema);`
`709`	`714`	`}`
`710`	`715`
`711`		`- public override string GetQuotedTableName(string tableName)`
	`716`	`+ public override string GetQuotedTableName(ModelDefinition modelDef)`
`712`	`717`	`{`
`713`		`- return Quote(NamingStrategy.GetTableName(tableName));`
	`718`	`+ if (!modelDef.IsInSchema)`
	`719`	`+ return Quote(NamingStrategy.GetTableName(modelDef.ModelName));`
	`720`	`+`
	`721`	`+ return Quote(GetTableName(modelDef.ModelName, modelDef.Schema));`
`714`	`722`	`}`
`715`	`723`
`716`	`724`	`public override string GetQuotedColumnName(string fieldName)`
`@@ -730,7 +738,7 @@ public override SqlExpression<T> SqlExpression<T>()`
`730`	`738`	`return new FirebirdSqlExpression<T>(this);`
`731`	`739`	`}`
`732`	`740`
`733`		`- public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`
	`741`	`+ public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)`
`734`	`742`	`{`
`735`	`743`	`if (!QuoteNames & !RESERVED.Contains(tableName.ToUpper()))`
`736`	`744`	`{`
`@@ -773,7 +781,7 @@ public override string ToAddColumnStatement(Type modelType, FieldDefinition fiel`
`773`	`781`	`fieldDef.DefaultValue,`
`774`	`782`	`fieldDef.CustomFieldDefinition);`
`775`	`783`	`return string.Format("ALTER TABLE {0} ADD {1} ;",`
`776`		`- GetQuotedTableName(GetModel(modelType).ModelName),`
	`784`	`+ GetQuotedTableName(GetModel(modelType)),`
`777`	`785`	`column);`
`778`	`786`	`}`
`779`	`787`
`@@ -791,7 +799,7 @@ public override string ToAlterColumnStatement(Type modelType, FieldDefinition fi`
`791`	`799`	`fieldDef.DefaultValue,`
`792`	`800`	`fieldDef.CustomFieldDefinition);`
`793`	`801`	`return string.Format("ALTER TABLE {0} ALTER {1} ;",`
`794`		`- GetQuotedTableName(GetModel(modelType).ModelName),`
	`802`	`+ GetQuotedTableName(GetModel(modelType)),`
`795`	`803`	`column);`
`796`	`804`	`}`
`797`	`805`
`@@ -800,7 +808,7 @@ public override string ToChangeColumnNameStatement(Type modelType,`
`800`	`808`	`string oldColumnName)`
`801`	`809`	`{`
`802`	`810`	`return string.Format("ALTER TABLE {0} ALTER {1} TO {2} ;",`
`803`		`- GetQuotedTableName(GetModel(modelType).ModelName),`
	`811`	`+ GetQuotedTableName(GetModel(modelType)),`
`804`	`812`	`GetQuotedColumnName(oldColumnName),`
`805`	`813`	`GetQuotedColumnName(fieldDef.FieldName));`
`806`	`814`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public override SqlExpression<T> SqlExpression<T>()`
`147`	`147`	`return new MySqlExpression<T>(this);`
`148`	`148`	`}`
`149`	`149`
`150`		`- public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`
	`150`	`+ public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)`
`151`	`151`	`{`
`152`	`152`	`//Same as SQL Server apparently?`
`153`	`153`	`var sql = ("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES " +`
Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,7 @@ public override SqlExpression<T> SqlExpression<T>()`
`982`	`982`	`return new OracleSqlExpression<T>(this);`
`983`	`983`	`}`
`984`	`984`
`985`		`- public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`
	`985`	`+ public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)`
`986`	`986`	`{`
`987`	`987`	`if (!WillQuote(tableName)) tableName = tableName.ToUpper();`
`988`	`988`
Original file line number	Diff line number	Diff line change
`@@ -226,13 +226,13 @@ public override SqlExpression<T> SqlExpression<T>()`
`226`	`226`	`return new SqlServerExpression<T>(this);`
`227`	`227`	`}`
`228`	`228`
`229`		`- public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`
	`229`	`+ public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)`
`230`	`230`	`{`
`231`	`231`	`var sql = "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = {0}"`
`232`	`232`	`.SqlFmt(tableName);`
`233`	`233`
`234`		`- //if (!string.IsNullOrEmpty(schemaName))`
`235`		`- // sql += " AND TABLE_SCHEMA = {0}".SqlFmt(schemaName);`
	`234`	`+ if (schema != null)`
	`235`	`+ sql += " AND TABLE_SCHEMA = {0}".SqlFmt(schema);`
`236`	`236`
`237`	`237`	`dbCmd.CommandText = sql;`
`238`	`238`	`var result = dbCmd.LongScalar();`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ public override SqlExpression<T> SqlExpression<T>()`
`320`	`320`	`return new VistaDbExpression<T>(this);`
`321`	`321`	`}`
`322`	`322`
`323`		`- public override bool DoesTableExist(IDbCommand dbCmd, string tableName)`
	`323`	`+ public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)`
`324`	`324`	`{`
`325`	`325`	`dbCmd.CommandText = "SELECT COUNT(*) FROM [database schema] WHERE typeid = 1 AND name = {0}"`
`326`	`326`	`.SqlFmt(tableName);`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ namespace ServiceStack.OrmLite`
`3`	`3`	`{`
`4`	`4`	`public interface INamingStrategy`
`5`	`5`	`{`
	`6`	`+ string GetSchemaName(string name);`
	`7`	`+ string GetSchemaName(ModelDefinition modelDef);`
`6`	`8`	`string GetTableName(string name);`
`7`	`9`	`string GetTableName(ModelDefinition modelDef);`
`8`	`10`	`string GetColumnName(string name);`
Original file line number	Diff line number	Diff line change
`@@ -1032,12 +1032,12 @@ public virtual string GetColumnTypeDefinition(Type fieldType)`
`1032`	`1032`	`return fieldDefinition ?? GetUndefinedColumnDefinition(fieldType, null);`
`1033`	`1033`	`}`
`1034`	`1034`
`1035`		`- public virtual bool DoesTableExist(IDbConnection db, string tableName)`
	`1035`	`+ public virtual bool DoesTableExist(IDbConnection db, string tableName, string schema = null)`
`1036`	`1036`	`{`
`1037`		`- return db.Exec(dbCmd => DoesTableExist(dbCmd, tableName));`
	`1037`	`+ return db.Exec(dbCmd => DoesTableExist(dbCmd, tableName, schema));`
`1038`	`1038`	`}`
`1039`	`1039`
`1040`		`- public virtual bool DoesTableExist(IDbCommand dbCmd, string tableName)`
	`1040`	`+ public virtual bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)`
`1041`	`1041`	`{`
`1042`	`1042`	`return false;`
`1043`	`1043`	`}`