6 files changed, 60 insertions, 48 deletions
diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index 2ab88101a..4695426eb 100644
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -15,9 +15,6 @@ import sqlalchemy.ansisql as ansisql
 import sqlalchemy.types as sqltypes
 import sqlalchemy.exceptions as exceptions
 
-def dbapi():
-    import kinterbasdb
-    return kinterbasdb
 
 _initialized_kb = False
 
@@ -113,6 +110,11 @@ class FBDialect(ansisql.ANSIDialect):
         self.type_conv = type_conv
         self.concurrency_level= concurrency_level
 
+    def dbapi(cls):
+        import kinterbasdb
+        return kinterbasdb
+    dbapi = classmethod(dbapi)
+    
     def create_connect_args(self, url):
         opts = url.translate_connect_args(['host', 'database', 'user', 'password', 'port'])
         if opts.get('port'):
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 41b51d12d..22fafad81 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -52,21 +52,6 @@ import sqlalchemy.ansisql as ansisql
 import sqlalchemy.types as sqltypes
 import sqlalchemy.exceptions as exceptions
 
-def dbapi(module_name=None):
-    if module_name:
-        try:
-            dialect_cls = dialect_mapping[module_name]
-            return dialect_cls.import_dbapi()
-        except KeyError:
-            raise exceptions.InvalidRequestError("Unsupported MSSQL module '%s' requested (must be adodbpi, pymssql or pyodbc)" % module_name)
-    else:
-        for dialect_cls in [MSSQLDialect_adodbapi, MSSQLDialect_pymssql, MSSQLDialect_pyodbc]:
-            try:
-                return dialect_cls.import_dbapi()
-            except ImportError, e:
-                pass
-        else:
-            raise ImportError('No DBAPI module detected for MSSQL - please install adodbapi, pymssql or pyodbc')
     
 class MSNumeric(sqltypes.Numeric):
     def convert_result_value(self, value, dialect):
@@ -331,7 +316,24 @@ class MSSQLDialect(ansisql.ANSIDialect):
         self.auto_identity_insert = auto_identity_insert
         self.text_as_varchar = False
         self.set_default_schema_name("dbo")
-            
+
+    def dbapi(cls, module_name=None):
+        if module_name:
+            try:
+                dialect_cls = dialect_mapping[module_name]
+                return dialect_cls.import_dbapi()
+            except KeyError:
+                raise exceptions.InvalidRequestError("Unsupported MSSQL module '%s' requested (must be adodbpi, pymssql or pyodbc)" % module_name)
+        else:
+            for dialect_cls in [MSSQLDialect_adodbapi, MSSQLDialect_pymssql, MSSQLDialect_pyodbc]:
+                try:
+                    return dialect_cls.import_dbapi()
+                except ImportError, e:
+                    pass
+            else:
+                raise ImportError('No DBAPI module detected for MSSQL - please install adodbapi, pymssql or pyodbc')
+    dbapi = classmethod(dbapi)
+    
     def create_connect_args(self, url):
         opts = url.translate_connect_args(['host', 'database', 'user', 'password', 'port'])
         opts.update(url.query)
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index d3a42ccdc..21f8bb398 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -12,9 +12,6 @@ import sqlalchemy.types as sqltypes
 import sqlalchemy.exceptions as exceptions
 from array import array
 
-def dbapi():
-    import MySQLdb as mysql
-    return mysql
 
 def kw_colspec(self, spec):
     if self.unsigned:
@@ -280,6 +277,11 @@ class MySQLDialect(ansisql.ANSIDialect):
     def __init__(self, **kwargs):
         ansisql.ANSIDialect.__init__(self, default_paramstyle='format', **kwargs)
 
+    def dbapi(cls):
+        import MySQLdb as mysql
+        return mysql
+    dbapi = classmethod(dbapi)
+    
     def create_connect_args(self, url):
         opts = url.translate_connect_args(['host', 'db', 'user', 'passwd', 'port'])
         opts.update(url.query)
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index fce59a072..f49f1d4c0 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -11,9 +11,6 @@ from sqlalchemy import util, sql, engine, schema, ansisql, exceptions, logging
 from sqlalchemy.engine import default, base
 import sqlalchemy.types as sqltypes
 
