diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-08-06 21:11:27 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-08-06 21:11:27 +0000 |
| commit | 8fc5005dfe3eb66a46470ad8a8c7b95fc4d6bdca (patch) | |
| tree | ae9e27d12c9fbf8297bb90469509e1cb6a206242 /lib/sqlalchemy/engine/__init__.py | |
| parent | 7638aa7f242c6ea3d743aa9100e32be2052546a6 (diff) | |
| download | sqlalchemy-8fc5005dfe3eb66a46470ad8a8c7b95fc4d6bdca.tar.gz | |
merge 0.6 series to trunk.
Diffstat (limited to 'lib/sqlalchemy/engine/__init__.py')
| -rw-r--r-- | lib/sqlalchemy/engine/__init__.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py index bb2b1b5be..694a2f71f 100644 --- a/lib/sqlalchemy/engine/__init__.py +++ b/lib/sqlalchemy/engine/__init__.py @@ -50,7 +50,9 @@ url.py within a URL. """ -import sqlalchemy.databases +# not sure what this was used for +#import sqlalchemy.databases + from sqlalchemy.engine.base import ( BufferedColumnResultProxy, BufferedColumnRow, @@ -66,9 +68,9 @@ from sqlalchemy.engine.base import ( ResultProxy, RootTransaction, RowProxy, - SchemaIterator, Transaction, - TwoPhaseTransaction + TwoPhaseTransaction, + TypeCompiler ) from sqlalchemy.engine import strategies from sqlalchemy import util @@ -89,9 +91,9 @@ __all__ = ( 'ResultProxy', 'RootTransaction', 'RowProxy', - 'SchemaIterator', 'Transaction', 'TwoPhaseTransaction', + 'TypeCompiler', 'create_engine', 'engine_from_config', ) @@ -108,7 +110,7 @@ def create_engine(*args, **kwargs): The URL is a string in the form ``dialect://user:password@host/dbname[?key=value..]``, where - ``dialect`` is a name such as ``mysql``, ``oracle``, ``postgres``, + ``dialect`` is a name such as ``mysql``, ``oracle``, ``postgresql``, etc. Alternatively, the URL can be an instance of :class:`~sqlalchemy.engine.url.URL`. |