Remove data model and fix some issues

1 files changed, 1 insertions, 29 deletions

diff --git a/debug.xml b/debug.xml
index 5192dcb8b..b5ff02981 100644
--- a/debug.xml
+++ b/debug.xml
@@ -73,8 +73,7 @@
         uniqueId VARCHAR(128) NOT NULL UNIQUE,
         status VARCHAR(128),
         lastUpdate TIMESTAMP,
-        positionId INT,
-        dataId INT);
+        positionId INT);
 
         CREATE TABLE user_device (
         userId INT NOT NULL,
@@ -105,16 +104,6 @@
         
         CREATE INDEX position_deviceId_fixTime ON position (deviceId, fixTime);
 
-        CREATE TABLE data (
-        id INT PRIMARY KEY AUTO_INCREMENT,
-        protocol VARCHAR(128),
-        deviceId INT NOT NULL,
-        serverTime TIMESTAMP NOT NULL,
-        deviceTime TIMESTAMP NOT NULL,
-        type VARCHAR(128),
-        attributes VARCHAR(4096) NOT NULL,
-        FOREIGN KEY (deviceId) REFERENCES device (id) ON DELETE CASCADE);
-
         CREATE TABLE server (
         id INT PRIMARY KEY AUTO_INCREMENT,
         registration BIT NOT NULL,
@@ -245,23 +234,6 @@
         UPDATE device SET positionId = :id WHERE id = :deviceId;
     </entry>
 
-    <entry key='database.selectData'>
-        SELECT * FROM data WHERE deviceId = :deviceId AND deviceTime BETWEEN :from AND :to ORDER BY deviceTime;
-    </entry>
-
-    <entry key='database.insertData'>
-        INSERT INTO data (deviceId, protocol, serverTime, deviceTime, type, attributes)
-        VALUES (:deviceId, :protocol, CURRENT_TIMESTAMP(), :time, :type, :attributes);
-    </entry>
-
-    <entry key='database.selectLatestData'>
-        SELECT * FROM data WHERE id IN (SELECT dataId FROM device);
-    </entry>
-
-    <entry key='database.updateLatestData'>
-        UPDATE device SET dataId = :id WHERE id = :deviceId;
-    </entry>
-
     <!-- PROTOCOL CONFIG -->
 
     <!--<entry key='detector.port'>5000</entry>-->