fix some tests, a py3k import

diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py
index fc61391e5a6b4b4ccddf1a2e4056c7307280fc9e..11c331915c98ffa89b0fd8f388760647ddb59fec 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/mysqldb.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py
@@ -101,7 +101,7 @@ class MySQL_mysqldb(MySQLDialect):
         client_flag = opts.get('client_flag', 0)
         if self.dbapi is not None:
             try:
-                import MySQLdb.constants.CLIENT as CLIENT_FLAGS
+                from MySQLdb.constants import CLIENT as CLIENT_FLAGS
                 client_flag |= CLIENT_FLAGS.FOUND_ROWS
             except:
                 pass

diff --git a/test/dialect/oracle.py b/test/dialect/oracle.py
index c55e778a2431eb7dbfaa67ac297b3ef297b09708..c7ec8e65d4ca62f66f53c68e45f9f28f6bac1705 100644 (file)
--- a/test/dialect/oracle.py
+++ b/test/dialect/oracle.py
@@ -41,10 +41,10 @@ class CompileTest(TestBase, AssertsCompiledSQL):
         meta  = MetaData()
         parent = Table('parent', meta, Column('id', Integer, primary_key=True), 
            Column('name', String(50)),
-           owner='ed')
+           schema='ed')
         child = Table('child', meta, Column('id', Integer, primary_key=True),
            Column('parent_id', Integer, ForeignKey('ed.parent.id')),
-           owner = 'ed')
+           schema = 'ed')
 
         self.assert_compile(parent.join(child), "ed.parent JOIN ed.child ON ed.parent.id = ed.child.parent_id")
 

diff --git a/test/sql/select.py b/test/sql/select.py
index 3e8733790e0a29bb3f60840d75a773f4583f9d42..4bee94e1426d6f645dc8477408a03c6f3dbf8959 100644 (file)
--- a/test/sql/select.py
+++ b/test/sql/select.py
@@ -1125,10 +1125,10 @@ UNION SELECT mytable.myid FROM mytable"
                 self.assert_compile(stmt, expected_positional_stmt, dialect=sqlite.dialect())
                 nonpositional = stmt.compile()
                 positional = stmt.compile(dialect=sqlite.dialect())
-                pp = positional.get_params()
+                pp = positional.params
                 assert [pp[k] for k in positional.positiontup] == expected_default_params_list
-                assert nonpositional.get_params(**test_param_dict) == expected_test_params_dict, "expected :%s got %s" % (str(expected_test_params_dict), str(nonpositional.get_params(**test_param_dict)))
-                pp = positional.get_params(**test_param_dict)
+                assert nonpositional.construct_params(test_param_dict) == expected_test_params_dict, "expected :%s got %s" % (str(expected_test_params_dict), str(nonpositional.get_params(**test_param_dict)))
+                pp = positional.construct_params(test_param_dict)
                 assert [pp[k] for k in positional.positiontup] == expected_test_params_list
 
         # check that params() doesnt modify original statement
@@ -1147,7 +1147,7 @@ UNION SELECT mytable.myid FROM mytable"
             ":myid_1) AS anon_1 FROM mytable WHERE mytable.myid = (SELECT mytable.myid FROM mytable WHERE mytable.myid = :myid_1)")
         positional = s2.compile(dialect=sqlite.dialect())
 
-        pp = positional.get_params()
+        pp = positional.params
         assert [pp[k] for k in positional.positiontup] == [12, 12]
 
         # check that conflicts with "unique" params are caught

diff --git a/test/sql/testtypes.py b/test/sql/testtypes.py
index cb733172ddadee3774ab0e47f7fcafa659d533a5..0e6088c4292dd1a6f69237cbbf9144e2fe596bfb 100644 (file)
--- a/test/sql/testtypes.py
+++ b/test/sql/testtypes.py
@@ -683,10 +683,10 @@ class NumericTest(TestBase, AssertsExecutionResults):
         metadata = MetaData(testing.db)
         numeric_table = Table('numeric_table', metadata,
             Column('id', Integer, Sequence('numeric_id_seq', optional=True), primary_key=True),
-            Column('numericcol', Numeric(asdecimal=False)),
-            Column('floatcol', Float),
-            Column('ncasdec', Numeric),
-            Column('fcasdec', Float(asdecimal=True))
+            Column('numericcol', Numeric(precision=10, scale=2, asdecimal=False)),
+            Column('floatcol', Float(precision=10, )),
+            Column('ncasdec', Numeric(precision=10, scale=2)),
+            Column('fcasdec', Float(precision=10, asdecimal=True))
         )
         metadata.create_all()