@capacitor-community/sqlite 4.6.1-1 → 4.6.1-2

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/electron/dist/plugin.js

@@ -3282,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;
@@ -3299,6 +3300,7 @@ class UtilsUpgrade {
                     changes = (await this.sqliteUtil.dbChanges(mDB)) - initChanges;
                 }
                 catch (err) {
+                    console.log(`@@@@ onUpgrade: ${err}`);
                     return Promise.reject(`onUpgrade: ${err}`);
                 }
             }
@@ -3314,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);
@@ -3321,6 +3324,7 @@ class UtilsUpgrade {
         }
         catch (err) {
             await this.sqliteUtil.rollbackTransaction(mDB, true);
+            console.log(`@@@ ExecuteStatementProcess: ${err}`);
             return Promise.reject(`ExecuteStatementProcess: ${err}`);
         }
     }
@@ -3404,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 {
@@ -4348,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) {