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

---
 debug.xml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'debug.xml')

diff --git a/debug.xml b/debug.xml
index 01bb66d60..1074d9eba 100644
--- a/debug.xml
+++ b/debug.xml
@@ -117,22 +117,21 @@
         id INT PRIMARY KEY AUTO_INCREMENT);
     </entry>
 
+    <entry key='database.selectServers'>
+        SELECT * FROM server;
+    </entry>
+
     <entry key='database.insertServer'>
         INSERT INTO server (registration, latitude, longitude, zoom)
         VALUES (:registration, :latitude, :longitude, :zoom);
     </entry>
 
-    <entry key='database.selectServer'>
-        SELECT * FROM server;
-    </entry>
-
     <entry key='database.updateServer'>
         UPDATE server SET registration = :registration WHERE id = :id;
     </entry>
 
     <entry key='database.loginUser'>
-        SELECT * 
-        FROM user 
+        SELECT * FROM user
         WHERE email = :email;
     </entry>
 
@@ -144,12 +143,9 @@
         INSERT INTO user (name, email, hashedPassword, salt, admin)
         VALUES (:name, :email, :hashedPassword, :salt, :admin);
     </entry>
-        
+
     <entry key='database.updateUser'>
-        UPDATE user SET 
-                name = :name, 
-                email = :email, 
-                admin = :admin
+        UPDATE user SET name = :name, email = :email, admin = :admin
         WHERE id = :id;
     </entry>
 
@@ -161,11 +157,11 @@
         DELETE FROM user WHERE id = :id;
     </entry>
 
-    <entry key='database.getPermissions'>
+    <entry key='database.getPermissionsAll'>
         SELECT userId, deviceId FROM user_device;
     </entry>
     
-    <entry key='database.selectDeviceAll'>
+    <entry key='database.selectDevicesAll'>
         SELECT * FROM device;
     </entry>
     
@@ -181,7 +177,7 @@
         UPDATE device SET name = :name, uniqueId = :uniqueId WHERE id = :id;
     </entry>
     
-    <entry key='database.removeDevice'>
+    <entry key='database.deleteDevice'>
         DELETE FROM device WHERE id = :id;
     </entry>
     
@@ -202,7 +198,6 @@
         UPDATE device SET positionId = :id WHERE id = :deviceId;
     </entry>
 
-
     <!-- PROTOCOL CONFIG -->
 
     <entry key='detector.port'>5000</entry>
-- 
cgit v1.2.3