summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/reflection.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-04-23 10:45:11 -0700
committerMike Bayer <mike_mp@zzzcomputing.com>2011-04-23 10:45:11 -0700
commitd216298073ac6657728bdeb56598f3e5124e2d67 (patch)
treea7b735d0187fcbb6691c69480b84122f2f9da57c /lib/sqlalchemy/engine/reflection.py
parent3452a2ba03bcf75eeec60141f040d661e15eaa2f (diff)
downloadsqlalchemy-d216298073ac6657728bdeb56598f3e5124e2d67.tar.gz
- metadata.reflect() and reflection.Inspector()
had some reliance on GC to close connections which were internally procured, fixed this. - added --zero-timeout option to nose fixture, sets pool_timeout to zero
Diffstat (limited to 'lib/sqlalchemy/engine/reflection.py')
-rw-r--r--lib/sqlalchemy/engine/reflection.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index 72eb27c4e..ca4360325 100644
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -80,10 +80,6 @@ class Inspector(object):
:meth:`Inspector.from_engine`
"""
-
- # ensure initialized
- bind.connect()
-
# this might not be a connection, it could be an engine.
self.bind = bind
@@ -92,6 +88,11 @@ class Inspector(object):
self.engine = bind.engine
else:
self.engine = bind
+
+ if self.engine is bind:
+ # if engine, ensure initialized
+ bind.connect().close()
+
self.dialect = self.engine.dialect
self.info_cache = {}