merge 0.6 series to trunk.

1 files changed, 21 insertions, 17 deletions

diff --git a/test/sql/test_functions.py b/test/sql/test_functions.py
index e9bf49ce3..7a0f12cac 100644
--- a/test/sql/test_functions.py
+++ b/test/sql/test_functions.py
@@ -24,7 +24,7 @@ class CompileTest(TestBase, AssertsCompiledSQL):
             bindtemplate = BIND_TEMPLATES[dialect.paramstyle]
             self.assert_compile(func.current_timestamp(), "CURRENT_TIMESTAMP", dialect=dialect)
             self.assert_compile(func.localtime(), "LOCALTIME", dialect=dialect)
-            if isinstance(dialect, firebird.dialect):
+            if isinstance(dialect, (firebird.dialect, maxdb.dialect, oracle.dialect)):
                 self.assert_compile(func.nosuchfunction(), "nosuchfunction", dialect=dialect)
             else:
                 self.assert_compile(func.nosuchfunction(), "nosuchfunction()", dialect=dialect)
@@ -50,7 +50,7 @@ class CompileTest(TestBase, AssertsCompiledSQL):
 
         for ret, dialect in [
             ('CURRENT_TIMESTAMP', sqlite.dialect()),
-            ('now()', postgres.dialect()),
+            ('now()', postgresql.dialect()),
             ('now()', mysql.dialect()),
             ('CURRENT_TIMESTAMP', oracle.dialect())
         ]:
@@ -62,9 +62,9 @@ class CompileTest(TestBase, AssertsCompiledSQL):
 
         for ret, dialect in [
             ('random()', sqlite.dialect()),
-            ('random()', postgres.dialect()),
+            ('random()', postgresql.dialect()),
             ('rand()', mysql.dialect()),
-            ('random()', oracle.dialect())
+            ('random', oracle.dialect())
         ]:
             self.assert_compile(func.random(), ret, dialect=dialect)
 
@@ -180,7 +180,10 @@ class CompileTest(TestBase, AssertsCompiledSQL):
 
 
 class ExecuteTest(TestBase):
-
+    @engines.close_first
+    def tearDown(self):
+        pass
+        
     def test_standalone_execute(self):
         x = testing.db.func.current_date().execute().scalar()
         y = testing.db.func.current_date().select().execute().scalar()
@@ -202,6 +205,7 @@ class ExecuteTest(TestBase):
             conn.close()
         assert (x == y == z) is True
 
+    @engines.close_first
     def test_update(self):
         """
         Tests sending functions and SQL expressions to the VALUES and SET
@@ -222,15 +226,15 @@ class ExecuteTest(TestBase):
         meta.create_all()
         try:
             t.insert(values=dict(value=func.length("one"))).execute()
-            assert t.select().execute().fetchone()['value'] == 3
+            assert t.select().execute().first()['value'] == 3
             t.update(values=dict(value=func.length("asfda"))).execute()
-            assert t.select().execute().fetchone()['value'] == 5
+            assert t.select().execute().first()['value'] == 5
 
             r = t.insert(values=dict(value=func.length("sfsaafsda"))).execute()
-            id = r.last_inserted_ids()[0]
-            assert t.select(t.c.id==id).execute().fetchone()['value'] == 9
+            id = r.inserted_primary_key[0]
+            assert t.select(t.c.id==id).execute().first()['value'] == 9
             t.update(values={t.c.value:func.length("asdf")}).execute()
-            assert t.select().execute().fetchone()['value'] == 4
+            assert t.select().execute().first()['value'] == 4
             print "--------------------------"
             t2.insert().execute()
             t2.insert(values=dict(value=func.length("one"))).execute()
@@ -245,18 +249,18 @@ class ExecuteTest(TestBase):
             t2.delete().execute()
 
             t2.insert(values=dict(value=func.length("one") + 8)).execute()
-            assert t2.select().execute().fetchone()['value'] == 11
+            assert t2.select().execute().first()['value'] == 11
 
             t2.update(values=dict(value=func.length("asfda"))).execute()
-            assert select([t2.c.value, t2.c.stuff]).execute().fetchone() == (5, "thisisstuff")
+            assert select([t2.c.value, t2.c.stuff]).execute().first() == (5, "thisisstuff")
 
             t2.update(values={t2.c.value:func.length("asfdaasdf"), t2.c.stuff:"foo"}).execute()
-            print "HI", select([t2.c.value, t2.c.stuff]).execute().fetchone()
-            assert select([t2.c.value, t2.c.stuff]).execute().fetchone() == (9, "foo")
+            print "HI", select([t2.c.value, t2.c.stuff]).execute().first()
+            assert select([t2.c.value, t2.c.stuff]).execute().first() == (9, "foo")
         finally:
             meta.drop_all()
 
-    @testing.fails_on_everything_except('postgres')
+    @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()
@@ -266,7 +270,7 @@ class ExecuteTest(TestBase):
 
         # 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()])
-        q = s.execute().fetchone()[s.c.date]
+        q = s.execute().first()[s.c.date]
         r = s.alias('datequery').select().scalar()
 
         assert x == y == z == w == q == r
@@ -301,7 +305,7 @@ class ExecuteTest(TestBase):
                  'd': datetime.date(2010, 5, 1) })
             rs = select([extract('year', table.c.dt),
                          extract('month', table.c.d)]).execute()
-            row = rs.fetchone()
+            row = rs.first()
             assert row[0] == 2010
             assert row[1] == 5
             rs.close()