Ticket #13161: patch-r12807.diff

base.py

@@ -26 +26 @@
 DatabaseError = Database.DatabaseError
 IntegrityError = Database.IntegrityError
 
-psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
 psycopg2.extensions.register_adapter(SafeString, psycopg2.extensions.QuotedString)
 psycopg2.extensions.register_adapter(SafeUnicode, psycopg2.extensions.QuotedString)
 
@@ -98 +97 @@
 
     def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
-
+        self._set_extension()
         self.features = DatabaseFeatures()
         autocommit = self.settings_dict["OPTIONS"].get('autocommit', False)
         self.features.uses_autocommit = autocommit
@@ -108 +107 @@
         self.creation = DatabaseCreation(self)
         self.introspection = DatabaseIntrospection(self)
         self.validation = BaseDatabaseValidation(self)
-
+    
+    def _set_extension(self):
+        if self.connection:
+            psycopg2.extensions.register_type(psycopg2.extensions.UNICODE,  self.connection)
+    
     def _cursor(self):
         new_connection = False
         set_tz = False
@@ -134 +137 @@
             if settings_dict['PORT']:
                 conn_params['port'] = settings_dict['PORT']
             self.connection = Database.connect(**conn_params)
+            self._set_extension()
             self.connection.set_client_encoding('UTF8')
             self.connection.set_isolation_level(self.isolation_level)
             connection_created.send(sender=self.__class__)