clean up some formatting

This commit is contained in:
Christopher T. Johnson
2023-11-17 10:23:31 -05:00
parent f5e5bde497
commit 0e32a1d3e4

16
main.py
View File

@@ -202,23 +202,29 @@ class MainWindow(QMainWindow, Ui_MainWindow):
SQL_CMDS = [
"PRAGMA foreign_keys=ON",
#
"CREATE TABLE IF NOT EXISTS words "
"(word_id INTEGER PRIMARY KEY AUTOINCREMENT, word TEXT, definition TEXT)",
#
"CREATE TABLE IF NOT EXISTS books "
"(book_id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT, author TEXT, "
"uuid TEXT, level INTEGER)",
#
"CREATE TABLE IF NOT EXISTS sections "
"(section_id INTEGER PRIMARY KEY AUTOINCREMENT, "
"sequence INTEGER, content TEXT, "
"book_id INTEGER REFERENCES books ON DELETE CASCADE)",
#
"CREATE TABLE IF NOT EXISTS people "
"(person_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, "
"organization TEXT, book_id INTEGER REFERENCES books ON DELETE CASCADE)",
#
"CREATE TABLE IF NOT EXISTS person_book "
"(person_id INTEGER REFERENCES people ON DELETE CASCADE, "
"book_id INTEGER REFERENCES books ON DELETE CASCADE, "
"section_id INTEGER REFERENCES sections, "
"block INTEGER)",
#
"CREATE TABLE IF NOT EXISTS word_block "
"(word_id INTEGER REFERENCES words ON DELETE CASCADE, "
"section_id INTEGER REFERENCES sections ON DELETE CASCADE, "
@@ -275,15 +281,9 @@ def schema_update(db: QSqlDatabase) -> None:
# step 5 transfer content
coldefs = re.search(r"\((.+)\)", old).group(1).split(", ") # type: ignore[union-attr]
cols = [x.split(" ")[0] for x in coldefs]
cols_str = ", ".join(cols)
if not query.exec(
"INSERT INTO "
+ new_table_name
+ "("
+ ", ".join(cols)
+ ") SELECT "
+ ", ".join(cols)
+ " FROM "
+ table_name
f"INSERT INTO {new_table_name} ({cols_str}) SELECT {cols_str} FROM {table_name}"
):
query_error(query)