Ticket #7464: base.py.patch

base.py

@@ -6 +6 @@
 
 from django.db.backends import BaseDatabaseWrapper, BaseDatabaseFeatures
 from django.db.backends.postgresql.operations import DatabaseOperations as PostgresqlDatabaseOperations
-from django.utils.safestring import SafeUnicode
+from django.utils.safestring import SafeUnicode, SafeString
 try:
     import psycopg2 as Database
     import psycopg2.extensions
@@ -18 +18 @@
 IntegrityError = Database.IntegrityError
 
 psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
-psycopg2.extensions.register_adapter(SafeUnicode, psycopg2.extensions.QuotedString)
+psycopg2.extensions.register_adapter(SafeUnicode, psycopg2.extensions.UNICODE)
+psycopg2.extensions.register_adapter(SafeString, psycopg2.extensions.QuotedString)
 
 class DatabaseFeatures(BaseDatabaseFeatures):
     needs_datetime_string_cast = False