Revert "Use SQLQueryFactory for container DB"

This reverts commit 571a051041.
This commit is contained in:
Ghostkeeper 2021-09-08 15:10:32 +02:00
parent 571a051041
commit adac0af1ec
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
3 changed files with 9 additions and 0 deletions

View file

@ -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

View file

@ -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:
"""

View file

@ -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