aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database/DataManager.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-17 10:50:51 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-17 10:50:51 +1200
commitfe83a2a83d086f8af8579f2a6c546f3576067964 (patch)
tree287da8088e18496d966585860849a9e0a2e8c243 /src/org/traccar/database/DataManager.java
parent6cc356e9bb80583444f9a721b1604b3130199e24 (diff)
downloadtraccar-server-fe83a2a83d086f8af8579f2a6c546f3576067964.tar.gz
traccar-server-fe83a2a83d086f8af8579f2a6c546f3576067964.tar.bz2
traccar-server-fe83a2a83d086f8af8579f2a6c546f3576067964.zip
Rename some database parameters
Diffstat (limited to 'src/org/traccar/database/DataManager.java')
-rw-r--r--src/org/traccar/database/DataManager.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 1aae7da4e..d8efaaaca 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -260,12 +260,12 @@ public class DataManager {
}
public Collection<Permission> getPermissions() throws SQLException {
- return QueryBuilder.create(dataSource, properties.getProperty("database.getPermissions"))
+ return QueryBuilder.create(dataSource, properties.getProperty("database.getPermissionsAll"))
.executeQuery(new Permission());
}
public Collection<Device> getAllDevices() throws SQLException {
- return QueryBuilder.create(dataSource, properties.getProperty("database.selectDeviceAll"))
+ return QueryBuilder.create(dataSource, properties.getProperty("database.selectDevicesAll"))
.executeQuery(new Device());
}
@@ -288,7 +288,7 @@ public class DataManager {
}
public void removeDevice(Device device) throws SQLException {
- QueryBuilder.create(dataSource, properties.getProperty("database.removeDevice"))
+ QueryBuilder.create(dataSource, properties.getProperty("database.deleteDevice"))
.setObject(device)
.executeUpdate();
}
@@ -320,7 +320,7 @@ public class DataManager {
}
public Server getServer() throws SQLException {
- return QueryBuilder.create(dataSource, properties.getProperty("database.selectServer"))
+ return QueryBuilder.create(dataSource, properties.getProperty("database.selectServers"))
.executeQuerySingle(new Server());
}