Merge pull request #312 from fabalcu97/master

Added database support to validate schemas
django-tenants · Oct 27, 2019 · c442d67 · c442d67
2 parents 855453f + d02a4ee
commit c442d67
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/django_tenants/management/commands/migrate_schemas.py b/django_tenants/management/commands/migrate_schemas.py
@@ -49,7 +49,7 @@ def handle(self, *args, **options):
             executor.run_migrations(tenants=[self.PUBLIC_SCHEMA_NAME])
         if self.sync_tenant:
             if self.schema_name and self.schema_name != self.PUBLIC_SCHEMA_NAME:
-                if not schema_exists(self.schema_name):
+                if not schema_exists(self.schema_name, self.options.get('database', None)):
                     raise RuntimeError('Schema "{}" does not exist'.format(
                         self.schema_name))
                 else:

diff --git a/django_tenants/migration_executors/base.py b/django_tenants/migration_executors/base.py
@@ -24,7 +24,7 @@ def style_func(msg):
             msg
         )
 
-    connection = connections[get_tenant_database_alias()]
+    connection = connections[options.get('database', get_tenant_database_alias())]
     connection.set_schema(schema_name)
 
     stdout = OutputWrapper(sys.stdout)

diff --git a/django_tenants/utils.py b/django_tenants/utils.py
@@ -136,8 +136,8 @@ def django_is_in_test_mode():
     return hasattr(mail, 'outbox')
 
 
-def schema_exists(schema_name):
-    _connection = connections[get_tenant_database_alias()]
+def schema_exists(schema_name, database=get_tenant_database_alias()):
+    _connection = connections[database]
     cursor = _connection.cursor()
 
     # check if this schema already exists in the db