diff options
Diffstat (limited to 'test/sql/test_unicode.py')
| -rw-r--r-- | test/sql/test_unicode.py | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/test/sql/test_unicode.py b/test/sql/test_unicode.py index 8a8cbd06c..0118b6a2b 100644 --- a/test/sql/test_unicode.py +++ b/test/sql/test_unicode.py @@ -4,8 +4,6 @@ from sqlalchemy import * from sqlalchemy.testing import fixtures, engines, eq_ from sqlalchemy import testing -from sqlalchemy.testing.engines import utf8_engine -from sqlalchemy.sql import column from sqlalchemy.testing.schema import Table, Column from sqlalchemy.util import u, ue @@ -14,11 +12,9 @@ class UnicodeSchemaTest(fixtures.TestBase): @classmethod def setup_class(cls): - global unicode_bind, metadata, t1, t2, t3 + global metadata, t1, t2, t3 - unicode_bind = utf8_engine() - - metadata = MetaData(unicode_bind) + metadata = MetaData(testing.db) t1 = Table(u('unitable1'), metadata, Column(u('méil'), Integer, primary_key=True), Column(ue('\u6e2c\u8a66'), Integer), @@ -68,9 +64,7 @@ class UnicodeSchemaTest(fixtures.TestBase): @classmethod def teardown_class(cls): - global unicode_bind metadata.drop_all() - del unicode_bind def test_insert(self): t1.insert().execute({u('méil'):1, ue('\u6e2c\u8a66'):5}) @@ -85,20 +79,20 @@ class UnicodeSchemaTest(fixtures.TestBase): assert t3.select().execute().fetchall() == [(1, 5, 1, 1)] def test_reflect(self): - t1.insert().execute({u('méil'):2, ue('\u6e2c\u8a66'):7}) - t2.insert().execute({u('a'):2, u('b'):2}) + t1.insert().execute({u('méil'): 2, ue('\u6e2c\u8a66'): 7}) + t2.insert().execute({u('a'): 2, u('b'): 2}) t3.insert().execute({ue('\u6e2c\u8a66_id'): 2, ue('unitable1_\u6e2c\u8a66'): 7, u('Unitéble2_b'): 2, ue('\u6e2c\u8a66_self'): 2}) - meta = MetaData(unicode_bind) + meta = MetaData(testing.db) tt1 = Table(t1.name, meta, autoload=True) tt2 = Table(t2.name, meta, autoload=True) tt3 = Table(t3.name, meta, autoload=True) - tt1.insert().execute({u('méil'):1, ue('\u6e2c\u8a66'):5}) - tt2.insert().execute({u('méil'):1, ue('\u6e2c\u8a66'):1}) + tt1.insert().execute({u('méil'): 1, ue('\u6e2c\u8a66'): 5}) + tt2.insert().execute({u('méil'): 1, ue('\u6e2c\u8a66'): 1}) tt3.insert().execute({ue('\u6e2c\u8a66_id'): 1, ue('unitable1_\u6e2c\u8a66'): 5, u('Unitéble2_b'): 1, @@ -111,8 +105,6 @@ class UnicodeSchemaTest(fixtures.TestBase): self.assert_(tt3.select(order_by=desc(ue('\u6e2c\u8a66_id'))). execute().fetchall() == [(2, 7, 2, 2), (1, 5, 1, 1)]) - meta.drop_all() - metadata.create_all() def test_repr(self): @@ -128,29 +120,3 @@ class UnicodeSchemaTest(fixtures.TestBase): "Column('\\u6e2c\\u8a66_id', Integer(), table=<\u6e2c\u8a66>), " "schema=None)")) -class EscapesDefaultsTest(fixtures.TestBase): - def test_default_exec(self): - metadata = MetaData(testing.db) - t1 = Table('t1', metadata, - Column('special_col', Integer, Sequence('special_col'), primary_key=True), - Column('data', String(50)) # to appease SQLite without DEFAULT VALUES - ) - metadata.create_all() - - try: - engine = metadata.bind - - # reset the identifier preparer, so that we can force it to cache - # a unicode identifier - engine.dialect.identifier_preparer = engine.dialect.preparer(engine.dialect) - select([column('special_col')]).select_from(t1).execute().close() - assert isinstance(engine.dialect.identifier_preparer.format_sequence(Sequence('special_col')), str) - - # now execute, run the sequence. it should run in u"Special_col.nextid" or similar as - # a unicode object; cx_oracle asserts that this is None or a String (postgresql lets it pass thru). - # ensure that executioncontext._exec_default() is encoding. - t1.insert().execute(data='foo') - finally: - metadata.drop_all() - - |