Fixes pudo/dataset#363 by tracking checked-out sqlalchemy database connections, on a per-thread basis, and closing all connections when Database.close() is called.

Browse Source
This commit is contained in:
Joshua Branch 2021-03-10 00:35:04 -05:00
parent 2791a61939
commit ed3b120f85
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dataset/database.py
View File

@ -44,6 +44,7 @@ class Database(object):
self.lock = threading.RLock() self.lock = threading.RLock()
self.local = threading.local() self.local = threading.local()
self.connections = {}
if len(parsed_url.query): if len(parsed_url.query):
query = parse_qs(parsed_url.query) query = parse_qs(parsed_url.query)
@ -76,9 +77,11 @@ class Database(object):
@property @property
def executable(self): def executable(self):
"""Connection against which statements will be executed.""" """Connection against which statements will be executed."""
if not hasattr(self.local, "conn"): with self.lock:
self.local.conn = self.engine.connect() tid = threading.get_ident()
return self.local.conn if not tid in self.connections:
self.connections[tid] = self.engine.connect()
return self.connections[tid]
@property @property
def op(self): def op(self):
@ -158,6 +161,10 @@ class Database(object):
def close(self): def close(self):
"""Close database connections. Makes this object unusable.""" """Close database connections. Makes this object unusable."""
with self.lock:
for conn in self.connections.values():
conn.close()
self.connections.clear()
self.engine.dispose() self.engine.dispose()
self._tables = {} self._tables = {}
self.engine = None self.engine = None