Merge pull request #115 from entando/ENG-1929-case-sensitive-columns

ENG-1929 Removing camel case from DB columns
entando · Mar 2, 2021 · aaa5979 · aaa5979
2 parents 64b98e3 + ab61188
commit aaa5979
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/org/entando/entando/aps/system/init/model/portdb/UserPreferences.java b/src/main/java/org/entando/entando/aps/system/init/model/portdb/UserPreferences.java
@@ -43,34 +43,34 @@ public class UserPreferences {
             canBeNull = false)
     private short translationwarning;
 
-    @DatabaseField(columnName = "defaultPageOwnerGroup",
+    @DatabaseField(columnName = "defaultpageownergroup",
             dataType = DataType.STRING,
             width = 64)
-    private String defaultPageOwnerGroup;
+    private String defaultpageownergroup;
 
-    @DatabaseField(columnName = "defaultPageJoinGroups",
+    @DatabaseField(columnName = "defaultpagejoingroups",
             dataType = DataType.STRING,
             width = 256)
-    private String defaultPageJoinGroups;
+    private String defaultpagejoingroups;
 
-    @DatabaseField(columnName = "defaultContentOwnerGroup",
+    @DatabaseField(columnName = "defaultcontentownergroup",
             dataType = DataType.STRING,
             width = 64)
-    private String defaultContentOwnerGroup;
+    private String defaultcontentownergroup;
 
-    @DatabaseField(columnName = "defaultContentJoinGroups",
+    @DatabaseField(columnName = "defaultcontentjoingroups",
             dataType = DataType.STRING,
             width = 256)
-    private String defaultContentJoinGroups;
+    private String defaultcontentjoingroups;
 
-    @DatabaseField(columnName = "defaultWidgetOwnerGroup",
+    @DatabaseField(columnName = "defaultwidgetownergroup",
             dataType = DataType.STRING,
             width = 64)
-    private String defaultWidgetOwnerGroup;
+    private String defaultwidgetownergroup;
 
-    @DatabaseField(columnName = "defaultWidgetJoinGroups",
+    @DatabaseField(columnName = "defaultwidgetjoingroups",
             dataType = DataType.STRING,
             width = 256)
-    private String defaultWidgetJoinGroups;
+    private String defaultwidgetjoingroups;
 
 }
diff --git a/...main/java/org/entando/entando/aps/system/services/userpreferences/UserPreferencesDAO.java b/...main/java/org/entando/entando/aps/system/services/userpreferences/UserPreferencesDAO.java
@@ -27,20 +27,20 @@ public class UserPreferencesDAO extends AbstractDAO implements IUserPreferencesD
 	private static final EntLogger _logger =  EntLogFactory.getSanitizedLogger(UserPreferencesDAO.class);
 
 	private static final String LOAD_USER_PREFERENCES =
-			"SELECT wizard, loadonpageselect, translationwarning, defaultPageOwnerGroup, defaultPageJoinGroups, "
-					+ "defaultContentOwnerGroup, defaultContentJoinGroups, defaultWidgetOwnerGroup, "
-					+ "defaultWidgetJoinGroups FROM userpreferences WHERE username = ? ";
+			"SELECT wizard, loadonpageselect, translationwarning, defaultpageownergroup, defaultpagejoingroups, "
+					+ "defaultcontentownergroup, defaultcontentjoingroups, defaultwidgetownergroup, "
+					+ "defaultwidgetjoingroups FROM userpreferences WHERE username = ? ";
 
 	private static final String ADD_USER_PREFERENCES =
 			"INSERT INTO userpreferences (username, wizard, loadonpageselect, translationwarning, "
-					+ "defaultPageOwnerGroup, defaultPageJoinGroups, defaultContentOwnerGroup, "
-					+ "defaultContentJoinGroups, defaultWidgetOwnerGroup, defaultWidgetJoinGroups) VALUES ( ? , ? ,"
+					+ "defaultpageownergroup, defaultpagejoingroups, defaultcontentownergroup, "
+					+ "defaultcontentjoingroups, defaultwidgetownergroup, defaultwidgetjoingroups) VALUES ( ? , ? ,"
 					+ " ? , ? , ? , ?, ?, ?, ?, ? )";
 
 	private static final String UPDATE_USER_PREFERENCES =
 			"UPDATE userpreferences SET wizard = ? , loadonpageselect = ? , translationwarning = ? , "
-					+ "defaultPageOwnerGroup = ? , defaultPageJoinGroups = ? , defaultContentOwnerGroup = ? , "
-					+ "defaultContentJoinGroups = ? , defaultWidgetOwnerGroup = ?, defaultWidgetJoinGroups = ? WHERE "
+					+ "defaultpageownergroup = ? , defaultpagejoingroups = ? , defaultcontentownergroup = ? , "
+					+ "defaultcontentjoingroups = ? , defaultwidgetownergroup = ?, defaultwidgetjoingroups = ? WHERE "
 					+ "username = ? ";
 
 	private static final String DELETE_USER_PREFERENCES =