summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-03-01 21:20:59 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-03-01 21:20:59 +0000
commitfd8d4a45ea1c2087ed3c4a86bf5f889b194fdb48 (patch)
tree5afc754c8c249c774f773476dd1d9518ad4b41e7 /lib/sqlalchemy/engine.py
parentfd8567037269ac937a6b079c6e00022abfc51149 (diff)
downloadsqlalchemy-fd8d4a45ea1c2087ed3c4a86bf5f889b194fdb48.tar.gz
made SchemaEngine more prominent as the base of Table association
BaseProxyEngine descends from SchemaEngine fixes to sqlite/postgres reflection to use the correct engine for table lookups Table engine can be none which will default to schema.default_engine (although its still positional for now, so still needs to be explicit to make room for Columns) __init__ sets default_engine to be a blank ProxyEngine fixes to test suite to allow --db proxy.<dbname> to really test proxyengine
Diffstat (limited to 'lib/sqlalchemy/engine.py')
-rw-r--r--lib/sqlalchemy/engine.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py
index 612cec751..757d3517e 100644
--- a/lib/sqlalchemy/engine.py
+++ b/lib/sqlalchemy/engine.py
@@ -172,6 +172,7 @@ class SQLEngine(schema.SchemaEngine):
# get a handle on the connection pool via the connect arguments
# this insures the SQLEngine instance integrates with the pool referenced
# by direct usage of pool.manager(<module>).connect(*args, **params)
+ schema.SchemaEngine.__init__(self)
(cargs, cparams) = self.connect_args()
if pool is None:
params['echo'] = echo_pool
@@ -183,7 +184,6 @@ class SQLEngine(schema.SchemaEngine):
self.echo_uow = echo_uow
self.convert_unicode = convert_unicode
self.context = util.ThreadLocal(raiseerror=False)
- self.tables = {}
self._ischema = None
self._figure_paramstyle()
if logger is None:
@@ -204,6 +204,10 @@ class SQLEngine(schema.SchemaEngine):
def hash_key(self):
return "%s(%s)" % (self.__class__.__name__, repr(self.connect_args()))
+
+ def _get_name(self):
+ return sys.modules[self.__module__].descriptor()['name']
+ name = property(_get_name)
def dispose(self):
"""disposes of the underlying pool manager for this SQLEngine."""