add "dialect" to the __all__ of each root dialect package

diff --git a/lib/sqlalchemy/dialects/firebird/__init__.py b/lib/sqlalchemy/dialects/firebird/__init__.py
index c108388da48c8aca40112225c05853371cf88745..f39e93c144b73a91fed604a58200e2ecec81b7bc 100644 (file)
--- a/lib/sqlalchemy/dialects/firebird/__init__.py
+++ b/lib/sqlalchemy/dialects/firebird/__init__.py
@@ -4,11 +4,13 @@ base.dialect = kinterbasdb.dialect
 
 from sqlalchemy.dialects.firebird.base import \
     SMALLINT, BIGINT, FLOAT, FLOAT, DATE, TIME, \
-    TEXT, NUMERIC, FLOAT, TIMESTAMP, VARCHAR, CHAR, BLOB
+    TEXT, NUMERIC, FLOAT, TIMESTAMP, VARCHAR, CHAR, BLOB,\
+    dialect
     
 __all__ = (
     'SMALLINT', 'BIGINT', 'FLOAT', 'FLOAT', 'DATE', 'TIME', 
-    'TEXT', 'NUMERIC', 'FLOAT', 'TIMESTAMP', 'VARCHAR', 'CHAR', 'BLOB'
+    'TEXT', 'NUMERIC', 'FLOAT', 'TIMESTAMP', 'VARCHAR', 'CHAR', 'BLOB',
+    'dialect'
 )
     
     

diff --git a/lib/sqlalchemy/dialects/mssql/__init__.py b/lib/sqlalchemy/dialects/mssql/__init__.py
index c723249cb2211ce5f3bd109a430e4f4ae1729b0f..23ce3aec85fcc4a675bb7958fbee2f04c1180686 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/__init__.py
+++ b/lib/sqlalchemy/dialects/mssql/__init__.py
@@ -7,7 +7,7 @@ from sqlalchemy.dialects.mssql.base import \
     NCHAR, TEXT, NTEXT, DECIMAL, NUMERIC, FLOAT, DATETIME,\
     DATETIME2, DATETIMEOFFSET, DATE, TIME, SMALLDATETIME, \
     BINARY, VARBINARY, BIT, REAL, IMAGE, TIMESTAMP,\
