1 files changed, 21 insertions, 16 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index a997a89f6..06dd26b17 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -48,6 +48,7 @@ import org.traccar.model.Driver;
 import org.traccar.model.Event;
 import org.traccar.model.Geofence;
 import org.traccar.model.Group;
+import org.traccar.model.Maintenance;
 import org.traccar.model.ManagedUser;
 import org.traccar.model.Notification;
 import org.traccar.model.Permission;
@@ -189,19 +190,19 @@ public class DataManager {
 
     public static String constructPermissionQuery(String action, Class<?> owner, Class<?> property) {
         switch (action) {
-        case ACTION_SELECT_ALL:
-            return "SELECT " + makeNameId(owner) + ", " + makeNameId(property) + " FROM "
-                    + getPermissionsTableName(owner, property);
-        case ACTION_INSERT:
-            return "INSERT INTO " + getPermissionsTableName(owner, property)
-                    + " (" + makeNameId(owner) + ", " + makeNameId(property) + ") VALUES (:"
-                    + makeNameId(owner) + ", :" + makeNameId(property) + ")";
-        case ACTION_DELETE:
-            return "DELETE FROM " + getPermissionsTableName(owner, property)
-                    + " WHERE " + makeNameId(owner) + " = :" + makeNameId(owner)
-                    + " AND " + makeNameId(property) + " = :" + makeNameId(property);
-        default:
-            throw new IllegalArgumentException("Unknown action");
+            case ACTION_SELECT_ALL:
+                return "SELECT " + makeNameId(owner) + ", " + makeNameId(property) + " FROM "
+                        + getPermissionsTableName(owner, property);
+            case ACTION_INSERT:
+                return "INSERT INTO " + getPermissionsTableName(owner, property)
+                        + " (" + makeNameId(owner) + ", " + makeNameId(property) + ") VALUES (:"
+                        + makeNameId(owner) + ", :" + makeNameId(property) + ")";
+            case ACTION_DELETE:
+                return "DELETE FROM " + getPermissionsTableName(owner, property)
+                        + " WHERE " + makeNameId(owner) + " = :" + makeNameId(owner)
+                        + " AND " + makeNameId(property) + " = :" + makeNameId(property);
+            default:
+                throw new IllegalArgumentException("Unknown action");
         }
     }
 
@@ -272,11 +273,12 @@ public class DataManager {
         if (propertyName.equals("ManagedUser")) {
             propertyName = "User";
         }
-        return Introspector.decapitalize(owner.getSimpleName()) + "_" + Introspector.decapitalize(propertyName);
+        return "tc_" + Introspector.decapitalize(owner.getSimpleName())
+                + "_" + Introspector.decapitalize(propertyName);
     }
 
     private static String getObjectsTableName(Class<?> clazz) {
-        String result = Introspector.decapitalize(clazz.getSimpleName());
+        String result = "tc_" + Introspector.decapitalize(clazz.getSimpleName());
         // Add "s" ending if object name is not plural already
         if (!result.endsWith("s")) {
             result += "s";
@@ -294,7 +296,8 @@ public class DataManager {
                     config.getString("database.url"),
                     config.getString("database.user"),
                     config.getString("database.password"),
-                    null, resourceAccessor);
+                    config.getString("database.driver"),
+                    null, null, null, resourceAccessor);
 
             Liquibase liquibase = new Liquibase(
                     config.getString("database.changelog"), resourceAccessor, database);
@@ -405,6 +408,8 @@ public class DataManager {
                 return Calendar.class;
             case "command":
                 return Command.class;
+            case "maintenance":
+                return Maintenance.class;
             case "notification":
                 return Notification.class;
             default: