Changeset 5535

Timestamp:

06/25/07 09:40:08 (1 year ago)

Author:

mtredinnick

Message:

Fixed #4664 -- Forced the client character set encoding to UTF-8 for PostgreSQL
(via the psycopg backend). The previous version was causing problems on some
setups, particularly PostgreSQL 7.x. Current code should work with 7.x and 8.x,
no matter what the default client encoding is.

Files:

• django/branches/unicode/django/db/backends/postgresql/base.py (modified) (5 diffs)
• django/branches/unicode/django/db/backends/postgresql/encodings.py (deleted)

django/branches/unicode/django/db/backends/postgresql/base.py

@@ -7 +7 @@
-from django.utils.encoding import smart_str, smart_unicode
-from django.db.backends import util
-from django.db.backends.postgresql.encodings import ENCODING_MAP
-try:
-    import psycopg as Database
@@ -65 +64 @@
-
-postgres_version = None
-client_encoding = None
-
-class DatabaseWrapper(local):
@@ -95 +93 @@
-        if set_tz:
-            cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
-
-
-
-
-
-
-
-
-
+
+
-        global postgres_version
-        if not postgres_version:
@@ -290 +281 @@
-    if not s:
-        return s
-, client_encoding
+
-
-# Register these custom typecasts, because Django expects dates/times to be
@@ -303 +294 @@
-Database.register_type(Database.new_type((16,), "BOOLEAN", util.typecast_boolean))
-Database.register_type(Database.new_type((1700,), "NUMERIC", util.typecast_decimal))
+Database.register_type(Database.new_type(Database.types[1043].values, 'STRING', typecast_string))
-
-OPERATOR_MAPPING = {