@capacitor-community/sqlite 4.6.0 → 4.6.1-2

package/README.md

@@ -9,14 +9,14 @@
 </p>
 <br>
 <p align="center">
-  <img src="https://img.shields.io/maintenance/yes/2022?style=flat-square" />
+  <img src="https://img.shields.io/maintenance/yes/2023?style=flat-square" />
   <a href="https://github.com/capacitor-community/sqlite/actions?query=workflow%3A%22CI%22"><img src="https://img.shields.io/github/workflow/status/capacitor-community/sqlite/CI?style=flat-square" /></a>
   <a href="https://www.npmjs.com/package/@capacitor-community/sqlite"><img src="https://img.shields.io/npm/l/@capacitor-community/sqlite?style=flat-square" /></a>
 <br>
   <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-25-orange?style=flat-square" /></a>
+<a href="#contributors-"><img src="https://img.shields.io/badge/all%20contributors-28-orange?style=flat-square" /></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -35,7 +35,7 @@ npx cap sync
 ```
 
 ```
-yarn install --save @capacitor-community/sqlite
+yarn add @capacitor-community/sqlite
 npx cap sync
 ```
 
@@ -92,7 +92,7 @@ See [#301](https://github.com/capacitor-community/sqlite/issues/301) and [SO que
 cd electron
 npm install --save sqlite3
 npm install --save jszip
-npm install --save node-fetch
+npm install --save node-fetch@2.6.7
 npm install --save-dev @types/sqlite3
 ```
 - **Important**: `node-fetch` version must be `<=2.6.7`; otherwise [you'll get an error](https://github.com/capacitor-community/sqlite/issues/349 "you'll get an error ERR_REQUIRE_ESM") running the app. 
@@ -189,6 +189,10 @@ npm install --save-dev @types/sqlite3
 
 - [angular-sqlite-synchronize-app](https://github.com/jepiqueau/angular-sqlite-synchronize-app)
 
+### Ionic/Angular TypeORM app
+
+- [ionic-sqlite-typeorm-app](https://github.com/jepiqueau/ionic-sqlite-typeorm-app)
+
 ### Ionic/React
 
 - [Ionic/React Usage Documentation](https://github.com/capacitor-community/sqlite/blob/master/docs/Ionic-React-Usage.md)
@@ -213,14 +217,14 @@ npm install --save-dev @types/sqlite3
 
 - [vue-vite-sqlite-app](https://github.com/jepiqueau/vuevite-app)
 
-### SolidJS+Vite
-
-- [solidjs-vite-sqlite-app](https://github.com/jepiqueau/capacitor-solid-sqlite)
-
 ### Vue TypeORM app
 
 - [vue-typeorm-app](https://github.com/jepiqueau/vue-typeorm-app)
 
+### SolidJS+Vite
+
+- [solidjs-vite-sqlite-app](https://github.com/jepiqueau/capacitor-solid-sqlite)
+
 
 ## Dependencies
 
@@ -262,7 +266,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <a href="https://github.com/aeinn" title="aeinn"><img src="https://github.com/aeinn.png?size=100" width="50" height="50" /></a>
   <a href="https://github.com/jonz94" title="jonz94"><img src="https://github.com/jonz94.png?size=100" width="50" height="50" /></a>
   <a href="https://github.com/oscarfonts" title="oscarfonts"><img src="https://github.com/oscarfonts.png?size=100" width="50" height="50" /></a>
-</p>
+  <a href="https://github.com/Sirs0ri" title="Sirs0ri"><img src="https://github.com/Sirs0ri.png?size=100" width="50" height="50" /></a></p>
+  <a href="https://github.com/TheNovemberRain" title="TheNovemberRain"><img src="https://github.com/TheNovemberRain.png?size=100" width="50" height="50" /></a></p>
+  <a href="https://github.com/fizdalf" title="fizdalf"><img src="https://github.com/fizdalf.png?size=100" width="50" height="50" /></a></p>
+
 
 <!-- markdownlint-enable -->
 <!-- prettier-ignore-end -->

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

@@ -1019,27 +1019,28 @@ public class CapacitorSQLite {
     public Dictionary<Integer, JSONObject> addUpgradeStatement(JSArray upgrade) throws Exception {
         Dictionary<Integer, JSONObject> upgDict = new Hashtable<>();
 
-        JSONObject upgObj = null;
-        try {
-            upgObj = (JSONObject) upgrade.get(0);
-        } catch (Exception e) {
-            String msg = "Must provide an upgrade statement " + e.getMessage();
-            throw new Exception(msg);
-        }
-
-        if (upgObj == null || !upgObj.has("toVersion") || !upgObj.has("statements")) {
-            String msg = "Must provide an upgrade statement";
-            msg += " {toVersion,statement}";
-            throw new Exception(msg);
-        }
-        try {
-            int toVersion = upgObj.getInt("toVersion");
-            upgDict.put(toVersion, upgObj);
-            return upgDict;
-        } catch (Exception e) {
-            String msg = "Must provide toVersion as Integer" + e.getMessage();
-            throw new Exception(msg);
+        for (int i = 0; i < upgrade.length(); i++) {
+            JSONObject upgObj = null;
+            try {
+                upgObj = (JSONObject) upgrade.get(i);
+                if (upgObj == null || !upgObj.has("toVersion") || !upgObj.has("statements")) {
+                    String msg = "Must provide an upgrade statement";
+                    msg += " {toVersion,statement}";
+                    throw new Exception(msg);
+                }
+            } catch (Exception e) {
+                String msg = "Must provide an upgrade statement " + e.getMessage();
+                throw new Exception(msg);
+            }
+            try {
+                int toVersion = upgObj.getInt("toVersion");
+                upgDict.put(toVersion, upgObj);
+            } catch (Exception e) {
+                String msg = "Must provide toVersion as Integer" + e.getMessage();
+                throw new Exception(msg);
+            }
         }
+        return upgDict;
     }
 
     public Boolean isJsonValid(String parsingData) throws Exception {

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

@@ -171,7 +171,7 @@ public class Database {
             if (!isNCDB() && !this._readOnly) {
                 _db = SQLiteDatabase.openOrCreateDatabase(_file, password, null);
             } else {
-                _db = SQLiteDatabase.openDatabase(String.valueOf(_file), "", null, SQLiteDatabase.OPEN_READONLY);
+                _db = SQLiteDatabase.openDatabase(String.valueOf(_file), password, null, SQLiteDatabase.OPEN_READONLY);
             }
             if (_db != null) {
                 if (_db.isOpen()) {

package/electron/dist/plugin.js

@@ -3012,17 +3012,40 @@ class UtilsFile {
      * @param filePath
      */
     async deleteFilePath(filePath) {
+        let unlinkRetries = 50000;
+        /**
+         * On windows, the file lock behaves unpredictable. Often it claims a databsae file is locked / busy, although
+         * the file stream is already closed.
+         * Even though we already checked the status with the `waitForFilePathLock()` method previously.
+         *
+         * The only way to handle this reliably is to retry deletion until it works.
+         */
+        const deleteFile = async () => {
+            try {
+                await promises_1.unlink(filePath);
+            }
+            catch (err) {
+                unlinkRetries--;
+                if (unlinkRetries > 0) {
+                    await deleteFile();
+                }
+                else {
+                    throw err;
+                }
+            }
+        };
         if (filePath.length !== 0) {
             // check if path exists
             const isPath = this.isPathExists(filePath);
             if (isPath) {
                 try {
                     await this.waitForFilePathLock(filePath);
-                    this.NodeFs.unlinkSync(filePath);
+                    // actually delete the file
+                    await deleteFile();
                     return Promise.resolve();
                 }
                 catch (err) {
-                    return Promise.reject('DeleteFilePath: ' + `${err}`);
+                    return Promise.reject(`DeleteFilePath: ${err}`);
                 }
             }
             else {
@@ -3259,6 +3282,7 @@ class UtilsUpgrade {
     async onUpgrade(mDB, vUpgDict, curVersion, targetVersion) {
         let changes;
         const sortedKeys = new Int32Array(Object.keys(vUpgDict).map(item => parseInt(item))).sort();
+        console.log(`@@@ sortedKeys: ${sortedKeys}`);
         for (const versionKey of sortedKeys) {
             if (versionKey > curVersion && versionKey <= targetVersion) {
                 const statements = vUpgDict[versionKey].statements;
@@ -3276,6 +3300,7 @@ class UtilsUpgrade {
                     changes = (await this.sqliteUtil.dbChanges(mDB)) - initChanges;
                 }
                 catch (err) {
+                    console.log(`@@@@ onUpgrade: ${err}`);
                     return Promise.reject(`onUpgrade: ${err}`);
                 }
             }
@@ -3291,6 +3316,7 @@ class UtilsUpgrade {
         try {
             await this.sqliteUtil.beginTransaction(mDB, true);
             for (const statement of statements) {
+                console.log(`@@@ statement: ${statement}`);
                 await this.sqliteUtil.execute(mDB, statement, false);
             }
             await this.sqliteUtil.commitTransaction(mDB, true);
@@ -3298,6 +3324,7 @@ class UtilsUpgrade {
         }
         catch (err) {
             await this.sqliteUtil.rollbackTransaction(mDB, true);
+            console.log(`@@@ ExecuteStatementProcess: ${err}`);
             return Promise.reject(`ExecuteStatementProcess: ${err}`);
         }
     }
@@ -3381,6 +3408,8 @@ class Database {
             this._isDbOpen = true;
             if (!this.readonly) {
                 const curVersion = await this.sqliteUtil.getVersion(this.database);
+                console.log(`@@@@ this.readonly: ${this.readonly}`);
+                console.log(`@@@@ this.version: ${this.version} curVersion: ${curVersion}`);
                 if (this.version > curVersion &&
                     Object.keys(this.upgradeVersionDict).length > 0) {
                     try {
@@ -4325,23 +4354,25 @@ class CapacitorSQLite {
     async addUpgradeStatement(options) {
         const dbName = this.getOptionValue(options, 'database');
         const upgrades = this.getOptionValue(options, 'upgrade');
-        const firstUpgrade = upgrades[0];
-        const versionUpgradeKeys = Object.keys(firstUpgrade);
-        if (!versionUpgradeKeys.includes('toVersion') ||
-            !versionUpgradeKeys.includes('statements')) {
-            throw new Error('Must provide an upgrade capSQLiteVersionUpgrade Object');
-        }
-        if (typeof firstUpgrade.toVersion != 'number') {
-            throw new Error('upgrade.toVersion must be a number');
-        }
-        if (this.versionUpgrades[dbName]) {
-            this.versionUpgrades[dbName][firstUpgrade.toVersion] = firstUpgrade;
-        }
-        else {
-            const upgradeVersionDict = {};
-            upgradeVersionDict[firstUpgrade.toVersion] = firstUpgrade;
-            this.versionUpgrades[dbName] = upgradeVersionDict;
+        for (const upgrade of upgrades) {
+            const versionUpgradeKeys = Object.keys(upgrade);
+            if (!versionUpgradeKeys.includes('toVersion') ||
+                !versionUpgradeKeys.includes('statements')) {
+                throw new Error('Must provide an upgrade capSQLiteVersionUpgrade Object');
+            }
+            if (typeof upgrade.toVersion != 'number') {
+                throw new Error('upgrade.toVersion must be a number');
+            }
+            if (this.versionUpgrades[dbName]) {
+                this.versionUpgrades[dbName][upgrade.toVersion] = upgrade;
+            }
+            else {
+                const upgradeVersionDict = {};
+                upgradeVersionDict[upgrade.toVersion] = upgrade;
+                this.versionUpgrades[dbName] = upgradeVersionDict;
+            }
         }
+        console.log(`this.versionUpgrades: ${JSON.stringify(this.versionUpgrades)}`);
         return;
     }
     async copyFromAssets(options) {