Merge pull request #388 from kapily/rename_to_on_connec

Browse Source 
Rename to on connect statements
This commit is contained in:
Friedrich Lindenberg 2021-11-17 18:10:09 +01:00 committed by GitHub
commit 6cdafa59b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dataset/__init__.py
View File

@ -57,5 +57,5 @@ def connect(
ensure_schema=ensure_schema, ensure_schema=ensure_schema,
row_type=row_type, row_type=row_type,
sqlite_wal_mode=sqlite_wal_mode, sqlite_wal_mode=sqlite_wal_mode,
sqlite_pragmas=sqlite_pragmas, on_connect_statements=sqlite_pragmas,
) )

18
dataset/database.py
View File

@ -30,7 +30,7 @@ class Database(object):
ensure_schema=True, ensure_schema=True,
row_type=row_type, row_type=row_type,
sqlite_wal_mode=True, sqlite_wal_mode=True,
sqlite_pragmas=None, on_connect_statements=None,
): ):
"""Configure and connect to the database.""" """Configure and connect to the database."""
if engine_kwargs is None: if engine_kwargs is None:
@ -57,21 +57,21 @@ class Database(object):
self.engine = create_engine(url, **engine_kwargs) self.engine = create_engine(url, **engine_kwargs)
self.is_postgres = self.engine.dialect.name == "postgresql" self.is_postgres = self.engine.dialect.name == "postgresql"
self.is_sqlite = self.engine.dialect.name == "sqlite" self.is_sqlite = self.engine.dialect.name == "sqlite"
if sqlite_pragmas is None: if on_connect_statements is None:
sqlite_pragmas = [] on_connect_statements = []
def _run_sqlite_pragmas(dbapi_con, con_record): def _run_on_connect_statements(dbapi_con, con_record):
# reference: # reference:
# https://stackoverflow.com/questions/9671490/how-to-set-sqlite-pragma-statements-with-sqlalchemy # https://stackoverflow.com/questions/9671490/how-to-set-sqlite-pragma-statements-with-sqlalchemy
# https://stackoverflow.com/a/7831210/1890086 # https://stackoverflow.com/a/7831210/1890086
for pragma in sqlite_pragmas: for statement in on_connect_statements:
dbapi_con.execute(pragma) dbapi_con.execute(statement)
if self.is_sqlite and parsed_url.path != "" and sqlite_wal_mode: if self.is_sqlite and parsed_url.path != "" and sqlite_wal_mode:
# we only enable WAL mode for sqlite databases that are not in-memory # we only enable WAL mode for sqlite databases that are not in-memory
sqlite_pragmas.append("PRAGMA journal_mode=WAL") on_connect_statements.append("PRAGMA journal_mode=WAL")
if sqlite_pragmas: if on_connect_statements:
event.listen(self.engine, "connect", _run_sqlite_pragmas) event.listen(self.engine, "connect", _run_on_connect_statements)
self.types = Types(is_postgres=self.is_postgres) self.types = Types(is_postgres=self.is_postgres)
self.url = url self.url = url