-    MONEY, SMALLMONEY, UNIQUEIDENTIFIER, SQL_VARIANT
+    MONEY, SMALLMONEY, UNIQUEIDENTIFIER, SQL_VARIANT, dialect
 
 
 __all__ = (
@@ -15,5 +15,5 @@ __all__ = (
     'NCHAR', 'TEXT', 'NTEXT', 'DECIMAL', 'NUMERIC', 'FLOAT', 'DATETIME',
     'DATETIME2', 'DATETIMEOFFSET', 'DATE', 'TIME', 'SMALLDATETIME', 
     'BINARY', 'VARBINARY', 'BIT', 'REAL', 'IMAGE', 'TIMESTAMP',
-    'MONEY', 'SMALLMONEY', 'UNIQUEIDENTIFIER', 'SQL_VARIANT'
+    'MONEY', 'SMALLMONEY', 'UNIQUEIDENTIFIER', 'SQL_VARIANT', 'dialect'
 )
\ No newline at end of file

diff --git a/lib/sqlalchemy/dialects/mysql/__init__.py b/lib/sqlalchemy/dialects/mysql/__init__.py
index 9ade1a65b05b0e0e70b2984dedc65981ff4135c2..e2a6fdc71dd5ce5913869a74150506f0515952c3 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/__init__.py
+++ b/lib/sqlalchemy/dialects/mysql/__init__.py
@@ -4,14 +4,14 @@ from sqlalchemy.dialects.mysql import base, mysqldb, pyodbc, zxjdbc, myconnpy
 base.dialect = mysqldb.dialect
 
 from sqlalchemy.dialects.mysql.base import \
-    BIGINT, BINARY, BIT, BLOB, BOOLEAN, CHAR, DATE, DATETIME, DECIMAL, DOUBLE, ENUM, \
-    DECIMAL, FLOAT, INTEGER, INTEGER, LONGBLOB, LONGTEXT, MEDIUMBLOB, MEDIUMINT, MEDIUMTEXT, NCHAR, \
-    NVARCHAR, NUMERIC, SET, SMALLINT, TEXT, TIME, TIMESTAMP, TINYBLOB, \
-    TINYINT, TINYTEXT, VARBINARY, VARCHAR, YEAR
+    BIGINT, BINARY, BIT, BLOB, BOOLEAN, CHAR, DATE, DATETIME, DECIMAL, DOUBLE, ENUM, DECIMAL,\
+    FLOAT, INTEGER, INTEGER, LONGBLOB, LONGTEXT, MEDIUMBLOB, MEDIUMINT, MEDIUMTEXT, NCHAR, \
+    NVARCHAR, NUMERIC, SET, SMALLINT, TEXT, TIME, TIMESTAMP, TINYBLOB, TINYINT, TINYTEXT,\
+    VARBINARY, VARCHAR, YEAR, dialect
     
 __all__ = (
-'BIGINT',  'BINARY',  'BIT',  'BLOB',  'BOOLEAN',  'CHAR',  'DATE',  'DATETIME',  'DECIMAL',  'DOUBLE',  'ENUM',  
-'DECIMAL',  'FLOAT',  'INTEGER',  'INTEGER',  'LONGBLOB',  'LONGTEXT',  'MEDIUMBLOB',  'MEDIUMINT',  'MEDIUMTEXT',  'NCHAR',  
-'NVARCHAR',  'NUMERIC',  'SET',  'SMALLINT',  'TEXT',  'TIME',  'TIMESTAMP',  'TINYBLOB',  
-'TINYINT',  'TINYTEXT',  'VARBINARY',  'VARCHAR',  'YEAR'
+'BIGINT', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'DOUBLE',
+'ENUM', 'DECIMAL', 'FLOAT', 'INTEGER', 'INTEGER', 'LONGBLOB', 'LONGTEXT', 'MEDIUMBLOB', 'MEDIUMINT',
+'MEDIUMTEXT', 'NCHAR', 'NVARCHAR', 'NUMERIC', 'SET', 'SMALLINT', 'TEXT', 'TIME', 'TIMESTAMP',
+'TINYBLOB', 'TINYINT', 'TINYTEXT', 'VARBINARY', 'VARCHAR', 'YEAR', 'dialect'
 )

diff --git a/lib/sqlalchemy/dialects/oracle/__init__.py b/lib/sqlalchemy/dialects/oracle/__init__.py
index a3bba145275b72de33b08307aa4367d32f43b43c..7b4d6aeabfbadc4d54efba55771b5841773a7d51 100644 (file)
--- a/lib/sqlalchemy/dialects/oracle/__init__.py
+++ b/lib/sqlalchemy/dialects/oracle/__init__.py
@@ -5,11 +5,11 @@ base.dialect = cx_oracle.dialect
 from sqlalchemy.dialects.oracle.base import \
     VARCHAR, NVARCHAR, CHAR, DATE, DATETIME, NUMBER,\
     BLOB, BFILE, CLOB, NCLOB, TIMESTAMP, RAW,\
-    FLOAT, DOUBLE_PRECISION, LONG
+    FLOAT, DOUBLE_PRECISION, LONG, dialect
 
 
 __all__ = (
 'VARCHAR', 'NVARCHAR', 'CHAR', 'DATE', 'DATETIME', 'NUMBER',
 'BLOB', 'BFILE', 'CLOB', 'NCLOB', 'TIMESTAMP', 'RAW',
-'FLOAT', 'DOUBLE_PRECISION', 'LONG'
+'FLOAT', 'DOUBLE_PRECISION', 'LONG', 'dialect'
 )

diff --git a/lib/sqlalchemy/dialects/postgresql/__init__.py b/lib/sqlalchemy/dialects/postgresql/__init__.py
index 045fba253792020dba44949a9a96c11699f471b7..cf219052f2436dc8746c81e5d7685d860ff8f831 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/__init__.py
+++ b/lib/sqlalchemy/dialects/postgresql/__init__.py
@@ -5,10 +5,10 @@ base.dialect = psycopg2.dialect
 from sqlalchemy.dialects.postgresql.base import \
     INTEGER, BIGINT, SMALLINT, VARCHAR, CHAR, TEXT, NUMERIC, FLOAT, REAL, INET, \
     CIDR, UUID, BIT, MACADDR, DOUBLE_PRECISION, TIMESTAMP, TIME,\
-    DATE, BYTEA, BOOLEAN, INTERVAL
+    DATE, BYTEA, BOOLEAN, INTERVAL, ARRAY, ENUM, dialect
 
 __all__ = (
 'INTEGER', 'BIGINT', 'SMALLINT', 'VARCHAR', 'CHAR', 'TEXT', 'NUMERIC', 'FLOAT', 'REAL', 'INET', 
 'CIDR', 'UUID', 'BIT', 'MACADDR', 'DOUBLE_PRECISION', 'TIMESTAMP', 'TIME',
-'DATE', 'BYTEA', 'BOOLEAN', 'INTERVAL'
+'DATE', 'BYTEA', 'BOOLEAN', 'INTERVAL', 'ARRAY', 'ENUM', 'dialect'
 )
\ No newline at end of file

diff --git a/lib/sqlalchemy/dialects/sqlite/__init__.py b/lib/sqlalchemy/dialects/sqlite/__init__.py
index a3fd74f69965aed7d991573db76e2d51ac587069..fbbde173ed872562f83299929a9acee6103f4640 100644 (file)
--- a/lib/sqlalchemy/dialects/sqlite/__init__.py
+++ b/lib/sqlalchemy/dialects/sqlite/__init__.py
@@ -6,9 +6,9 @@ base.dialect = pysqlite.dialect
 
 from sqlalchemy.dialects.sqlite.base import \
     BLOB, BOOLEAN, CHAR, DATE, DATETIME, DECIMAL, FLOAT, INTEGER,\
-    NUMERIC, SMALLINT, TEXT, TIME, TIMESTAMP, VARCHAR
+    NUMERIC, SMALLINT, TEXT, TIME, TIMESTAMP, VARCHAR, dialect
 
 __all__ = (
     'BLOB', 'BOOLEAN', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'FLOAT', 'INTEGER',
-    'NUMERIC', 'SMALLINT', 'TEXT', 'TIME', 'TIMESTAMP', 'VARCHAR',
+    'NUMERIC', 'SMALLINT', 'TEXT', 'TIME', 'TIMESTAMP', 'VARCHAR', 'dialect'
 )
\ No newline at end of file

diff --git a/test/engine/test_parseconnect.py b/test/engine/test_parseconnect.py
index daa2dd5dc16155068a08286de89e16fea439dd9e..62e5d58d6d2c5f17b0e16438077b9e02b78f7440 100644 (file)
--- a/test/engine/test_parseconnect.py
+++ b/test/engine/test_parseconnect.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from sqlalchemy.test.testing import assert_raises, assert_raises_message, eq_
 import ConfigParser
 import StringIO
 import sqlalchemy.engine.url as url
@@ -36,6 +36,14 @@ class ParseConnectTest(TestBase):
             assert u.host == 'hostspec' or u.host == '127.0.0.1' or (not u.host)
             assert str(u) == text
 
+class DialectImportTest(TestBase):
+    def test_import_base_dialects(self):
+        for name in ('mysql', 'firebird', 'postgresql', 'sqlite', 'oracle', 'mssql'):
+            exec("from sqlalchemy.dialects import %s\n"
+                "dialect = %s.dialect()"
+             % (name, name))
+            eq_(dialect.name, name)
+    
 class CreateEngineTest(TestBase):
     """test that create_engine arguments of different types get propagated properly"""
     def test_connect_query(self):