- Removed app-specific code from the QueryService

pborissow · pborissow · commit 7b8bfc04a724 · 2019-12-17T00:03:30.000Z
- Updated User interface

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-express@1256 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/express/User.java b/src/javaxt/express/User.java
@@ -2,5 +2,5 @@
 
 public interface User {
     public Long getID();
-    public int getAccessLevel();
+    public Integer getAccessLevel();
 }
diff --git a/src/javaxt/express/services/QueryService.java b/src/javaxt/express/services/QueryService.java
@@ -13,7 +13,6 @@
 import javaxt.json.*;
 import javaxt.utils.Console;
 
-import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.parser.*;
 import net.sf.jsqlparser.statement.select.*;
 import net.sf.jsqlparser.statement.Statement;
@@ -192,43 +191,7 @@ else if (statement instanceof Select){
 
 
           //Check whether the select statement has illegal or unsupported functions
-            PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
-            Iterator<SelectItem> it = plainSelect.getSelectItems().iterator();
-            while (it.hasNext()){
-                SelectItem selectItem = it.next();
-
-                String functionName = null;
-                if (selectItem instanceof SelectExpressionItem){
-                    SelectExpressionItem si = (SelectExpressionItem) selectItem;
-                    Expression expression = si.getExpression();
-
-                    try{
-                        net.sf.jsqlparser.expression.Function f = (net.sf.jsqlparser.expression.Function) expression;
-                        functionName = f.getName().toUpperCase();
-
-                    }
-                    catch(Exception e){
-                        try{
-                            SubSelect ss = (SubSelect) expression;
-                            functionName = "SELECT";
-                        }
-                        catch(Exception ex){
-                        }
-                    }
-                }
-                else if (selectItem instanceof AllColumns){}
-                else if (selectItem instanceof AllTableColumns){}
-                else{
-                    throw new IllegalArgumentException("Unsupported select expression");
-                }
-
-
-                if (functionName!=null){
-                    if (functionName.equals("COUNT")){
-                        //throw new IllegalArgumentException(functionName + " statements are not currently supported");
-                    }
-                }
-            }
+            checkSelect((PlainSelect) select.getSelectBody());
 
 
 
@@ -295,6 +258,15 @@ else if (selectItem instanceof AllTableColumns){}
     }
 
 
+  //**************************************************************************
+  //** checkSelect
+  //**************************************************************************
+  /** Used to check whether the select statement has illegal or unsupported
+   *  functions
+   */
+    protected void checkSelect(PlainSelect plainSelect){}
+
+
   //**************************************************************************
   //** Writer
   //**************************************************************************
@@ -662,18 +634,16 @@ private Integer getPid(String key, Connection conn) throws SQLException {
   //**************************************************************************
   /** Returns a list of tables and columns
    */
-    private ServiceResponse getTables(ServiceRequest request, Database database) {
+    public ServiceResponse getTables(ServiceRequest request, Database database) {
         Connection conn = null;
         try{
 
             JSONArray arr = new JSONArray();
             conn = database.getConnection();
             for (Table table : Database.getTables(conn)){
-
-                if (table.getName().startsWith("device_location_")) continue; //skip partition tables
-
                 JSONArray columns = new JSONArray();
                 for (Column column : table.getColumns()){
+
                     JSONObject col = new JSONObject();
                     col.set("name", column.getName());
                     col.set("type", column.getType());
@@ -685,6 +655,7 @@ private ServiceResponse getTables(ServiceRequest request, Database database) {
 
                 JSONObject json = new JSONObject();
                 json.set("name", table.getName());
+                json.set("schema", table.getSchema());
                 json.set("columns", columns);
                 arr.add(json);
             }

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`public interface User {`
`4`	`4`	`public Long getID();`
`5`		`- public int getAccessLevel();`
	`5`	`+ public Integer getAccessLevel();`
`6`	`6`	`}`