fix some tests

3 files changed, 11 insertions, 10 deletions

diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py
index 82ca1412b..2bb961d4e 100644
--- a/test/sql/test_defaults.py
+++ b/test/sql/test_defaults.py
@@ -68,7 +68,7 @@ class DefaultTest(fixtures.TestBase):
                 def2 = sa.text("getdate()")
             else:
                 def2 = sa.text("current_date")
-            ts = db.func.current_date().scalar()
+            ts = db.scalar(func.current_date())
         else:
             f = len('abcdef')
             f2 = len('abcdefghijk')
diff --git a/test/sql/test_functions.py b/test/sql/test_functions.py
index f08fde1f5..961845bac 100644
--- a/test/sql/test_functions.py
+++ b/test/sql/test_functions.py
@@ -195,6 +195,7 @@ class ExecuteTest(fixtures.TestBase):
     def tearDown(self):
         pass
 
+    @testing.uses_deprecated
     def test_standalone_execute(self):
         x = testing.db.func.current_date().execute().scalar()
         y = testing.db.func.current_date().select().execute().scalar()
@@ -300,13 +301,13 @@ class ExecuteTest(fixtures.TestBase):
     @testing.fails_on_everything_except('postgresql')
     def test_as_from(self):
         # TODO: shouldnt this work on oracle too ?
-        x = testing.db.func.current_date().execute().scalar()
-        y = testing.db.func.current_date().select().execute().scalar()
-        z = testing.db.func.current_date().scalar()
-        w = select(['*'], from_obj=[testing.db.func.current_date()]).scalar()
+        x = func.current_date(bind=testing.db).execute().scalar()
+        y = func.current_date(bind=testing.db).select().execute().scalar()
+        z = func.current_date(bind=testing.db).scalar()
+        w = select(['*'], from_obj=[func.current_date(bind=testing.db)]).scalar()
 
         # construct a column-based FROM object out of a function, like in [ticket:172]
-        s = select([sql.column('date', type_=DateTime)], from_obj=[testing.db.func.current_date()])
+        s = select([sql.column('date', type_=DateTime)], from_obj=[func.current_date(bind=testing.db)])
         q = s.execute().first()[s.c.date]
         r = s.alias('datequery').select().scalar()
 
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 8a8ae9cae..6ccb67f91 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -1263,15 +1263,15 @@ class DateTest(fixtures.TestBase, AssertsExecutionResults):
                      'DateTest mismatch: got:%s expected:%s' % (l, insert_data))
 
     def testtextdate(self):
-        x = testing.db.text(
+        x = testing.db.execute(text(
             "select user_datetime from query_users_with_date",
-            typemap={'user_datetime':DateTime}).execute().fetchall()
+            typemap={'user_datetime':DateTime})).fetchall()
 
         self.assert_(isinstance(x[0][0], datetime.datetime))
 
-        x = testing.db.text(
+        x = testing.db.execute(text(
             "select * from query_users_with_date where user_datetime=:somedate",
-            bindparams=[bindparam('somedate', type_=types.DateTime)]).execute(
+            bindparams=[bindparam('somedate', type_=types.DateTime)]),
             somedate=datetime.datetime(2005, 11, 10, 11, 52, 35)).fetchall()
 
     def testdate2(self):