some cleanup submitted by Lele Galifax

diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index 6165192cde8a2a2017da9637a175a8ec750112c8..2b0d7d17e5e3be4d438ad0134ff736b72cb6950a 100644 (file)
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -37,7 +37,7 @@ class ANSIDialect(default.DefaultDialect):
         self.identifier_preparer = self.preparer()
         self.cache_identifiers = cache_identifiers
         
-    def connect_args(self):
+    def create_connect_args(self):
         return ([],{})
 
     def dbapi(self):

diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index a3344418da1217f2bc0f0f91645211668af49019..cdeede8fa1bac0b5b6815966436cdcd4ab937e33 100644 (file)
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -69,9 +69,6 @@ colspecs = {
     sqltypes.CHAR: FBChar,
 }
 
-def engine(*args, **params):
-    return FBSQLEngine(*args, **params)
-
 def descriptor():
     return {'name':'firebird',
     'description':'Firebird',
@@ -135,9 +132,6 @@ class FireBirdDialect(ansisql.ANSIDialect):
         
         return ([], self.opts)
 
-    def connect_args(self):
-        return make_connect_string(self.opts)
-
     def create_execution_context(self):
         return FireBirdExecutionContext(self)
 

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index c67b54817db1df80b3223683c46aa2d1b025c517..b348771f2455b9bc10d2e724f50b0bbce160da43 100644 (file)
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -213,9 +213,6 @@ ischema_names = {
     'image' : MSBinary
 }
 
-def engine(opts, **params):
-    return MSSQLEngine(opts, **params)
-
 def descriptor():
     return {'name':'mssql',
     'description':'MSSQL',

diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 88efcb755042a1b4d72690a83266d3c5fdb8fdfe..4443814c56e0f980c7310bfbb0fcda8fbe639ae9 100644 (file)
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -228,9 +228,6 @@ ischema_names = {
     'enum': MSEnum,
 }
 
-def engine(opts, **params):
-    return MySQLEngine(opts, **params)
-
 def descriptor():
     return {'name':'mysql',
     'description':'MySQL',

diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 914df50f785b84455221ea6d9cea4b7a3c75b521..a28a22cd62da88f53e4c16753f3f5e366fd0f425 100644 (file)
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -174,10 +174,6 @@ pg1_ischema_names.update({
     'time' : PG1Time
     })
 
-
-def engine(opts, **params):
-    return PGSQLEngine(opts, **params)
-
 def descriptor():
     return {'name':'postgres',
     'description':'PostGres',

diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 3868f255f31b8058dc09c60fefd1b578136ba232..80d5a7d2af5fb699ad402e1984336e67005ae674 100644 (file)
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -162,9 +162,6 @@ class SQLiteDialect(ansisql.ANSIDialect):
     def oid_column_name(self):
         return "oid"
 
-    def connect_args(self):
-        return ([self.filename], self.opts)
-
     def dbapi(self):
         return sqlite