Update tests and reqs for SQLA 1.0

Lift the requirements to support SQLAlchemy 1.0.  Two tests
were calling upon revised APIs and required adjustment.

Change-Id: Ic91a91bb3c915027b522eace302f2ed074233294

2 files changed, 6 insertions, 3 deletions

diff --git a/migrate/tests/changeset/test_constraint.py b/migrate/tests/changeset/test_constraint.py
index 1faf4cc..325b3c0 100644
--- a/migrate/tests/changeset/test_constraint.py
+++ b/migrate/tests/changeset/test_constraint.py
@@ -5,6 +5,7 @@ from sqlalchemy import *
 from sqlalchemy.util import *
 from sqlalchemy.exc import *
 
+from migrate.changeset.util import fk_column_names
 from migrate.exceptions import *
 from migrate.changeset import *
 
@@ -91,7 +92,7 @@ class TestConstraint(CommonTestConstraint):
             self.assertTrue(list(self.table.c.fkey.foreign_keys) is not [])
         else:
             self.assertTrue(self.table.c.fkey.foreign_keys._list is not [])
-        for key in fk.columns:
+        for key in fk_column_names(fk):
             self.assertEqual(key, self.table.c.fkey.name)
         self.assertEqual([e.column for e in fk.elements], [self.table.c.id])
         self.assertEqual(list(fk.referenced), [self.table.c.id])
diff --git a/migrate/tests/versioning/test_database.py b/migrate/tests/versioning/test_database.py
index 525385f..8291c6b 100644
--- a/migrate/tests/versioning/test_database.py
+++ b/migrate/tests/versioning/test_database.py
@@ -1,4 +1,4 @@
-from sqlalchemy import select
+from sqlalchemy import select, text
 from migrate.tests import fixture
 
 class TestConnect(fixture.DB):
@@ -8,4 +8,6 @@ class TestConnect(fixture.DB):
     def test_connect(self):
         """Connect to the database successfully"""
         # Connection is done in fixture.DB setup; make sure we can do stuff
-        select(['42'],bind=self.engine).execute()
+        self.engine.execute(
+            select([text('42')])
+        )