No need to get aggregation value for text type. Fix the bug that NULL…

… is returned in aggregation value
Eugene-Mark · Apr 5, 2021 · d99cdc5 · d99cdc5
1 parent 2377042
commit d99cdc5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/org/eugene/controller/Renderer.java b/src/main/java/org/eugene/controller/Renderer.java
@@ -117,6 +117,17 @@ public void refreshTable(List<String> showingList){
     }
 
     public void refreshAggregationPane(String columnName){
+        CommonData commonData = VirtualDB.getInstance().getCommonData();
+        List<String> typeList = new ArrayList<String>();
+        typeList.add("INTEGER");
+        typeList.add("INT");
+        typeList.add("LONG");
+        typeList.add("DOUBLE");
+        typeList.add("FLOAT");
+        typeList.add("UNION");
+        if(!typeList.contains(commonData.getColumnToType().get(columnName).toUpperCase())){
+            return;
+        };
         Map<String, String> keyToValue = PhysicalDB.getInstance().getAggregation(columnName);
         dashboardRenderer.refreshAggregationPane(columnName, keyToValue);
     }

diff --git a/src/main/java/org/eugene/persistent/SqlliteWrapper.java b/src/main/java/org/eugene/persistent/SqlliteWrapper.java
@@ -159,7 +159,7 @@ public boolean insertData(CommonData commonData){
     }
 
     private String getAggregation(CommonData commonData, String columnName, String aggregation){
-        String sql = "SELECT " + aggregation + " (" + columnName + ") as r_" + aggregation + " from " + commonData.getName();
+        String sql = "SELECT " + aggregation + " (" + columnName + ") as r_" + aggregation + " from " + commonData.getName() + " where " + columnName + " != \"NULL\"";
         String result = null;
         try{
             Statement stmt = connection.createStatement();