removed some remaining "connectable"/"bind_to" keywords

diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index ab6b8584992ad77cd872f381efb78a3ae7257e29..fc6c5bf366cf41e8045425c823b17f7766302120 100644 (file)
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -366,7 +366,7 @@ class FBSchemaDropper(ansisql.ANSISchemaDropper):
 
 class FBDefaultRunner(ansisql.ANSIDefaultRunner):
     def exec_default_sql(self, default):
-        c = sql.select([default.arg], from_obj=["rdb$database"]).compile(engine=self.connection)
+        c = sql.select([default.arg], from_obj=["rdb$database"]).compile(bind=self.connection)
         return self.connection.execute_compiled(c).scalar()
 
     def visit_sequence(self, seq):

diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index e276ad31a7db008f15fe5354d4e0046fd35332e5..8fd00e504c2fa49599a5ed9c5aeb24c92c36f917 100644 (file)
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -603,7 +603,7 @@ class OracleSchemaDropper(ansisql.ANSISchemaDropper):
 
 class OracleDefaultRunner(ansisql.ANSIDefaultRunner):
     def exec_default_sql(self, default):
-        c = sql.select([default.arg], from_obj=["DUAL"]).compile(engine=self.connection)
+        c = sql.select([default.arg], from_obj=["DUAL"]).compile(bind=self.connection)
         return self.connection.execute_compiled(c).scalar()
 
     def visit_sequence(self, seq):

diff --git a/lib/sqlalchemy/ext/sessioncontext.py b/lib/sqlalchemy/ext/sessioncontext.py
index 28215d289d4a5722c55df69bd839c9c55ec603a8..fcbf29c3ff68d91fe34dd2034e2a8ec25cc28d40 100644 (file)
--- a/lib/sqlalchemy/ext/sessioncontext.py
+++ b/lib/sqlalchemy/ext/sessioncontext.py
@@ -15,11 +15,11 @@ class SessionContext(object):
 
       engine = create_engine(...)
       def session_factory():
-          return Session(bind_to=engine)
+          return Session(bind=engine)
       context = SessionContext(session_factory)
 
       s = context.current # get thread-local session
-      context.current = Session(bind_to=other_engine) # set current session
+      context.current = Session(bind=other_engine) # set current session
       del context.current # discard the thread-local session (a new one will
                           # be created on the next call to context.current)
     """