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

Use a class to build to sql queries

Browse source 
This greatly reduced the amount of duplicate code in the DataBaseHandlers
Not sure how secure this is SQL injections. Need to check that and maybe
put in some guards. Using double underscores for now and only provide a
getter. But then again why bother with an SQL injection as
you can just as easily modify the Python code, and we still have the old
Containers to fallback to if the Database gets corrupted.

Contributes to CURA-6096
This commit is contained in:
jelle Spijker 2021-09-01 13:58:58 +02:00 • committed by Jelle Spijker
parent 3191baf5a0
commit 7aa08d4acd
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
3 changed files with 51 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,59 +1,29 @@
from typing import Generator
from UM.Settings.SQLQueryFactory import SQLQueryFactory, metadata_type
from UM.Settings.DatabaseContainerMetadataController import DatabaseMetadataContainerController
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 (?, ?, ? ,?, ?, ?, ?, ?, ?)""",
update_query = """ UPDATE qualities
SET name = ?,
quality_type = ?,
material = ?,
variant = ?,
global_quality = ?,
definition = ?,
version = ?,
setting_version = ?
WHERE id = ?
""",
select_query = "SELECT * FROM qualities WHERE id = ?",
delete_query = "DELETE FROM qualities WHERE id = ?",
table_query = """CREATE TABLE qualities
(
id text,
name text,
quality_type text,
material text,
variant text,
global_quality bool,
definition text,
version text,
setting_version text
);
CREATE UNIQUE INDEX idx_qualities_id on qualities (id);"""
)
def _convertMetadataToUpdateBatch(self, metadata):
return self._convertMetadataToInsertBatch(metadata)[1:]
def _convertRawDataToMetadata(self, data):
return {"id": data[0], "name": data[1], "quality_type": data[2], "material": data[3], "variant": data[4],
"global_quality": data[5], "definition": data[6], "container_type": InstanceContainer,
"version": data[7], "setting_version": data[8], "type": "quality"}
def _convertMetadataToInsertBatch(self, metadata):
global_quality = False
if "global_quality" in metadata:
global_quality = metadata["global_quality"]
material = ""
if "material" in metadata:
material = metadata["material"]
variant = ""
if "variant" in metadata:
variant = metadata["variant"]
return metadata["id"], metadata["name"], metadata["quality_type"], material, variant, global_quality, metadata["definition"], metadata["version"], metadata["setting_version"]
"""The Database handler for Quality containers"""
def __init__(self):
super().__init__(SQLQueryFactory(table = "qualities",
fields = {
"id": "text",
"name": "text",
"quality_type": "text",
"material": "text",
"variant": "text",
"global_quality": "bool",
"definition": "text",
"version": "text",
"setting_version": "text"
}))
self.container_type = InstanceContainer
def groomMetadata(self, metadata: metadata_type) -> metadata_type:
if "global_quality" not in metadata:
metadata["global_quality"] = "False"
return super().groomMetadata(metadata)