clean up some formatting
This commit is contained in:
16
main.py
16
main.py
@@ -202,23 +202,29 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||||||
|
|
||||||
SQL_CMDS = [
|
SQL_CMDS = [
|
||||||
"PRAGMA foreign_keys=ON",
|
"PRAGMA foreign_keys=ON",
|
||||||
|
#
|
||||||
"CREATE TABLE IF NOT EXISTS words "
|
"CREATE TABLE IF NOT EXISTS words "
|
||||||
"(word_id INTEGER PRIMARY KEY AUTOINCREMENT, word TEXT, definition TEXT)",
|
"(word_id INTEGER PRIMARY KEY AUTOINCREMENT, word TEXT, definition TEXT)",
|
||||||
|
#
|
||||||
"CREATE TABLE IF NOT EXISTS books "
|
"CREATE TABLE IF NOT EXISTS books "
|
||||||
"(book_id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT, author TEXT, "
|
"(book_id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT, author TEXT, "
|
||||||
"uuid TEXT, level INTEGER)",
|
"uuid TEXT, level INTEGER)",
|
||||||
|
#
|
||||||
"CREATE TABLE IF NOT EXISTS sections "
|
"CREATE TABLE IF NOT EXISTS sections "
|
||||||
"(section_id INTEGER PRIMARY KEY AUTOINCREMENT, "
|
"(section_id INTEGER PRIMARY KEY AUTOINCREMENT, "
|
||||||
"sequence INTEGER, content TEXT, "
|
"sequence INTEGER, content TEXT, "
|
||||||
"book_id INTEGER REFERENCES books ON DELETE CASCADE)",
|
"book_id INTEGER REFERENCES books ON DELETE CASCADE)",
|
||||||
|
#
|
||||||
"CREATE TABLE IF NOT EXISTS people "
|
"CREATE TABLE IF NOT EXISTS people "
|
||||||
"(person_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, "
|
"(person_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, "
|
||||||
"organization TEXT, book_id INTEGER REFERENCES books ON DELETE CASCADE)",
|
"organization TEXT, book_id INTEGER REFERENCES books ON DELETE CASCADE)",
|
||||||
|
#
|
||||||
"CREATE TABLE IF NOT EXISTS person_book "
|
"CREATE TABLE IF NOT EXISTS person_book "
|
||||||
"(person_id INTEGER REFERENCES people ON DELETE CASCADE, "
|
"(person_id INTEGER REFERENCES people ON DELETE CASCADE, "
|
||||||
"book_id INTEGER REFERENCES books ON DELETE CASCADE, "
|
"book_id INTEGER REFERENCES books ON DELETE CASCADE, "
|
||||||
"section_id INTEGER REFERENCES sections, "
|
"section_id INTEGER REFERENCES sections, "
|
||||||
"block INTEGER)",
|
"block INTEGER)",
|
||||||
|
#
|
||||||
"CREATE TABLE IF NOT EXISTS word_block "
|
"CREATE TABLE IF NOT EXISTS word_block "
|
||||||
"(word_id INTEGER REFERENCES words ON DELETE CASCADE, "
|
"(word_id INTEGER REFERENCES words ON DELETE CASCADE, "
|
||||||
"section_id INTEGER REFERENCES sections 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
|
# step 5 transfer content
|
||||||
coldefs = re.search(r"\((.+)\)", old).group(1).split(", ") # type: ignore[union-attr]
|
coldefs = re.search(r"\((.+)\)", old).group(1).split(", ") # type: ignore[union-attr]
|
||||||
cols = [x.split(" ")[0] for x in coldefs]
|
cols = [x.split(" ")[0] for x in coldefs]
|
||||||
|
cols_str = ", ".join(cols)
|
||||||
if not query.exec(
|
if not query.exec(
|
||||||
"INSERT INTO "
|
f"INSERT INTO {new_table_name} ({cols_str}) SELECT {cols_str} FROM {table_name}"
|
||||||
+ new_table_name
|
|
||||||
+ "("
|
|
||||||
+ ", ".join(cols)
|
|
||||||
+ ") SELECT "
|
|
||||||
+ ", ".join(cols)
|
|
||||||
+ " FROM "
|
|
||||||
+ table_name
|
|
||||||
):
|
):
|
||||||
query_error(query)
|
query_error(query)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user