#424: Added IF EXISTS to DROP SCHEMA queries

bernardopires · Feb 22, 2017 · 3579735 · 3579735
1 parent 93a0780
commit 3579735
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tenant_schemas/models.py b/tenant_schemas/models.py
@@ -67,7 +67,7 @@ def delete(self, force_drop=False, *args, **kwargs):
 
         if schema_exists(self.schema_name) and (self.auto_drop_schema or force_drop):
             cursor = connection.cursor()
-            cursor.execute('DROP SCHEMA %s CASCADE' % self.schema_name)
+            cursor.execute('DROP SCHEMA IF EXISTS %s CASCADE' % self.schema_name)
 
         super(TenantMixin, self).delete(*args, **kwargs)
 

diff --git a/tenant_schemas/test/cases.py b/tenant_schemas/test/cases.py
@@ -22,7 +22,7 @@ def tearDownClass(cls):
         cls.tenant.delete()
 
         cursor = connection.cursor()
-        cursor.execute('DROP SCHEMA test CASCADE')
+        cursor.execute('DROP SCHEMA IF EXISTS test CASCADE')
 
     @classmethod
     def sync_shared(cls):

diff --git a/tenant_schemas/tests/testcases.py b/tenant_schemas/tests/testcases.py
@@ -25,7 +25,7 @@ def setUpClass(cls):
         # a blank public schema for this set of tests.
         connection.set_schema_to_public()
         cursor = connection.cursor()
-        cursor.execute('DROP SCHEMA %s CASCADE; CREATE SCHEMA %s;'
+        cursor.execute('DROP SCHEMA IF EXISTS %s CASCADE; CREATE SCHEMA %s;'
                        % (get_public_schema_name(), get_public_schema_name()))
         super(BaseTestCase, cls).setUpClass()