Small compat fixes around psycopg.sql

django · May 12, 2022 · ccbef0f · ccbef0f
1 parent 6519844
commit ccbef0f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py
@@ -6,7 +6,10 @@
 from django.db.backends.utils import split_tzname_delta
 from django.db.models.constants import OnConflict
 
-from psycopg.sql import SQL, Literal
+try:
+    from psycopg.sql import SQL, Literal
+except ImportError:
+    from psycopg2.sql import SQL, Literal
 
 
 class DatabaseOperations(BaseDatabaseOperations):

diff --git a/django/db/backends/postgresql/schema.py b/django/db/backends/postgresql/schema.py
@@ -1,11 +1,14 @@
-import psycopg.sql
-
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.backends.ddl_references import IndexColumns
 from django.db.backends.utils import strip_quotes
 
 from .operations import compose
 
+try:
+    import psycopg.sql as psycopg_sql
+except ImportError:
+    import psycopg2.sql as psycopg_sql
+
 
 class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
 
@@ -64,7 +67,7 @@ def execute(self, sql, params=()):
     def quote_value(self, value):
         if isinstance(value, str):
             value = value.replace("%", "%%")
-        return psycopg.sql.quote(value)
+        return psycopg_sql.quote(value)
 
     def _field_indexes_sql(self, model, field):
         output = super()._field_indexes_sql(model, field)