Refactor

Author: amitshekhariitbhu

debug-db/src/main/java/com/amitshekhar/server/RequestHandler.java

@@ -216,7 +216,7 @@ private String executeQueryAndGetResponse(String route) {
             if (query != null) {
                 first = query.split(" ")[0].toLowerCase();
                 if (first.equals("select")) {
-                    TableDataResponse response = DatabaseHelper.query(mDatabase, query);
+                    TableDataResponse response = DatabaseHelper.getTableData(mDatabase, query, null);
                     data = mGson.toJson(response);
                 } else {
                     Response response = DatabaseHelper.exec(mDatabase, query);

debug-db/src/main/java/com/amitshekhar/utils/DatabaseHelper.java

@@ -64,8 +64,6 @@ public static TableDataResponse getTableData(SQLiteDatabase db, String selectQue
 
         TableDataResponse tableData = new TableDataResponse();
 
-        // TODO : Handle JOIN query
-
         if (tableName == null) {
             tableName = getTableName(selectQuery);
         }
@@ -134,7 +132,7 @@ public static TableDataResponse getTableData(SQLiteDatabase db, String selectQue
 
     }
 
-    public static List<TableDataResponse.TableInfo> getTableInfo(SQLiteDatabase db, String pragmaQuery) {
+    private static List<TableDataResponse.TableInfo> getTableInfo(SQLiteDatabase db, String pragmaQuery) {
 
         Cursor cursor;
         try {
@@ -228,75 +226,6 @@ public static UpdateRowResponse updateRow(SQLiteDatabase db, String tableName, L
         return updateRowResponse;
     }
 
-    public static TableDataResponse query(SQLiteDatabase database, String sql) {
-        Cursor cursor;
-        try {
-            cursor = database.rawQuery(sql, null);
-        } catch (Exception e) {
-            e.printStackTrace();
-            TableDataResponse errorResponse = new TableDataResponse();
-            errorResponse.isSuccessful = false;
-            errorResponse.errorMessage = e.getMessage();
-            return errorResponse;
-        }
-
-        if (cursor != null) {
-            cursor.moveToFirst();
-            TableDataResponse response = new TableDataResponse();
-            response.isSuccessful = true;
-
-            response.tableInfos = new ArrayList<>();
-            for (int i = 0; i < cursor.getColumnCount(); i++) {
-                TableDataResponse.TableInfo tableInfo = new TableDataResponse.TableInfo();
-                tableInfo.title = cursor.getColumnName(i);
-                tableInfo.isPrimary = false;
-
-                response.tableInfos.add(tableInfo);
-            }
-
-            response.rows = new ArrayList<>();
-            if (cursor.getCount() > 0) {
-                do {
-                    List<TableDataResponse.ColumnData> row = new ArrayList<>();
-                    for (int i = 0; i < cursor.getColumnCount(); i++) {
-                        TableDataResponse.ColumnData columnData = new TableDataResponse.ColumnData();
-                        switch (cursor.getType(i)) {
-                            case Cursor.FIELD_TYPE_BLOB:
-                                columnData.dataType = DataType.TEXT;
-                                columnData.value = ConverterUtils.blobToString(cursor.getBlob(i));
-                                break;
-                            case Cursor.FIELD_TYPE_FLOAT:
-                                columnData.dataType = DataType.REAL;
-                                columnData.value = cursor.getDouble(i);
-                                break;
-                            case Cursor.FIELD_TYPE_INTEGER:
-                                columnData.dataType = DataType.INTEGER;
-                                columnData.value = cursor.getLong(i);
-                                break;
-                            case Cursor.FIELD_TYPE_STRING:
-                                columnData.dataType = DataType.TEXT;
-                                columnData.value = cursor.getString(i);
-                                break;
-                            default:
-                                columnData.dataType = DataType.TEXT;
-                                columnData.value = cursor.getString(i);
-                        }
-                        row.add(columnData);
-                    }
-                    response.rows.add(row);
-
-                } while (cursor.moveToNext());
-            }
-            cursor.close();
-            return response;
-        } else {
-            TableDataResponse errorResponse = new TableDataResponse();
-            errorResponse.isSuccessful = false;
-            errorResponse.errorMessage = "Cursor is null";
-            return errorResponse;
-        }
-    }
-
     public static Response exec(SQLiteDatabase database, String sql) {
         Response response = new Response();
         try {
@@ -311,7 +240,8 @@ public static Response exec(SQLiteDatabase database, String sql) {
         return response;
     }
 
-    public static String getTableName(String selectQuery) {
+    private static String getTableName(String selectQuery) {
+        // TODO find tableName from query and also handle JOIN query
         return null;
     }