Fix for psql support

django-tenants · Nov 22, 2021 · c6f19b8 · c6f19b8
1 parent 1d430b2
commit c6f19b8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/django_tenants/postgresql_backend/introspection.py b/django_tenants/postgresql_backend/introspection.py
@@ -13,11 +13,15 @@ def __init__(self, cursor, connection):
 
     def __enter__(self):
         self.cursor.execute('SHOW search_path')
-        self.original_search_path = self.cursor.fetchone()[0]
-        self.cursor.execute("SET search_path = %s" % self.connection.schema_name)
+        self.original_search_path = self.cursor.fetchone()[0].split(',')
+        self.cursor.execute(f"SET search_path = '{self.connection.schema_name}'")
 
     def __exit__(self, *args, **kwargs):
-        self.cursor.execute("SET search_path = %s" % self.original_search_path)
+        formatted_search_paths = ', '.join(
+            f"'{search_path.strip()}'"
+            for search_path in self.original_search_path
+        )
+        self.cursor.execute(f'SET search_path = {formatted_search_paths}')
 
 
 class DatabaseSchemaIntrospection(DatabaseIntrospection):