Merge pull request #3373 from Abyss777/refactor_managers

Refactor managers, permissions etc

1 files changed, 26 insertions, 26 deletions

diff --git a/setup/default.xml b/setup/default.xml
index 04530104a..f0f9ef4a3 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -60,7 +60,7 @@
         WHERE email = :email
     </entry>
 
-    <entry key='database.selectUsersAll'>
+    <entry key='database.selectUsers'>
         SELECT * FROM users
     </entry>
 
@@ -103,15 +103,15 @@
         DELETE FROM users WHERE id = :id
     </entry>
 
-    <entry key='database.selectDevicePermissions'>
+    <entry key='database.selectUserDevices'>
         SELECT userId, deviceId FROM user_device
     </entry>
 
-    <entry key='database.selectGroupPermissions'>
+    <entry key='database.selectUserGroups'>
         SELECT userId, groupId FROM user_group
     </entry>
 
-    <entry key='database.selectDevicesAll'>
+    <entry key='database.selectDevices'>
         SELECT * FROM devices
     </entry>
 
@@ -141,15 +141,15 @@
         DELETE FROM devices WHERE id = :id
     </entry>
 
-    <entry key='database.linkDevice'>
+    <entry key='database.linkUserDevice'>
         INSERT INTO user_device (userId, deviceId) VALUES (:userId, :deviceId)
     </entry>
 
-    <entry key='database.unlinkDevice'>
+    <entry key='database.unlinkUserDevice'>
         DELETE FROM user_device WHERE userId = :userId AND deviceId = :deviceId
     </entry>
 
-    <entry key='database.selectGroupsAll'>
+    <entry key='database.selectGroups'>
         SELECT * FROM groups
     </entry>
 
@@ -165,11 +165,11 @@
         DELETE FROM groups WHERE id = :id
     </entry>
 
-    <entry key='database.linkGroup'>
+    <entry key='database.linkUserGroup'>
         INSERT INTO user_group (userId, groupId) VALUES (:userId, :groupId)
     </entry>
 
-    <entry key='database.unlinkGroup'>
+    <entry key='database.unlinkUserGroup'>
         DELETE FROM user_group WHERE userId = :userId AND groupId = :groupId
     </entry>
 
@@ -207,7 +207,7 @@
         SELECT * FROM events WHERE deviceId = :deviceId AND serverTime BETWEEN :from AND :to ORDER BY serverTime
     </entry>
 
-    <entry key='database.selectGeofencesAll'>
+    <entry key='database.selectGeofences'>
         SELECT * FROM geofences
     </entry>
 
@@ -230,15 +230,15 @@
         DELETE FROM geofences WHERE id = :id
     </entry>
 
-    <entry key='database.selectGeofencePermissions'>
+    <entry key='database.selectUserGeofences'>
         SELECT userId, geofenceId FROM user_geofence
     </entry>
 
-    <entry key='database.linkGeofence'>
+    <entry key='database.linkUserGeofence'>
         INSERT INTO user_geofence (userId, geofenceId) VALUES (:userId, :geofenceId)
     </entry>
 
-    <entry key='database.unlinkGeofence'>
+    <entry key='database.unlinkUserGeofence'>
         DELETE FROM user_geofence WHERE userId = :userId AND geofenceId = :geofenceId
     </entry>
 
@@ -328,7 +328,7 @@
         VALUES (:captureTime, :activeUsers, :activeDevices, :requests, :messagesReceived, :messagesStored, :mailSent, :smsSent, :geocoderRequests, :geolocationRequests, :attributes)
     </entry>
     
-    <entry key='database.selectCalendarsAll'>
+    <entry key='database.selectCalendars'>
         SELECT * FROM calendars
     </entry>
 
@@ -349,27 +349,27 @@
         DELETE FROM calendars WHERE id = :id
     </entry>
 
-    <entry key='database.selectCalendarPermissions'>
+    <entry key='database.selectUserCalendars'>
         SELECT userId, calendarId FROM user_calendar
     </entry>
 
-    <entry key='database.linkCalendar'>
+    <entry key='database.linkUserCalendar'>
         INSERT INTO user_calendar (userId, calendarId) VALUES (:userId, :calendarId)
     </entry>
 
-    <entry key='database.unlinkCalendar'>
+    <entry key='database.unlinkUserCalendar'>
         DELETE FROM user_calendar WHERE userId = :userId AND calendarId = :calendarId
     </entry>
     
-    <entry key='database.selectUserPermissions'>
+    <entry key='database.selectUserUsers'>
         SELECT userId, managedUserId FROM user_user
     </entry>
 
-    <entry key='database.linkUser'>
+    <entry key='database.linkUserManagedUser'>
         INSERT INTO user_user (userId, managedUserId) VALUES (:userId, :managedUserId)
     </entry>
 
-    <entry key='database.unlinkUser'>
+    <entry key='database.unlinkUserManagedUser'>
         DELETE FROM user_user WHERE userId = :userId AND managedUserId = :managedUserId
     </entry>
 
@@ -395,15 +395,15 @@
         DELETE FROM attributes WHERE id = :id
     </entry>
     
-        <entry key='database.selectAttributePermissions'>
+        <entry key='database.selectUserAttributes'>
         SELECT userId, attributeId FROM user_attribute
     </entry>
 
-    <entry key='database.linkAttribute'>
+    <entry key='database.linkUserAttribute'>
         INSERT INTO user_attribute (userId, attributeId) VALUES (:userId, :attributeId)
     </entry>
 
-    <entry key='database.unlinkAttribute'>
+    <entry key='database.unlinkUserAttribute'>
         DELETE FROM user_attribute WHERE userId = :userId AND attributeId = :attributeId
     </entry>
 
@@ -452,15 +452,15 @@
         DELETE FROM drivers WHERE id = :id
     </entry>
     
-    <entry key='database.selectDriverPermissions'>
+    <entry key='database.selectUserDrivers'>
         SELECT userId, driverId FROM user_driver
     </entry>
 
-    <entry key='database.linkDriver'>
+    <entry key='database.linkUserDriver'>
         INSERT INTO user_driver (userId, driverId) VALUES (:userId, :driverId)
     </entry>
 
-    <entry key='database.unlinkDriver'>
+    <entry key='database.unlinkUserDriver'>
         DELETE FROM user_driver WHERE userId = :userId AND driverId = :driverId
     </entry>