From bc50d9ced42d09a8f27433d98d874401a6c3ff15 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 15 Jan 2021 10:16:06 +0100 Subject: Use sql.user_version_changed() everywhere --- qutebrowser/browser/history.py | 2 +- qutebrowser/misc/sql.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py index eaeb274f3..6fcc140a1 100644 --- a/qutebrowser/browser/history.py +++ b/qutebrowser/browser/history.py @@ -170,7 +170,7 @@ class WebHistory(sql.SqlTable): rebuild_completion = False - if sql.db_user_version != sql.USER_VERSION: + if sql.user_version_changed(): # If the DB user version changed, run a full cleanup and rebuild the # completion history. # diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py index c71ac6eaa..5cd3246cb 100644 --- a/qutebrowser/misc/sql.py +++ b/qutebrowser/misc/sql.py @@ -65,13 +65,13 @@ class UserVersion: return f'{self.major}.{self.minor}' -db_user_version = None # The user version we got from the database -USER_VERSION = UserVersion(0, 3) # The current / newest user version +_db_user_version = None # The user version we got from the database +_USER_VERSION = UserVersion(0, 3) # The current / newest user version def user_version_changed(): """Whether the version stored in the database is different from the current one.""" - return db_user_version != USER_VERSION + return _db_user_version != _USER_VERSION class SqliteErrorCode: @@ -181,17 +181,17 @@ def init(db_path): error.text()) raise_sqlite_error(msg, error) - global db_user_version + global _db_user_version version_int = Query('pragma user_version').run().value() - db_user_version = UserVersion.from_int(version_int) + _db_user_version = UserVersion.from_int(version_int) - if db_user_version.major > USER_VERSION.major: + if _db_user_version.major > _USER_VERSION.major: raise KnownError( "Database is too new for this qutebrowser version (database version " - f"{db_user_version}, but {USER_VERSION.major}.x is supported)") + f"{_db_user_version}, but {_USER_VERSION.major}.x is supported)") if user_version_changed(): - log.sql.debug(f"Migrating from version {db_user_version} to {USER_VERSION}") + log.sql.debug(f"Migrating from version {_db_user_version} to {_USER_VERSION}") # Enable write-ahead-logging and reduce disk write frequency # see https://sqlite.org/pragma.html and issues #2930 and #3507 # @@ -199,7 +199,7 @@ def init(db_path): # as those are idempotent, let's make sure we run them once again. Query("PRAGMA journal_mode=WAL").run() Query("PRAGMA synchronous=NORMAL").run() - Query(f'PRAGMA user_version = {USER_VERSION.to_int()}').run() + Query(f'PRAGMA user_version = {_USER_VERSION.to_int()}').run() def close(): -- cgit v1.2.3-54-g00ecf