From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 29 May 2013 22:08:28 +0000 (-0400)
Subject:   hstores are text, and in py3k they seem to be implcitly unicode.  so
X-Git-Tag: rel_0_8_2~67^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f87c9d8167606da7f0bcd5d8e3f2f96be38c7100;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

  hstores are text, and in py3k they seem to be implcitly unicode.  so
    add unicode encoding for py2k for the non-native hstore, pullreq for
    native psycopg2 support coming....
---

diff --git a/lib/sqlalchemy/dialects/postgresql/hstore.py b/lib/sqlalchemy/dialects/postgresql/hstore.py
index e555a1afd9..b2150bc449 100644
--- a/lib/sqlalchemy/dialects/postgresql/hstore.py
+++ b/lib/sqlalchemy/dialects/postgresql/hstore.py
@@ -260,19 +260,35 @@ class HSTORE(sqltypes.Concatenable, sqltypes.TypeEngine):
                 _adapt_expression(self, op, other_comparator)
 
     def bind_processor(self, dialect):
-        def process(value):
-            if isinstance(value, dict):
-                return _serialize_hstore(value)
-            else:
-                return value
+        if util.py2k:
+            encoding = dialect.encoding
+            def process(value):
+                if isinstance(value, dict):
+                    return _serialize_hstore(value).encode(encoding)
+                else:
+                    return value
+        else:
+            def process(value):
+                if isinstance(value, dict):
+                    return _serialize_hstore(value)
+                else:
+                    return value
         return process
 
     def result_processor(self, dialect, coltype):
-        def process(value):
-            if value is not None:
-                return _parse_hstore(value)
-            else:
-                return value
+        if util.py2k:
+            encoding = dialect.encoding
+            def process(value):
+                if value is not None:
+                    return _parse_hstore(value.decode(encoding))
+                else:
+                    return value
+        else:
+            def process(value):
+                if value is not None:
+                    return _parse_hstore(value)
+                else:
+                    return value
         return process
 
 
diff --git a/test/dialect/test_postgresql.py b/test/dialect/test_postgresql.py
index 4fd5bc9c12..86e10c06ed 100644
--- a/test/dialect/test_postgresql.py
+++ b/test/dialect/test_postgresql.py
@@ -3206,3 +3206,28 @@ class HStoreRoundTripTest(fixtures.TablesTest):
     def test_fixed_round_trip_native(self):
         engine = testing.db
         self._test_fixed_round_trip(engine)
+
+    def _test_unicode_round_trip(self, engine):
+        s = select([
+                hstore(
+                    array([u'réveillé', u'drôle', u'S’il']),
+                    array([u'réveillé', u'drôle', u'S’il'])
+                )
+            ])
+        eq_(
+            engine.scalar(s),
+            {
+                u'réveillé': u'réveillé',
+                u'drôle': u'drôle',
+                u'S’il': u'S’il'
+            }
+        )
+
+    def test_unicode_round_trip_python(self):
+        engine = self._non_native_engine()
+        self._test_unicode_round_trip(engine)
+
+    @testing.only_on("postgresql+psycopg2")
+    def test_unicode_round_trip_native(self):
+        engine = testing.db
+        self._test_unicode_round_trip(engine)