diff options
Diffstat (limited to 'test/sql')
| -rw-r--r-- | test/sql/defaults.py | 6 | ||||
| -rw-r--r-- | test/sql/testtypes.py | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/test/sql/defaults.py b/test/sql/defaults.py index f82ca7f5f..0bc1a6b2e 100644 --- a/test/sql/defaults.py +++ b/test/sql/defaults.py @@ -24,13 +24,13 @@ class DefaultTest(PersistTest): # also correct for "current_date" compatible as column default, value differences currenttime = func.current_date(type=Date, engine=db); if is_oracle: - ts = db.func.trunc(func.sysdate(), column("'DAY'")).scalar() + ts = db.func.trunc(func.sysdate(), literal_column("'DAY'")).scalar() f = select([func.count(1) + 5], engine=db).scalar() f2 = select([func.count(1) + 14], engine=db).scalar() # TODO: engine propigation across nested functions not working - currenttime = func.trunc(currenttime, column("'DAY'"), engine=db) + currenttime = func.trunc(currenttime, literal_column("'DAY'"), engine=db) def1 = currenttime - def2 = func.trunc(text("sysdate"), column("'DAY'")) + def2 = func.trunc(text("sysdate"), literal_column("'DAY'")) deftype = Date elif use_function_defaults: f = select([func.count(1) + 5], engine=db).scalar() diff --git a/test/sql/testtypes.py b/test/sql/testtypes.py index 411e39406..97e95d389 100644 --- a/test/sql/testtypes.py +++ b/test/sql/testtypes.py @@ -203,12 +203,8 @@ class BinaryTest(AssertMixin): testobj1 = pickleable.Foo('im foo 1') testobj2 = pickleable.Foo('im foo 2') - if db.name == 'oracle': - stream1 =self.load_stream('binary_data_one.dat', len=2000) - stream2 =self.load_stream('binary_data_two.dat', len=2000) - else: - stream1 =self.load_stream('binary_data_one.dat') - stream2 =self.load_stream('binary_data_two.dat') + stream1 =self.load_stream('binary_data_one.dat') + stream2 =self.load_stream('binary_data_two.dat') binary_table.insert().execute(primary_id=1, misc='binary_data_one.dat', data=stream1, data_slice=stream1[0:100], pickled=testobj1) binary_table.insert().execute(primary_id=2, misc='binary_data_two.dat', data=stream2, data_slice=stream2[0:99], pickled=testobj2) binary_table.insert().execute(primary_id=3, misc='binary_data_two.dat', data=None, data_slice=stream2[0:99], pickled=None) |