3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

database: support legacy sqlite_master table 

Sqlite versions older than 3.33.0 store schema information in the
sqlite_master table rather than the sqlite_schema table.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2024-05-21 05:50:13 -04:00
parent 7e16dded0b
commit e41a934f74
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moonraker/components/database.py
View File

@ -52,6 +52,10 @@ DATABASE_VERSION = 2
SQL_DB_FILENAME = "moonraker-sql.db" SQL_DB_FILENAME = "moonraker-sql.db"
NAMESPACE_TABLE = "namespace_store" NAMESPACE_TABLE = "namespace_store"
REGISTRATION_TABLE = "table_registry" REGISTRATION_TABLE = "table_registry"
SCHEMA_TABLE = (
"sqlite_schema" if sqlite3.sqlite_version_info >= (3, 33, 0)
else "sqlite_master"
)
RECORD_ENCODE_FUNCS: Dict[Type, Callable[..., bytes]] = { RECORD_ENCODE_FUNCS: Dict[Type, Callable[..., bytes]] = {
int: lambda x: b"q" + struct.pack("q", x), int: lambda x: b"q" + struct.pack("q", x),
@ -789,7 +793,7 @@ class SqliteProvider(Thread):
f"Sqlite Version: {sqlite3.sqlite_version}" f"Sqlite Version: {sqlite3.sqlite_version}"
) )
cur = self.sync_conn.execute( cur = self.sync_conn.execute(
"SELECT name FROM sqlite_schema WHERE type='table'" f"SELECT name FROM {SCHEMA_TABLE} WHERE type='table'"
) )
cur.arraysize = 100 cur.arraysize = 100
self._tables = set([row[0] for row in cur.fetchall()]) self._tables = set([row[0] for row in cur.fetchall()])
@ -1347,7 +1351,7 @@ class SqliteProvider(Thread):
self, restore_conn: sqlite3.Connection self, restore_conn: sqlite3.Connection
) -> Dict[str, Any]: ) -> Dict[str, Any]:
cursor = restore_conn.execute( cursor = restore_conn.execute(
"SELECT name FROM sqlite_schema WHERE type = 'table'" f"SELECT name FROM {SCHEMA_TABLE} WHERE type = 'table'"
) )
cursor.arraysize = 100 cursor.arraysize = 100
tables = [row[0] for row in cursor.fetchall()] tables = [row[0] for row in cursor.fetchall()]