aboutsummaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-05-31 08:56:10 +0500
committerAbyss777 <abyss@fox5.ru>2016-05-31 08:56:10 +0500
commit41c46575a92f746622c61b07004b7a0832712a54 (patch)
tree689b5ecf88d1e2df8d4166deab9ac7558f54d291 /setup
parent80119f59a0d4b89396f5d7d57ba2d80257a8da79 (diff)
downloadtraccar-server-41c46575a92f746622c61b07004b7a0832712a54.tar.gz
traccar-server-41c46575a92f746622c61b07004b7a0832712a54.tar.bz2
traccar-server-41c46575a92f746622c61b07004b7a0832712a54.zip
- Renamed eventTime to serverTime
- Fixed bracket indentation
Diffstat (limited to 'setup')
-rw-r--r--setup/unix/traccar.xml6
-rw-r--r--setup/windows/traccar.xml6
2 files changed, 6 insertions, 6 deletions
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index 22b71e204..a0233e601 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -177,12 +177,12 @@
</entry>
<entry key='database.insertEvent'>
- INSERT INTO events (type, eventTime, deviceId, positionId, attributes)
- VALUES (:type, :eventTime, :deviceId, :positionId, :attributes);
+ INSERT INTO events (type, serverTime, deviceId, positionId, attributes)
+ VALUES (:type, :serverTime, :deviceId, :positionId, :attributes);
</entry>
<entry key='database.selectEvents'>
- SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime BETWEEN :from AND :to ORDER BY eventTime DESC;
+ SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND serverTime BETWEEN :from AND :to ORDER BY serverTime DESC;
</entry>
<!-- PROTOCOL CONFIG -->
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index 649c3bb15..5748f3993 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -177,12 +177,12 @@
</entry>
<entry key='database.insertEvent'>
- INSERT INTO events (type, eventTime, deviceId, positionId, attributes)
- VALUES (:type, :eventTime, :deviceId, :positionId, :attributes);
+ INSERT INTO events (type, serverTime, deviceId, positionId, attributes)
+ VALUES (:type, :serverTime, :deviceId, :positionId, :attributes);
</entry>
<entry key='database.selectEvents'>
- SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime BETWEEN :from AND :to ORDER BY eventTime DESC;
+ SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND serverTime BETWEEN :from AND :to ORDER BY serverTime DESC;
</entry>
<!-- PROTOCOL CONFIG -->