From f6d7a014e9397aa3a2228e208566151628a18a44 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 16 Jan 2021 16:58:26 +0100
Subject: [PATCH] cleanup old database access
---
src/logic/database/DeviceAccess.py | 33 ---------------------
src/logic/database/SensorAccess.py | 47 ------------------------------
2 files changed, 80 deletions(-)
delete mode 100644 src/logic/database/DeviceAccess.py
delete mode 100644 src/logic/database/SensorAccess.py
diff --git a/src/logic/database/DeviceAccess.py b/src/logic/database/DeviceAccess.py
deleted file mode 100644
index a3eae0d..0000000
--- a/src/logic/database/DeviceAccess.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import logging
-from typing import Dict, List
-
-from logic import Constants
-from logic.database.DatabaseAccess import DatabaseAccess, FetchType
-
-LOGGER = logging.getLogger(Constants.APP_NAME)
-
-
-class DeviceAccess(DatabaseAccess):
- TABLE_NAME = 'device'
-
- def create_table(self):
- self._query(f'''CREATE TABLE IF NOT EXISTS {self.TABLE_NAME} (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- name TEXT NOT NULL)''', fetch_type=FetchType.CREATE)
-
- def get_all_devices(self) -> List[Dict[str, str]]:
- return self._query(f'SELECT * FROM {self.TABLE_NAME} ORDER BY name', fetch_type=FetchType.ALL)
-
- def get_device(self, deviceID: int) -> Dict[str, str] or None:
- return self._query(f'SELECT * FROM {self.TABLE_NAME} WHERE id = ?', deviceID, fetch_type=FetchType.ONE)
-
- def get_device_by_name(self, deviceName: str) -> Dict[str, str] or None:
- return self._query(f'SELECT * FROM {self.TABLE_NAME} WHERE name = ?', deviceName, fetch_type=FetchType.ONE)
-
- def add_device(self, deviceName: str):
- LOGGER.debug(f'Inserting new device "{deviceName}"')
- self._query(f'INSERT INTO {self.TABLE_NAME}(name) VALUES(?)', deviceName, fetch_type=FetchType.NONE)
-
- def delete_device(self, deviceID: int):
- LOGGER.debug(f'Deleting device "{deviceID}"')
- self._query(f'DELETE FROM {self.TABLE_NAME} WHERE id = ?', deviceID, fetch_type=FetchType.NONE)
diff --git a/src/logic/database/SensorAccess.py b/src/logic/database/SensorAccess.py
deleted file mode 100644
index 5bc1917..0000000
--- a/src/logic/database/SensorAccess.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import logging
-from typing import Dict, List
-
-from logic import Constants
-from logic.database.DatabaseAccess import DatabaseAccess, FetchType
-
-LOGGER = logging.getLogger(Constants.APP_NAME)
-
-
-class SensorAccess(DatabaseAccess):
- TABLE_NAME = 'sensor'
-
- def create_table(self):
- self._query(f'''CREATE TABLE IF NOT EXISTS {self.TABLE_NAME} (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- device_id INTEGER,
- name TEXT NOT NULL,
- type TEXT NOT NULL)''', fetch_type=FetchType.CREATE)
-
- def get_all_sensors(self) -> List[Dict[str, str]]:
- return self._query(f'SELECT * FROM {self.TABLE_NAME} ORDER BY device_id, id', fetch_type=FetchType.ALL)
-
- def get_all_sensors_for_device(self, deviceID: int) -> List[Dict[str, str]]:
- return self._query(f'SELECT * FROM {self.TABLE_NAME} WHERE device_id = ? ORDER BY id',
- deviceID,
- fetch_type=FetchType.ALL)
-
- def get_sensor(self, sensorID: int) -> Dict[str, str] or None:
- return self._query(f'SELECT * FROM {self.TABLE_NAME} WHERE id = ?',
- sensorID,
- fetch_type=FetchType.ONE)
-
- def get_sensor_by_name_and_device_id(self, deviceID: int, sensorName: str) -> Dict[str, str] or None:
- return self._query(f'SELECT * FROM {self.TABLE_NAME} WHERE device_id = ? AND name = ?',
- deviceID, sensorName,
- fetch_type=FetchType.ONE)
-
- def add_sensor(self, deviceID: int, name: str, sensorType: str):
- LOGGER.debug(f'Inserting new "{sensorType}" sensor "{name}" for device "{deviceID}"')
- self._query(f'INSERT INTO {self.TABLE_NAME}(name, device_id, type) '
- f'VALUES(?, ?, ?)',
- name, deviceID, sensorType,
- fetch_type=FetchType.NONE)
-
- def delete_sensor(self, sensorID: int):
- LOGGER.debug(f'Deleting sensor "{sensorID}"')
- self._query(f'DELETE FROM {self.TABLE_NAME} WHERE id = ?', sensorID, fetch_type=FetchType.NONE)
--
GitLab