@capacitor-community/sqlite 5.0.0-beta.0 → 5.0.0-beta.1

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/ImportExportJson/ImportFromJson.java

@@ -383,14 +383,12 @@ public class ImportFromJson {
             ArrayList<String> tColNames = new ArrayList<>();
             ArrayList<String> tColTypes = new ArrayList<>();
             if (tableNamesTypes.has("names")) {
-                tColNames = _uJson.
-                        JSONArrayToArrayList(tableNamesTypes.getJSONArray("names"));
+                tColNames = _uJson.getColumnNames(tableNamesTypes.get("names"));
             } else {
                 throw new Exception("GetValues: Table " + tableName + " no names");
             }
             if (tableNamesTypes.has("types")) {
-                tColTypes = _uJson.
-                        JSONArrayToArrayList(tableNamesTypes.getJSONArray("types"));
+                tColTypes = _uJson.getColumnNames(tableNamesTypes.get("types"));
             } else {
                 throw new Exception("GetValues: Table " + tableName + " no types");
             }

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/ImportExportJson/UtilsJson.java

@@ -6,6 +6,7 @@ import com.getcapacitor.community.database.sqlite.SQLite.Database;
 import com.getcapacitor.community.database.sqlite.SQLite.UtilsDrop;
 import java.sql.Blob;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -38,13 +39,12 @@ public class UtilsJson {
                 JSObject namesTypes = getTableColumnNamesTypes(db, tableName);
                 ArrayList<String> colNames = new ArrayList<>();
                 if (namesTypes.has("names")) {
-                    colNames =
-                            JSONArrayToArrayList(namesTypes.getJSONArray("names"));
+                  colNames = getColumnNames(namesTypes.get("names"));
                 } else {
-                    throw new Exception("isLastModified: Table " + tableName + " no names");
+                  throw new Exception("isLastModified: Table " + tableName + " no names");
                 }
 
-                if (colNames.contains("last_modified")) {
+                if (colNames.size() > 0  &&  colNames.contains("last_modified")) {
                     ret = true;
                     break;
                 }
@@ -55,6 +55,18 @@ public class UtilsJson {
         }
     }
 
+  /**
+   * Get Column name's list
+   * @param obj
+   * @return
+   */
+    public ArrayList<String> getColumnNames(Object obj) {
+
+      ArrayList<String> colNames = new ArrayList<>();
+      if (obj instanceof ArrayList) colNames = (ArrayList<String>) obj;
+
+      return colNames;
+    }
     /**
      * Check existence of sql_deleted column
      * @param db
@@ -72,8 +84,7 @@ public class UtilsJson {
                 JSObject namesTypes = getTableColumnNamesTypes(db, tableName);
                 ArrayList<String> colNames = new ArrayList<>();
                 if (namesTypes.has("names")) {
-                    colNames =
-                            JSONArrayToArrayList(namesTypes.getJSONArray("names"));
+                  colNames = getColumnNames(namesTypes.get("names"));
                 } else {
                     throw new Exception("isSqlDeleted: Table " + tableName + " no names");
                 }
@@ -487,13 +498,12 @@ public class UtilsJson {
             ArrayList<String> rowTypes = new ArrayList<>();
             ArrayList<String> rowNames = new ArrayList<>();
             if (tableNamesTypes.has("names")) {
-                rowNames =
-                        JSONArrayToArrayList(tableNamesTypes.getJSONArray("names"));
+                rowNames = getColumnNames(tableNamesTypes.get("names"));
             } else {
                 throw new Exception("GetValues: Table " + tableName + " no names");
             }
             if (tableNamesTypes.has("types")) {
-                rowTypes = JSONArrayToArrayList(tableNamesTypes.getJSONArray("types"));
+                rowTypes = getColumnNames(tableNamesTypes.get("types"));
             } else {
                 throw new Exception("GetValues: Table " + tableName + " no types");
             }
@@ -545,11 +555,4 @@ public class UtilsJson {
         }
         return row;
     }
-    public ArrayList<String> JSONArrayToArrayList(JSONArray arr) throws JSONException {
-        ArrayList<String> retArr = new ArrayList<>();
-        for (int i=0; i<arr.length(); i++) {
-            retArr.add(arr.getString(i));
-        }
-        return retArr;
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "5.0.0-beta.0",
+  "version": "5.0.0-beta.1",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",