Merge remote-tracking branch 'refs/remotes/tananaev/master'

1 files changed, 11 insertions, 9 deletions

diff --git a/debug.xml b/debug.xml
index 346eda292..abd230748 100644
--- a/debug.xml
+++ b/debug.xml
@@ -41,10 +41,11 @@
     <entry key='logger.level'>all</entry>
     <entry key='logger.file'>target/tracker-server.log</entry>
 
+    <entry key='deviceManager.lookupGroupsAttribute'>true</entry>
+
     <entry key='event.enable'>true</entry>
-    <entry key='event.suppressRepeated'>60</entry>
     <entry key='event.overspeedHandler'>true</entry>
-    <entry key='event.globalSpeedLimit'>90</entry>
+    <entry key='event.overspeed.notRepeat'>true</entry>
     <entry key='event.motionHandler'>true</entry>
     <entry key='event.geofenceHandler'>true</entry>
     <entry key='event.alertHandler'>true</entry>
@@ -80,7 +81,7 @@
     <entry key='database.ignoreUnknown'>true</entry>
 
     <entry key='database.xml'>false</entry>
-    <entry key='database.saveOriginal'>false</entry>
+    <entry key='database.saveOriginal'>true</entry>
 
     <entry key='database.changelog'>./schema/changelog-master.xml</entry>
 
@@ -102,7 +103,8 @@
         latitude = :latitude,
         longitude = :longitude,
         zoom = :zoom,
-        twelveHourFormat = :twelveHourFormat
+        twelveHourFormat = :twelveHourFormat,
+        attributes = :attributes
         WHERE id = :id;
     </entry>
 
@@ -170,7 +172,7 @@
     </entry>
 
     <entry key='database.updateDeviceStatus'>
-        UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion WHERE id = :id;
+        UPDATE devices SET lastUpdate = :lastUpdate WHERE id = :id;
     </entry>
 
     <entry key='database.deleteDevice'>
@@ -190,11 +192,11 @@
     </entry>
 
     <entry key='database.insertGroup'>
-        INSERT INTO groups (name, groupId) VALUES (:name, :groupId);
+        INSERT INTO groups (name, groupId, attributes) VALUES (:name, :groupId, :attributes);
     </entry>
 
     <entry key='database.updateGroup'>
-        UPDATE groups SET name = :name, groupId = :groupId WHERE id = :id;
+        UPDATE groups SET name = :name, groupId = :groupId, attributes = :attributes WHERE id = :id;
     </entry>
 
     <entry key='database.deleteGroup'>
@@ -323,8 +325,8 @@
         DELETE FROM notifications WHERE id = :id;
     </entry>
 
-    <entry key='database.clearPositionsHistory'>
-        DELETE FROM positions WHERE id != :positionId and deviceid = :deviceId and servertime &lt; :serverTime;
+    <entry key='database.deletePositions'>
+        DELETE FROM positions WHERE serverTime &lt; :serverTime AND id NOT IN (SELECT positionId FROM devices);
     </entry>
 
     <!-- PROTOCOL CONFIG -->