From 55d6ff0e61763f6bcd7698f908c029843fa84138 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 25 Aug 2021 13:58:11 +0200 Subject: [PATCH] Clean up formating of the insert queries CURA-6096 --- .../DatabaseHandlers/IntentDatabaseHandler.py | 3 ++- .../QualityDatabaseHandler.py | 3 ++- .../VariantDatabaseHandler.py | 21 ++++++++++--------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/cura/Settings/DatabaseHandlers/IntentDatabaseHandler.py b/cura/Settings/DatabaseHandlers/IntentDatabaseHandler.py index ffe0191088..1a48d652a7 100644 --- a/cura/Settings/DatabaseHandlers/IntentDatabaseHandler.py +++ b/cura/Settings/DatabaseHandlers/IntentDatabaseHandler.py @@ -5,7 +5,8 @@ from UM.Settings.InstanceContainer import InstanceContainer class IntentDatabaseHandler(DatabaseMetadataContainerController): def __init__(self) -> None: super().__init__( - insert_query="INSERT INTO intents (id, name, quality_type, intent_category, variant, definition, material, version, setting_version) VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?)", + insert_query = """ INSERT INTO intents (id, name, quality_type, intent_category, variant, definition, material, version, setting_version) + VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?)""", update_query="""UPDATE intents SET name = ?, quality_type = ?, diff --git a/cura/Settings/DatabaseHandlers/QualityDatabaseHandler.py b/cura/Settings/DatabaseHandlers/QualityDatabaseHandler.py index 258c63709b..d0bb987b95 100644 --- a/cura/Settings/DatabaseHandlers/QualityDatabaseHandler.py +++ b/cura/Settings/DatabaseHandlers/QualityDatabaseHandler.py @@ -5,7 +5,8 @@ from UM.Settings.InstanceContainer import InstanceContainer class QualityDatabaseHandler(DatabaseMetadataContainerController): def __init__(self) -> None: super().__init__( - insert_query = "INSERT INTO qualities (id, name, quality_type, material, variant, global_quality, definition, version, setting_version) VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?)", + insert_query = """ INSERT INTO qualities (id, name, quality_type, material, variant, global_quality, definition, version, setting_version) + VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?)""", update_query = """ UPDATE qualities SET name = ?, quality_type = ?, diff --git a/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py b/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py index 0670f132e9..4673a3d60e 100644 --- a/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py +++ b/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py @@ -5,17 +5,18 @@ from UM.Settings.InstanceContainer import InstanceContainer class VariantDatabaseHandler(DatabaseMetadataContainerController): def __init__(self) -> None: super().__init__( - insert_query= "INSERT INTO variants (id, name, hardware_type, definition, version, setting_version) VALUES (?, ?, ?, ?, ?, ?)", - update_query="""UPDATE variants - SET name = ?, - hardware_type = ?, - definition = ?, - version = ?, - setting_version = ? - WHERE id = ? - """, + insert_query = """INSERT INTO variants (id, name, hardware_type, definition, version, setting_version) + VALUES (?, ?, ?, ?, ?, ?)""", + update_query = """ UPDATE variants + SET name = ?, + hardware_type = ?, + definition = ?, + version = ?, + setting_version = ? + WHERE id = ? + """, select_query= "SELECT * FROM variants where id = ?", - table_query="""CREATE TABLE variants + table_query = """CREATE TABLE variants ( id text, name text,