Merge pull request #233 from chrismcv/Schema_fix

Support for single schema in search path for table creation

Author: mythz

src/ServiceStack.OrmLite.PostgreSQL.Tests/CreatePostgreSQLTablesTests.cs

@@ -6,6 +6,7 @@
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
 using ServiceStack.OrmLite.Tests;
+using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.PostgreSQL.Tests
 {
@@ -48,5 +49,55 @@ private class CreatePostgreSQLTablesTests_dummy_table
             [StringLength(100)]
             public String String100Characters { get; set; }
         }
+          
+        [Test]
+        public void can_create_same_table_in_multiple_schemas_based_on_conn_string_search_path()
+        {
+            var builder = new Npgsql.NpgsqlConnectionStringBuilder(ConnectionString);
+            var schema1 = "schema_1";
+            var schema2 = "schema_2";
+            using (var db = ConnectionString.OpenDbConnection())
+            {
+                CreateSchemaIfNotExists(db, schema1);
+                CreateSchemaIfNotExists(db, schema2);
+            }
+
+            builder.SearchPath = schema1;
+            using (var dbS1 = builder.ToString().OpenDbConnection())
+            {
+                dbS1.DropTable<CreatePostgreSQLTablesTests_dummy_table>();
+                dbS1.CreateTable<CreatePostgreSQLTablesTests_dummy_table>();
+                Assert.That(dbS1.Count<CreatePostgreSQLTablesTests_dummy_table>(), Is.EqualTo(0));
+            }
+            builder.SearchPath = schema2;
+
+            using (var dbS2 = builder.ToString().OpenDbConnection())
+            {
+                dbS2.DropTable<CreatePostgreSQLTablesTests_dummy_table>();
+                dbS2.CreateTable<CreatePostgreSQLTablesTests_dummy_table>();
+                Assert.That(dbS2.Count<CreatePostgreSQLTablesTests_dummy_table>(), Is.EqualTo(0));
+            }
+
+        }
+
+        private void CreateSchemaIfNotExists(System.Data.IDbConnection db, string name)
+        {
+            string createSchemaSQL = @"DO $$
+BEGIN
+
+    IF NOT EXISTS(
+        SELECT schema_name
+          FROM information_schema.schemata
+          WHERE schema_name = '{0}'
+      )
+    THEN
+      EXECUTE 'CREATE SCHEMA ""{0}""';
+    END IF;
+
+END
+$$;"
+                .Fmt(name);
+            db.ExecuteSql(createSchemaSQL);
+        }
     }
 }

src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

@@ -157,7 +157,15 @@ public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
 		{
 			var sql = "SELECT COUNT(*) FROM pg_class WHERE relname = {0}"
 				.SqlFormat(tableName);
-
+		    var conn = dbCmd.Connection;
+            if (conn != null)
+            {
+                var builder = new NpgsqlConnectionStringBuilder(conn.ConnectionString);
+                // 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(","))
+                    sql = "SELECT COUNT(*) FROM pg_class JOIN pg_catalog.pg_namespace n ON n.oid = pg_class.relnamespace WHERE relname = {0} AND nspname = {1}"
+                          .SqlFormat(tableName, builder.SearchPath);
+            }     
 			dbCmd.CommandText = sql;
 			var result = dbCmd.GetLongScalar();