From fe83a2a83d086f8af8579f2a6c546f3576067964 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 17 Jun 2015 10:50:51 +1200
Subject: Rename some database parameters

---
 src/org/traccar/database/DataManager.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/database')

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());
     }
     
-- 
cgit v1.2.3