3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use SQLQueryFactory for container DB

Browse source 
Needed to add a Filter possibility to facilitate that
Created a Simple UserString class which can be used as:

```py
        sql_filter = SQLFilter(f"SELECT {{}} FROM table_name WHERE id = ?")
        cursor.execute(sql_filter)  # Will execute: SELECT * FROM table_name WHERE id = ?
        cursor.execute(sql_filter["id", "name"])  # Will execute: SELECT id, name FROM table_name WHERE id = ?

```

Contributes to CURA-6096
This commit is contained in:
jelle Spijker 2021-09-02 16:55:24 +02:00 • committed by Jelle Spijker
parent 4067d9d607
commit 571a051041
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
3 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/Settings/DatabaseHandlers/IntentDatabaseHandler.py
View file

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

3
cura/Settings/DatabaseHandlers/QualityDatabaseHandler.py
View file

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

3
cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py
View file

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