diff options
Diffstat (limited to 'test/sql')
| -rw-r--r-- | test/sql/defaults.py | 8 | ||||
| -rw-r--r-- | test/sql/quote.py | 4 | ||||
| -rw-r--r-- | test/sql/rowcount.py | 2 | ||||
| -rw-r--r-- | test/sql/unicode.py | 6 |
4 files changed, 14 insertions, 6 deletions
diff --git a/test/sql/defaults.py b/test/sql/defaults.py index a3fe8c07a..0df49ea39 100644 --- a/test/sql/defaults.py +++ b/test/sql/defaults.py @@ -208,7 +208,7 @@ class AutoIncrementTest(PersistTest): def testwithautoincrement(self): meta = MetaData(testbase.db) table = Table("aitest", meta, - Column('id', Integer, primary_key=True), + Column('id', Integer, Sequence('ai_id_seq', optional=True), primary_key=True), Column('data', String(20))) table.create(checkfirst=True) try: @@ -223,7 +223,7 @@ class AutoIncrementTest(PersistTest): meta = MetaData(testbase.db) table = Table("aitest", meta, - Column('id', Integer, primary_key=True), + Column('id', Integer, Sequence('ai_id_seq', optional=True), primary_key=True), Column('data', String(20))) table.create(checkfirst=True) @@ -231,7 +231,7 @@ class AutoIncrementTest(PersistTest): # simulate working on a table that doesn't already exist meta2 = MetaData(testbase.db) table2 = Table("aitest", meta2, - Column('id', Integer, primary_key=True), + Column('id', Integer, Sequence('ai_id_seq', optional=True), primary_key=True), Column('data', String(20))) class AiTest(object): pass @@ -260,7 +260,7 @@ class SequenceTest(PersistTest): sometable = Table( 'Manager', metadata, Column( 'obj_id', Integer, Sequence('obj_id_seq'), ), Column( 'name', String, ), - Column( 'id', Integer, primary_key= True, ), + Column( 'id', Integer, Sequence('Manager_id_seq', optional=True), primary_key=True), ) metadata.create_all() diff --git a/test/sql/quote.py b/test/sql/quote.py index eb0239124..9791bf946 100644 --- a/test/sql/quote.py +++ b/test/sql/quote.py @@ -107,7 +107,9 @@ class QuoteTest(PersistTest): x = select([sql.literal_column("'FooCol'").label("SomeLabel")], from_obj=[table]) x = x.select() assert str(x) == '''SELECT "SomeLabel" \nFROM (SELECT 'FooCol' AS "SomeLabel" \nFROM "ImATable")''' - + + # oracle doesn't support non-case-sensitive until ticket #726 is fixed + @testing.unsupported('oracle') def testlabelsnocase(self): metadata = MetaData() table1 = Table('SomeCase1', metadata, diff --git a/test/sql/rowcount.py b/test/sql/rowcount.py index e0da96a81..cf9ba30d9 100644 --- a/test/sql/rowcount.py +++ b/test/sql/rowcount.py @@ -11,7 +11,7 @@ class FoundRowsTest(AssertMixin): global employees_table employees_table = Table('employees', metadata, - Column('employee_id', Integer, primary_key=True), + Column('employee_id', Integer, Sequence('employee_id_seq', optional=True), primary_key=True), Column('name', String(50)), Column('department', String(1)), ) diff --git a/test/sql/unicode.py b/test/sql/unicode.py index cb96121b0..abeac370e 100644 --- a/test/sql/unicode.py +++ b/test/sql/unicode.py @@ -9,6 +9,7 @@ from testlib.engines import utf8_engine class UnicodeSchemaTest(PersistTest): + @testing.unsupported('oracle') def setUpAll(self): global unicode_bind, metadata, t1, t2 @@ -25,16 +26,19 @@ class UnicodeSchemaTest(PersistTest): ) metadata.create_all() + @testing.unsupported('oracle') def tearDown(self): if metadata.tables: t2.delete().execute() t1.delete().execute() + @testing.unsupported('oracle') def tearDownAll(self): global unicode_bind metadata.drop_all() del unicode_bind + @testing.unsupported('oracle') def test_insert(self): t1.insert().execute({u'méil':1, u'\u6e2c\u8a66':5}) t2.insert().execute({'a':1, 'b':1}) @@ -42,6 +46,7 @@ class UnicodeSchemaTest(PersistTest): assert t1.select().execute().fetchall() == [(1, 5)] assert t2.select().execute().fetchall() == [(1, 1)] + @testing.unsupported('oracle') def test_reflect(self): t1.insert().execute({u'méil':2, u'\u6e2c\u8a66':7}) t2.insert().execute({'a':2, 'b':2}) @@ -60,6 +65,7 @@ class UnicodeSchemaTest(PersistTest): meta.drop_all() metadata.create_all() + @testing.unsupported('oracle') def test_mapping(self): # TODO: this test should be moved to the ORM tests, tests should be # added to this module testing SQL syntax and joins, etc. |