Added support for camelcase fields and filters in ServiceRequest

pborissow · pborissow · commit 579cf4e21bad · 2024-01-19T13:48:57.000-05:00
diff --git a/src/javaxt/express/ServiceRequest.java b/src/javaxt/express/ServiceRequest.java
@@ -690,9 +690,13 @@ private Field[] getFields(String fields){
         javaxt.sql.Parser sqlParser = new javaxt.sql.Parser("SELECT " + fields + " FROM T");
         ArrayList<Field> arr = new ArrayList<>();
         for (javaxt.sql.Parser.SelectStatement stmt : sqlParser.getSelectStatements()){
-            Field field = new Field(stmt.getField());
+            String column = stmt.getField();
+            boolean isFunction = stmt.isFunction();
+            if (!isFunction) column = StringUtils.camelCaseToUnderScore(column);
+
+            Field field = new Field(column);
             field.setAlias(stmt.getAlias());
-            field.isFunction(stmt.isFunction());
+            field.isFunction(isFunction);
             arr.add(field);
         }
         return arr.toArray(new Field[arr.size()]);
@@ -897,7 +901,7 @@ else if (val.toLowerCase().startsWith("contains(") && val.endsWith(")")){
             }
 
 
-
+            key = StringUtils.camelCaseToUnderScore(key);
             filter.set(key, op, val);
         }
 
@@ -1016,6 +1020,10 @@ public Field(String field){
             isFunction = false;
         }
 
+        public String getColumn(){
+            return col;
+        }
+
         public void setAlias(String alias){
             this.alias = alias;
         }
