Merge branch 'Development' of https://github.com/amitshekhariitbhu/Android-Debug-Database into Development

Author: amitshekhariitbhu

app/src/main/java/com/sample/database/CarDBHelper.java

@@ -52,6 +52,12 @@ public void onCreate(SQLiteDatabase db) {
                 "create table cars " +
                         "(id integer primary key, name text, color text, mileage real)"
         );
+
+        db.execSQL("create table [transaction] (id integer primary key, name text)");
+
+        for (int i = 0; i < 10; i++) {
+            db.execSQL("insert into [transaction] (name) values ('hello');");
+        }
     }
 
     @Override

debug-db/src/main/assets/app.js

@@ -149,20 +149,9 @@ function inflateData(result){
        $("#db-data-div").remove();
        $("#parent-data-div").append('<div id="db-data-div"><table class="display nowrap" cellpadding="0" border="0" cellspacing="0" width="100%" class="table table-striped table-bordered display" id="db-data"></table></div>');
 
-       $(tableId).dataTable({
-           "data": columnData,
-           "columnDefs": columnHeader,
-           'bPaginate': true,
-           'searching': true,
-           'bFilter': true,
-           'bInfo': true,
-           "bSort" : true,
-           "scrollX": true,
-           "iDisplayLength": 10,
-           "dom": "Bfrtip",
-            select: 'single',
-            altEditor: true,     // Enable altEditor
-            buttons: [
+       var availableButtons;
+       if (result.isEditable) {
+            availableButtons = [
                 {
                     text : 'Add',
                     name : 'add' // don not change name
@@ -177,7 +166,25 @@ function inflateData(result){
                     text: 'Delete',
                     name: 'delete'
                 }
-            ]
+            ];
+       } else {
+            availableButtons = [];
+       }
+
+       $(tableId).dataTable({
+           "data": columnData,
+           "columnDefs": columnHeader,
+           'bPaginate': true,
+           'searching': true,
+           'bFilter': true,
+           'bInfo': true,
+           "bSort" : true,
+           "scrollX": true,
+           "iDisplayLength": 10,
+           "dom": "Bfrtip",
+            select: 'single',
+            altEditor: true,     // Enable altEditor
+            buttons: availableButtons
        })
 
        //attach row-updated listener

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

@@ -22,13 +22,16 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.text.TextUtils;
+import android.util.Log;
 
 import com.amitshekhar.model.Response;
 import com.amitshekhar.model.RowDataRequest;
 import com.amitshekhar.model.TableDataResponse;
 import com.amitshekhar.model.UpdateRowResponse;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -43,7 +46,7 @@ private DatabaseHelper() {
 
     public static Response getAllTableName(SQLiteDatabase database) {
         Response response = new Response();
-        Cursor c = database.rawQuery("SELECT name FROM sqlite_master WHERE type='table'", null);
+        Cursor c = database.rawQuery("SELECT name FROM sqlite_master WHERE type='table' OR type='view'", null);
         if (c.moveToFirst()) {
             while (!c.isAfterLast()) {
                 response.rows.add(c.getString(0));
@@ -72,10 +75,27 @@ public static TableDataResponse getTableData(SQLiteDatabase db, String selectQue
             final String pragmaQuery = "PRAGMA table_info(" + tableName + ")";
             tableData.tableInfos = getTableInfo(db, pragmaQuery);
         }
+        Cursor cursor = null;
+        boolean isView = false;
+        try {
+            cursor = db.rawQuery("SELECT type FROM sqlite_master WHERE name=?", new String[]{tableName});
+            if (cursor.moveToFirst()) {
+                isView = "view".equalsIgnoreCase(cursor.getString(0));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        tableData.isEditable = tableName != null && tableData.tableInfos != null && !isView;
 
-        tableData.isEditable = tableName != null && tableData.tableInfos != null;
 
-        Cursor cursor;
+        if (!TextUtils.isEmpty(tableName)) {
+            selectQuery = selectQuery.replace(tableName, "[" + tableName + "]");
+        }
+
         try {
             cursor = db.rawQuery(selectQuery, null);
         } catch (Exception e) {
@@ -345,7 +365,16 @@ public static TableDataResponse exec(SQLiteDatabase database, String sql) {
     }
 
     private static String getTableName(String selectQuery) {
-        // TODO find tableName from query and also handle JOIN query
+        // TODO: 24/4/17 Handle JOIN Query
+        TableNameParser tableNameParser = new TableNameParser(selectQuery);
+        HashSet<String> tableName = (HashSet<String>) tableNameParser.tables();
+
+        for (String table : tableName) {
+            if (!TextUtils.isEmpty(table)) {
+                return table;
+            }
+        }
+
         return null;
     }
 

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

@@ -87,6 +87,7 @@ public static Response getAllPrefTableName(Context context) {
     public static TableDataResponse getAllPrefData(Context context, String tag) {
 
         TableDataResponse response = new TableDataResponse();
+        response.isEditable = true;
         response.isSuccessful = true;
         response.isSelectQuery = true;