Browse Source

Revert "Use SQLQueryFactory for container DB"

This reverts commit 571a051041b7c126ca942055961c7714312a967f.
Ghostkeeper 3 years ago
parent
commit
adac0af1ec

+ 3 - 0
cura/Settings/DatabaseHandlers/IntentDatabaseHandler.py

@@ -1,5 +1,6 @@
 from UM.Settings.SQLQueryFactory import SQLQueryFactory
 from UM.Settings.DatabaseContainerMetadataController import DatabaseMetadataContainerController
+from UM.Settings.InstanceContainer import InstanceContainer
 
 
 class IntentDatabaseHandler(DatabaseMetadataContainerController):
@@ -8,6 +9,7 @@ class IntentDatabaseHandler(DatabaseMetadataContainerController):
     def __init__(self) -> None:
         super().__init__(SQLQueryFactory(table = "intents",
                                          fields = {
+                                             "id": "text",
                                              "name": "text",
                                              "quality_type": "text",
                                              "intent_category": "text",
@@ -17,3 +19,4 @@ class IntentDatabaseHandler(DatabaseMetadataContainerController):
                                              "version": "text",
                                              "setting_version": "text"
                                          }))
+        self.container_type = InstanceContainer

+ 3 - 0
cura/Settings/DatabaseHandlers/QualityDatabaseHandler.py

@@ -1,5 +1,6 @@
 from UM.Settings.SQLQueryFactory import SQLQueryFactory, metadata_type
 from UM.Settings.DatabaseContainerMetadataController import DatabaseMetadataContainerController
+from UM.Settings.InstanceContainer import InstanceContainer
 
 
 class QualityDatabaseHandler(DatabaseMetadataContainerController):
@@ -8,6 +9,7 @@ class QualityDatabaseHandler(DatabaseMetadataContainerController):
     def __init__(self):
         super().__init__(SQLQueryFactory(table = "qualities",
                                          fields = {
+                                             "id": "text",
                                              "name": "text",
                                              "quality_type": "text",
                                              "material": "text",
@@ -17,6 +19,7 @@ class QualityDatabaseHandler(DatabaseMetadataContainerController):
                                              "version": "text",
                                              "setting_version": "text"
                                          }))
+        self.container_type = InstanceContainer
 
     def groomMetadata(self, metadata: metadata_type) -> metadata_type:
         """

+ 3 - 0
cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py

@@ -1,5 +1,6 @@
 from UM.Settings.SQLQueryFactory import SQLQueryFactory
 from UM.Settings.DatabaseContainerMetadataController import DatabaseMetadataContainerController
+from UM.Settings.InstanceContainer import InstanceContainer
 
 
 class VariantDatabaseHandler(DatabaseMetadataContainerController):
@@ -8,9 +9,11 @@ class VariantDatabaseHandler(DatabaseMetadataContainerController):
     def __init__(self):
         super().__init__(SQLQueryFactory(table = "variants",
                                          fields = {
+                                             "id": "text",
                                              "name": "text",
                                              "hardware_type": "text",
                                              "definition": "text",
                                              "version": "text",
                                              "setting_version": "text"
                                          }))
+        self.container_type = InstanceContainer