-def dbapi():
-    import cx_Oracle
-    return cx_Oracle
 
 
 class OracleNumeric(sqltypes.Numeric):
@@ -172,7 +169,12 @@ class OracleDialect(ansisql.ANSIDialect):
             self.ORACLE_BINARY_TYPES = [getattr(self.dbapi, k) for k in ["BFILE", "CLOB", "NCLOB", "BLOB", "LONG_BINARY", "LONG_STRING"] if hasattr(self.dbapi, k)]
         else:
             self.ORACLE_BINARY_TYPES = []
-            
+
+    def dbapi(cls):
+        import cx_Oracle
+        return cx_Oracle
+    dbapi = classmethod(dbapi)
+    
     def create_connect_args(self, url):
         if url.database:
             # if we have a database, then we have a remote host
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index a93ba200c..0eca18be3 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -16,15 +16,6 @@ try:
 except:
     mxDateTime = None
 
-def dbapi():
-    try:
-        import psycopg2 as psycopg
-    except ImportError, e:
-        try:
-            import psycopg
-        except ImportError, e2:
-            raise e
-    return psycopg
     
 class PGInet(sqltypes.TypeEngine):
     def get_col_spec(self):
@@ -258,6 +249,17 @@ class PGDialect(ansisql.ANSIDialect):
         self.use_information_schema = use_information_schema
         self.paramstyle = 'pyformat'
 
+    def dbapi(cls):
+        try:
+            import psycopg2 as psycopg
+        except ImportError, e:
+            try:
+                import psycopg
+            except ImportError, e2:
+                raise e
+        return psycopg
+    dbapi = classmethod(dbapi)
+    
     def create_connect_args(self, url):
         opts = url.translate_connect_args(['host', 'database', 'user', 'password', 'port'])
         if opts.has_key('port'):
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 2b7e28dfb..0222496f8 100644
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -12,18 +12,6 @@ import sqlalchemy.engine.default as default
 import sqlalchemy.types as sqltypes
 import datetime,time
 
-def dbapi():
-    try:
-        from pysqlite2 import dbapi2 as sqlite
-    except ImportError, e:
-        try:
-            from sqlite3 import dbapi2 as sqlite #try the 2.5+ stdlib name.
-        except ImportError:
-            try:
-                sqlite = __import__('sqlite') # skip ourselves
-            except ImportError:
-                raise e
-    return sqlite
     
 class SLNumeric(sqltypes.Numeric):
     def get_col_spec(self):
@@ -160,6 +148,20 @@ class SQLiteDialect(ansisql.ANSIDialect):
             return tuple([int(x) for x in num.split('.')])
         self.supports_cast = (self.dbapi is None or vers(self.dbapi.sqlite_version) >= vers("3.2.3"))
 
+    def dbapi(cls):
+        try:
+            from pysqlite2 import dbapi2 as sqlite
+        except ImportError, e:
+            try:
+                from sqlite3 import dbapi2 as sqlite #try the 2.5+ stdlib name.
+            except ImportError:
+                try:
+                    sqlite = __import__('sqlite') # skip ourselves
+                except ImportError:
+                    raise e
+        return sqlite
+    dbapi = classmethod(dbapi)
+
     def compiler(self, statement, bindparams, **kwargs):
         return SQLiteCompiler(self, statement, bindparams, **kwargs)
 
@@ -347,4 +349,4 @@ class SQLiteIdentifierPreparer(ansisql.ANSIIdentifierPreparer):
         super(SQLiteIdentifierPreparer, self).__init__(dialect, omit_schema=True)
 
 dialect = SQLiteDialect
-poolclass = pool.SingletonThreadPool
+dialect.poolclass = pool.SingletonThreadPool