psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-06-28 16:53:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

hstore test passes against non-utf8 databases.

Browse Source
This commit is contained in:
Daniele Varrazzo 2010-11-19 10:29:07 +00:00
parent 19ead4a5cb
commit a55e50b991
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/types_extras.py
View File

@ -145,7 +145,10 @@ class HstoreTestCase(unittest.TestCase):
from psycopg2.extras import HstoreAdapter from psycopg2.extras import HstoreAdapter
o = {'a': '1', 'b': "'", 'c': None, 'd': u'\xe0'} o = {'a': '1', 'b': "'", 'c': None}
if self.conn.encoding == 'UTF8':
o['d'] = u'\xe0'
a = HstoreAdapter(o) a = HstoreAdapter(o)
a.prepare(self.conn) a.prepare(self.conn)
q = a.getquoted() q = a.getquoted()
@ -155,11 +158,13 @@ class HstoreTestCase(unittest.TestCase):
ii = q[1:-1].split("||") ii = q[1:-1].split("||")
ii.sort() ii.sort()
self.assertEqual(len(ii), len(o))
self.assertEqual(ii[0], filter_scs(self.conn, "(E'a' => E'1')")) self.assertEqual(ii[0], filter_scs(self.conn, "(E'a' => E'1')"))
self.assertEqual(ii[1], filter_scs(self.conn, "(E'b' => E'''')")) self.assertEqual(ii[1], filter_scs(self.conn, "(E'b' => E'''')"))
self.assertEqual(ii[2], filter_scs(self.conn, "(E'c' => NULL)")) self.assertEqual(ii[2], filter_scs(self.conn, "(E'c' => NULL)"))
encc = u'\xe0'.encode(psycopg2.extensions.encodings[self.conn.encoding]) if 'd' in o:
self.assertEqual(ii[3], filter_scs(self.conn, "(E'd' => E'%s')" % encc)) encc = u'\xe0'.encode(psycopg2.extensions.encodings[self.conn.encoding])
self.assertEqual(ii[3], filter_scs(self.conn, "(E'd' => E'%s')" % encc))
def test_adapt_9(self): def test_adapt_9(self):
if self.conn.server_version < 90000: if self.conn.server_version < 90000:
@ -167,7 +172,10 @@ class HstoreTestCase(unittest.TestCase):
from psycopg2.extras import HstoreAdapter from psycopg2.extras import HstoreAdapter
o = {'a': '1', 'b': "'", 'c': None, 'd': u'\xe0'} o = {'a': '1', 'b': "'", 'c': None}
if self.conn.encoding == 'UTF8':
o['d'] = u'\xe0'
a = HstoreAdapter(o) a = HstoreAdapter(o)
a.prepare(self.conn) a.prepare(self.conn)
q = a.getquoted() q = a.getquoted()
@ -180,11 +188,13 @@ class HstoreTestCase(unittest.TestCase):
ii = zip(kk, vv) ii = zip(kk, vv)
ii.sort() ii.sort()
self.assertEqual(len(ii), len(o))
self.assertEqual(ii[0], ("E'a'", "E'1'")) self.assertEqual(ii[0], ("E'a'", "E'1'"))
self.assertEqual(ii[1], ("E'b'", "E''''")) self.assertEqual(ii[1], ("E'b'", "E''''"))
self.assertEqual(ii[2], ("E'c'", "NULL")) self.assertEqual(ii[2], ("E'c'", "NULL"))
encc = u'\xe0'.encode(psycopg2.extensions.encodings[self.conn.encoding]) if 'd' in o:
self.assertEqual(ii[3], ("E'd'", "E'%s'" % encc)) encc = u'\xe0'.encode(psycopg2.extensions.encodings[self.conn.encoding])
self.assertEqual(ii[3], ("E'd'", "E'%s'" % encc))
def test_parse(self): def test_parse(self):
from psycopg2.extras import HstoreAdapter from psycopg2.extras import HstoreAdapter