aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debug.xml6
-rw-r--r--schema/changelog-3.8.xml2
-rw-r--r--src/org/traccar/model/Device.java10
3 files changed, 9 insertions, 9 deletions
diff --git a/debug.xml b/debug.xml
index 67b514d13..d32d9eaf8 100644
--- a/debug.xml
+++ b/debug.xml
@@ -168,8 +168,8 @@
</entry>
<entry key='database.insertDevice'>
- INSERT INTO devices (name, uniqueId, groupId, attributes, phone, model, contact, type)
- VALUES (:name, :uniqueId, :groupId, :attributes, :phone, :model, :contact, :type)
+ INSERT INTO devices (name, uniqueId, groupId, attributes, phone, model, contact, category)
+ VALUES (:name, :uniqueId, :groupId, :attributes, :phone, :model, :contact, :category)
</entry>
<entry key='database.updateDevice'>
@@ -181,7 +181,7 @@
phone = :phone,
model = :model,
contact = :contact,
- type = :type
+ category = :category
WHERE id = :id
</entry>
diff --git a/schema/changelog-3.8.xml b/schema/changelog-3.8.xml
index dbf04df79..780a2d029 100644
--- a/schema/changelog-3.8.xml
+++ b/schema/changelog-3.8.xml
@@ -104,7 +104,7 @@
<column name="contact" type="VARCHAR(512)" />
</addColumn>
<addColumn tableName="devices">
- <column name="type" type="VARCHAR(128)" />
+ <column name="category" type="VARCHAR(128)" />
</addColumn>
</changeSet>
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index 47b8fb2a6..821984c47 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -132,13 +132,13 @@ public class Device extends Extensible {
this.contact = contact;
}
- private String type;
+ private String category;
- public String getType() {
- return type;
+ public String getCategory() {
+ return category;
}
- public void setType(String type) {
- this.type = type;
+ public void setCategory(String category) {
+ this.category = category;
}
}