Ticket #5996: pg_safeunicode.diff

django/db/backends/postgresql_psycopg2/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
-try:
-    import psycopg2 as Database
-    import psycopg2.extensions
@@ -17 +18 @@
-IntegrityError = Database.IntegrityError
-
-psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
+psycopg2.extensions.register_adapter(SafeUnicode, psycopg2.extensions.QuotedString)
-
-class DatabaseFeatures(BaseDatabaseFeatures):
-    needs_datetime_string_cast = False

tests/modeltests/field_defaults/models.py

@@ -48 +48 @@
->>> d = now - a.pub_date
->>> d.seconds < 5
-True
+
+# make sure that SafeUnicode fields work
+>>> from django.utils.safestring import SafeUnicode
+>>> a.headline = SafeUnicode(u'SafeUnicode Headline')
+>>> a.save()
-"""}