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

package/README.md

@@ -16,7 +16,7 @@
   <a href="https://www.npmjs.com/package/@capacitor-community/sqlite"><img src="https://img.shields.io/npm/dw/@capacitor-community/sqlite?style=flat-square" /></a>
   <a href="https://www.npmjs.com/package/@capacitor-community/sqlite"><img src="https://img.shields.io/npm/v/@capacitor-community/sqlite?style=flat-square" /></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img src="https://img.shields.io/badge/all%20contributors-32-orange?style=flat-square" /></a>
+<a href="#contributors-"><img src="https://img.shields.io/badge/all%20contributors-33-orange?style=flat-square" /></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -251,6 +251,7 @@ npm install --save-dev @types/sqlite3
 
 - [Biometric Authentication](https://github.com/capacitor-community/sqlite/blob/master/docs/Biometric-Authentication.md)
 
+- [Enable SQLite Schema Error Syntax Highlighting](https://github.com/capacitor-community/sqlite/blob/master/docs/SyntaxScanner-For-SQLite-Code.md)
 
 ## Applications demonstrating the use of the plugin and related documentation
 
@@ -349,6 +350,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <a href="https://github.com/eppineda" title="eppineda"><img src="https://github.com/eppineda.png?size=100" width="50" height="50" /></a>
   <a href="https://github.com/patdx" title="patdx"><img src="https://github.com/patdx.png?size=100" width="50" height="50" /></a>
   <a href="https://github.com/folsze" title="folsze"><img src="https://github.com/folsze.png?size=100" width="50" height="50" /></a>
+  <a href="https://github.com/pranav-singhal" title="pranav-singhal"><img src="https://github.com/pranav-singhal.png?size=100" width="50" height="50" /></a>
 </p>
 
 

package/android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:8.0.0'
     }
 }
 
@@ -40,8 +40,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
@@ -70,7 +70,7 @@ dependencies {
     implementation 'net.zetetic:android-database-sqlcipher:4.5.3'
     implementation "androidx.sqlite:sqlite:2.3.1"
     //security library
-    implementation "androidx.security:security-crypto:1.1.0-alpha05"
+    implementation "androidx.security:security-crypto:1.1.0-alpha06"
     implementation "androidx.biometric:biometric:1.1.0"
     annotationProcessor 'androidx.room:room-compiler:2.5.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");
             }
@@ -559,14 +557,17 @@ public class ImportFromJson {
                 if (row.get(idxDelete).equals(1)) {
                     // Delete
                     isUpdate = false;
-                    stmt =
+                    Object key = tColNames.get(0);
+                    StringBuilder sbQuery =
                         new StringBuilder("DELETE FROM ")
                             .append(tableName)
                             .append(" WHERE ")
                             .append(tColNames.get(0))
-                            .append(" = ")
-                            .append(row.get(0))
-                            .toString();
+                            .append(" = ");
+                    
+                    if (key instanceof Integer) sbQuery.append(row.get(0)).append(";");
+                    if (key instanceof String) sbQuery.append("'").append(row.get(0)).append("';");
+                    stmt = sbQuery.toString();
                 }
             }
             if (isUpdate) {

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.2",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -56,11 +56,11 @@
     "prepublishOnly": "npm run build && npm run build-electron && npm run docgen"
   },
   "devDependencies": {
-    "@capacitor/android": "^5.0.0-beta.1",
-    "@capacitor/cli": "^5.0.0-beta.1",
-    "@capacitor/core": "^5.0.0-beta.1",
+    "@capacitor/android": "^5.0.0",
+    "@capacitor/cli": "^5.0.0",
+    "@capacitor/core": "^5.0.0",
     "@capacitor/docgen": "^0.0.17",
-    "@capacitor/ios": "^5.0.0-beta.1",
+    "@capacitor/ios": "^5.0.0",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -95,6 +95,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^2.3.1"
+    "jeep-sqlite": "^2.3.3"
   }
 }