From 1aa741a25bc2b62e6066276d3e3ceaf886dc0c43 Mon Sep 17 00:00:00 2001 From: shortcutme <tamas@zeronet.io> Date: Mon, 15 Oct 2018 13:01:04 +0200 Subject: [PATCH] Always change db cursor settings --- src/Db/Db.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Db/Db.py b/src/Db/Db.py index b30a46bf..94f2aafa 100644 --- a/src/Db/Db.py +++ b/src/Db/Db.py @@ -61,14 +61,6 @@ class Db(object): self.conn.row_factory = sqlite3.Row self.conn.isolation_level = None self.cur = self.getCursor() - if config.db_mode == "security": - self.cur.execute("PRAGMA journal_mode = WAL") - self.cur.execute("PRAGMA synchronous = NORMAL") - else: - self.cur.execute("PRAGMA journal_mode = MEMORY") - self.cur.execute("PRAGMA synchronous = OFF") - if self.foreign_keys: - self.execute("PRAGMA foreign_keys = ON") self.log.debug( "Connected to %s in %.3fs (opened: %s, sqlite version: %s)..." % (self.db_path, time.time() - s, len(opened_dbs), sqlite3.version) @@ -136,7 +128,18 @@ class Db(object): def getCursor(self): if not self.conn: self.connect() - return DbCursor(self.conn, self) + + cur = DbCursor(self.conn, self) + if config.db_mode == "security": + cur.execute("PRAGMA journal_mode = WAL") + cur.execute("PRAGMA synchronous = NORMAL") + else: + cur.execute("PRAGMA journal_mode = MEMORY") + cur.execute("PRAGMA synchronous = OFF") + if self.foreign_keys: + cur.execute("PRAGMA foreign_keys = ON") + + return cur # Get the table version # Return: Table version or None if not exist