From 50ec8f00e67fba68ad3d87e71d993b71312007af Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 13 Oct 2006 02:02:25 +0000 Subject: [PATCH] some cleanup submitted by Lele Galifax --- lib/sqlalchemy/ansisql.py | 2 +- lib/sqlalchemy/databases/firebird.py | 6 ------ lib/sqlalchemy/databases/mssql.py | 3 --- lib/sqlalchemy/databases/mysql.py | 3 --- lib/sqlalchemy/databases/postgres.py | 4 ---- lib/sqlalchemy/databases/sqlite.py | 3 --- 6 files changed, 1 insertion(+), 20 deletions(-) diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py index 6165192cde..2b0d7d17e5 100644 --- 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 a3344418da..cdeede8fa1 100644 --- 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 c67b54817d..b348771f24 100644 --- 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 88efcb7550..4443814c56 100644 --- 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 914df50f78..a28a22cd62 100644 --- 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 3868f255f3..80d5a7d2af 100644 --- 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 -- 2.47.2