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

package/README.md

@@ -1,8 +1,8 @@
 <p align="center"><br><img src="https://user-images.githubusercontent.com/236501/85893648-1c92e880-b7a8-11ea-926d-95355b8175c7.png" width="128" height="128" /></p>
 <h3 align="center">SQLITE DATABASE</h3>
-<p align="center"><strong><code>@capacitor-community/sqlite</code></strong></p>
+<p align="center"><strong><code>@capacitor-community/sqlite@next</code></strong></p>
 <br>
-<p align="center" style="font-size:50px;color:red"><strong>CAPACITOR 4</strong></p><br>
+<p align="center" style="font-size:50px;color:red"><strong>CAPACITOR 5</strong></p><br>
 
 <p align="center">
   Capacitor community plugin for Native and Electron SQLite Databases. In Native databases could be encrypted with SQLCipher
@@ -30,17 +30,17 @@
 To install:
 
 ```
-npm install --save @capacitor-community/sqlite
+npm install --save @capacitor-community/sqlite@next
 npx cap sync
 ```
 
 ```
-yarn add @capacitor-community/sqlite
+yarn add @capacitor-community/sqlite@next
 npx cap sync
 ```
 
 ```
-pnpm install --save @capacitor-community/sqlite
+pnpm install --save @capacitor-community/sqlite@next
 pnpm install --save @jeep-sqlite
 pnpm install --save sql.js
 npx cap sync

package/android/build.gradle

@@ -11,20 +11,21 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
+    namespace "com.getcapacitor.community.database.sqlite"
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     packagingOptions {
         exclude 'build-data.properties'
     }
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -50,20 +51,27 @@ repositories {
     mavenCentral()
 }
 
+gradle.projectsEvaluated {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:deprecation"
+        options.compilerArgs << "-Xlint:unchecked"
+    }
+}
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
-    implementation 'androidx.room:room-runtime:2.5.0'
+    implementation 'androidx.room:room-runtime:2.5.1'
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
     implementation 'net.zetetic:android-database-sqlcipher:4.5.3'
-    implementation "androidx.sqlite:sqlite:2.3.0"
+    implementation "androidx.sqlite:sqlite:2.3.1"
     //security library
     implementation "androidx.security:security-crypto:1.1.0-alpha05"
     implementation "androidx.biometric:biometric:1.1.0"
-    annotationProcessor 'androidx.room:room-compiler:2.5.0'
+    annotationProcessor 'androidx.room:room-compiler:2.5.1'
 }
+

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.getcapacitor.community.database.sqlite">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

package/android/src/main/java/com/getcapacitor/community/database/sqlite/CapacitorSQLitePlugin.java

@@ -555,6 +555,11 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         JSArray openModes = call.getArray("openModes");
+        if (dbNames == null || openModes == null) {
+            String msg = "CheckConnectionsConsistency: No dbNames or openModes given";
+            rHandler.retResult(call, null, msg);
+            return;
+        }
         if (implementation != null) {
             try {
                 Boolean res = implementation.checkConnectionsConsistency(dbNames, openModes);
@@ -784,10 +789,15 @@ public class CapacitorSQLitePlugin extends Plugin {
             folderPath = call.getString("folderPath");
         }
         if (!call.getData().has("dbNameList")) {
-            dbList = new JSArray();
+            dbList = null;
         } else {
             dbList = call.getArray("dbNameList");
         }
+        if (dbList == null) {
+            String msg = "AddSQLiteSuffix: dbNameList not given or empty";
+            rHandler.retResult(call, null, msg);
+            return;
+        }
         if (implementation != null) {
             try {
                 implementation.addSQLiteSuffix(folderPath, dbList);
@@ -818,10 +828,15 @@ public class CapacitorSQLitePlugin extends Plugin {
             folderPath = call.getString("folderPath");
         }
         if (!call.getData().has("dbNameList")) {
-            dbList = new JSArray();
+            dbList = null;
         } else {
             dbList = call.getArray("dbNameList");
         }
+        if (dbList == null) {
+            String msg = "deleteOldDatabases: dbNameList not given or empty";
+            rHandler.retResult(call, null, msg);
+            return;
+        }
         if (implementation != null) {
             try {
                 implementation.deleteOldDatabases(folderPath, dbList);
@@ -852,10 +867,15 @@ public class CapacitorSQLitePlugin extends Plugin {
             folderPath = call.getString("folderPath");
         }
         if (!call.getData().has("dbNameList")) {
-            dbList = new JSArray();
+            dbList = null;
         } else {
             dbList = call.getArray("dbNameList");
         }
+        if (dbList == null) {
+            String msg = "moveDatabasesAndAddSuffix: dbNameList not given or empty";
+            rHandler.retResult(call, null, msg);
+            return;
+        }
         if (implementation != null) {
             try {
                 implementation.moveDatabasesAndAddSuffix(folderPath, dbList);
@@ -936,6 +956,11 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         JSArray set = call.getArray("set");
+        if (set == null) {
+            String msg = "ExecuteSet: Must provide a set of SQL statements";
+            rHandler.retChanges(call, retRes, msg);
+            return;
+        }
         if (set.length() == 0) {
             String msg = "ExecuteSet: Must provide a non-empty set of SQL statements";
             rHandler.retChanges(call, retRes, msg);
@@ -999,7 +1024,11 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         JSArray values = call.getArray("values");
-
+        if (values == null) {
+            String msg = "Run: Must provide an Array of values";
+            rHandler.retChanges(call, retRes, msg);
+            return;
+        }
         Boolean transaction = call.getBoolean("transaction", true);
         Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
@@ -1044,6 +1073,11 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         JSArray values = call.getArray("values");
+        if (values == null) {
+            String msg = "Query: Must provide an Array of values";
+            rHandler.retValues(call, new JSArray(), msg);
+            return;
+        }
         Boolean readOnly = call.getBoolean("readonly", false);
         if (implementation != null) {
             try {
@@ -1263,7 +1297,7 @@ public class CapacitorSQLitePlugin extends Plugin {
         if (!call.getData().has("database")) {
             String msg = "GetSyncDate : Must provide a database name";
             retRes.put("changes", Integer.valueOf(-1));
-            rHandler.retSyncDate(call, new Long(0), msg);
+            rHandler.retSyncDate(call, Long.valueOf(0), msg);
             return;
         }
         String dbName = call.getString("database");
@@ -1275,11 +1309,11 @@ public class CapacitorSQLitePlugin extends Plugin {
                 return;
             } catch (Exception e) {
                 String msg = "GetSyncDate: " + e.getMessage();
-                rHandler.retSyncDate(call, new Long(0), msg);
+                rHandler.retSyncDate(call, Long.valueOf(0), msg);
                 return;
             }
         } else {
-            rHandler.retSyncDate(call, new Long(0), loadMessage);
+            rHandler.retSyncDate(call, Long.valueOf(0), loadMessage);
             return;
         }
     }
@@ -1304,6 +1338,11 @@ public class CapacitorSQLitePlugin extends Plugin {
             return;
         }
         JSArray upgrade = call.getArray("upgrade");
+        if (upgrade == null) {
+            String msg = "AddUpgradeStatement: Must provide an array with upgrade statement";
+            rHandler.retResult(call, null, msg);
+            return;
+        }
 
         if (implementation != null) {
             try {

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

@@ -380,8 +380,20 @@ public class ImportFromJson {
             if (tableNamesTypes.length() == 0) {
                 throw new Exception("CreateTableData: no column names & types returned");
             }
-            ArrayList<String> tColNames = (ArrayList<String>) tableNamesTypes.get("names");
-            ArrayList<String> tColTypes = (ArrayList<String>) tableNamesTypes.get("types");
+            ArrayList<String> tColNames = new ArrayList<>();
+            ArrayList<String> tColTypes = new ArrayList<>();
+            if (tableNamesTypes.has("names")) {
+                tColNames = _uJson.
+                        JSONArrayToArrayList(tableNamesTypes.getJSONArray("names"));
+            } else {
+                throw new Exception("GetValues: Table " + tableName + " no names");
+            }
+            if (tableNamesTypes.has("types")) {
+                tColTypes = _uJson.
+                        JSONArrayToArrayList(tableNamesTypes.getJSONArray("types"));
+            } else {
+                throw new Exception("GetValues: Table " + tableName + " no types");
+            }
 
             // Loop on Table's Values
             for (int j = 0; j < values.size(); j++) {

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

@@ -8,6 +8,8 @@ import java.sql.Blob;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -34,7 +36,14 @@ public class UtilsJson {
             List<String> tables = _uDrop.getTablesNames(db);
             for (String tableName : tables) {
                 JSObject namesTypes = getTableColumnNamesTypes(db, tableName);
-                ArrayList<String> colNames = (ArrayList<String>) namesTypes.get("names");
+                ArrayList<String> colNames = new ArrayList<>();
+                if (namesTypes.has("names")) {
+                    colNames =
+                            JSONArrayToArrayList(namesTypes.getJSONArray("names"));
+                } else {
+                    throw new Exception("isLastModified: Table " + tableName + " no names");
+                }
+
                 if (colNames.contains("last_modified")) {
                     ret = true;
                     break;
@@ -61,7 +70,13 @@ public class UtilsJson {
             List<String> tables = _uDrop.getTablesNames(db);
             for (String tableName : tables) {
                 JSObject namesTypes = getTableColumnNamesTypes(db, tableName);
-                ArrayList<String> colNames = (ArrayList<String>) namesTypes.get("names");
+                ArrayList<String> colNames = new ArrayList<>();
+                if (namesTypes.has("names")) {
+                    colNames =
+                            JSONArrayToArrayList(namesTypes.getJSONArray("names"));
+                } else {
+                    throw new Exception("isSqlDeleted: Table " + tableName + " no names");
+                }
                 if (colNames.contains("sql_deleted")) {
                     ret = true;
                     break;
@@ -469,15 +484,16 @@ public class UtilsJson {
         ArrayList<ArrayList<Object>> values = new ArrayList<>();
         try {
             JSObject tableNamesTypes = getTableColumnNamesTypes(mDb, tableName);
-            ArrayList<String> rowNames = new ArrayList<>();
             ArrayList<String> rowTypes = new ArrayList<>();
+            ArrayList<String> rowNames = new ArrayList<>();
             if (tableNamesTypes.has("names")) {
-                rowNames = (ArrayList<String>) tableNamesTypes.get("names");
+                rowNames =
+                        JSONArrayToArrayList(tableNamesTypes.getJSONArray("names"));
             } else {
                 throw new Exception("GetValues: Table " + tableName + " no names");
             }
             if (tableNamesTypes.has("types")) {
-                rowTypes = (ArrayList<String>) tableNamesTypes.get("types");
+                rowTypes = JSONArrayToArrayList(tableNamesTypes.getJSONArray("types"));
             } else {
                 throw new Exception("GetValues: Table " + tableName + " no types");
             }
@@ -529,4 +545,11 @@ 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/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsSQLite.java

@@ -84,15 +84,18 @@ public class UtilsSQLite {
     }
 
     private String[] dealWithTriggers(String[] sqlCmdArray) {
-        List listArray = Arrays.asList(sqlCmdArray);
+        List<String> listArray = Arrays.asList(sqlCmdArray);
         listArray = trimArray(listArray);
         listArray = concatRemoveEnd(listArray);
-        String[] retArray = (String[]) listArray.toArray(new String[0]);
+        Object[] objectList = listArray.toArray();
+        String[] retArray = Arrays.copyOf(objectList, objectList.length, String[].class);
+
+//        String[] retArray =  listArray.toArray(new String[listArray.size()]);
         return retArray;
     }
 
-    private List concatRemoveEnd(List listArray) {
-        List lArray = new ArrayList(listArray);
+    private List<String> concatRemoveEnd(List<String> listArray) {
+        List<String> lArray = new ArrayList<String>(listArray);
         if (lArray.contains("END")) {
             int idx = lArray.indexOf("END");
             lArray.set(idx - 1, lArray.get(idx - 1) + "; END");
@@ -103,11 +106,12 @@ public class UtilsSQLite {
         }
     }
 
-    private List trimArray(List listArray) {
-        for (int i = 0; i < listArray.size(); i++) {
-            listArray.set(i, listArray.get(i).toString().trim());
+    private List<String> trimArray(List<String> listArray) {
+        List<String> trimmedStrings = new ArrayList<String>();
+        for(String s : listArray) {
+            trimmedStrings.add(s.trim());
         }
-        return listArray;
+        return trimmedStrings;
     }
 
     public ArrayList<Object> objectJSArrayToArrayList(JSArray jsArray) throws JSONException {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "4.6.3",
+  "version": "5.0.0-beta.0",
   "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": "^4.6.3",
-    "@capacitor/cli": "^4.6.3",
-    "@capacitor/core": "^4.6.3",
+    "@capacitor/android": "^5.0.0-beta.1",
+    "@capacitor/cli": "^5.0.0-beta.1",
+    "@capacitor/core": "^5.0.0-beta.1",
     "@capacitor/docgen": "^0.0.17",
-    "@capacitor/ios": "^4.6.3",
+    "@capacitor/ios": "^5.0.0-beta.1",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -76,7 +76,7 @@
     "typescript": "~4.1.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.0.0"
+    "@capacitor/core": "^5.0.0-beta.1"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",

package/src/web.ts

@@ -78,7 +78,7 @@ export class CapacitorSQLiteWeb
         this.notifyListeners('sqliteSaveDatabaseToDiskEvent', event.detail);
       },
     );
-    
+
     if (!this.isWebStoreOpen) {
       this.isWebStoreOpen = await this.jeepSqliteElement.isStoreOpen();
     }