diff options
| author | ninioe <ninioe@gmail.com> | 2016-08-01 16:12:47 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-08-01 16:12:47 +0300 |
| commit | 94781fa3ba35e494e309aee19a5e15c14d3193c1 (patch) | |
| tree | a1e4a90e9a2fce3db8bc51981aeb8a23cced5e6d /setup | |
| parent | b4841fa0a6293c0b895cf6bb65c6c2d871c78397 (diff) | |
| parent | e177e7d083a4dd3f64172802661bf658d26d1163 (diff) | |
| download | trackermap-server-94781fa3ba35e494e309aee19a5e15c14d3193c1.tar.gz trackermap-server-94781fa3ba35e494e309aee19a5e15c14d3193c1.tar.bz2 trackermap-server-94781fa3ba35e494e309aee19a5e15c14d3193c1.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/unix/traccar.xml | 9 | ||||
| -rw-r--r-- | setup/windows/traccar.xml | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml index e8b29a296..da09d74d6 100644 --- a/setup/unix/traccar.xml +++ b/setup/unix/traccar.xml @@ -51,7 +51,8 @@ latitude = :latitude, longitude = :longitude, zoom = :zoom, - twelveHourFormat = :twelveHourFormat + twelveHourFormat = :twelveHourFormat, + attributes = :attributes WHERE id = :id; </entry> @@ -119,7 +120,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'> @@ -139,11 +140,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'> diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml index 6220263ef..a3971e4f8 100644 --- a/setup/windows/traccar.xml +++ b/setup/windows/traccar.xml @@ -51,7 +51,8 @@ latitude = :latitude,
longitude = :longitude,
zoom = :zoom,
- twelveHourFormat = :twelveHourFormat
+ twelveHourFormat = :twelveHourFormat,
+ attributes = :attributes
WHERE id = :id;
</entry>
@@ -119,7 +120,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'>
@@ -139,11 +140,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'>
|