@capacitor-community/sqlite 4.1.0-8 → 4.1.1

package/electron/rollup.config.js

@@ -20,6 +20,7 @@ export default {
     'fs',
     'os',
     'jszip',
+    'node-fetch',
   ],
   plugins: [
     nodeResolve(),

package/ios/Plugin/CapacitorSQLite.swift

@@ -482,30 +482,38 @@ enum CapacitorSQLiteError: Error {
 
     // MARK: - CheckConnectionsConsistency
 
-    @objc public func checkConnectionsConsistency(_ dbNames: [String]) throws ->  NSNumber {
+    @objc public func checkConnectionsConsistency(_ dbNames: [String],
+                                                  openModes: [String])
+    throws ->  NSNumber {
         if isInit {
             var keys: [String] = Array(self.dbDict.keys)
+            var idx: Int = 0
+            var conns: [String] = []
+            for name in dbNames {
+                conns.append("\(openModes[idx])_\(name)")
+                idx += 1
+            }
             do {
-                if dbNames.count == 0 {
+                if conns.count == 0 {
                     try closeAllConnections()
                     return 0
                 }
-                if keys.count < dbNames.count {
+                if keys.count < conns.count {
                     // not solvable inconsistency
                     try closeAllConnections()
                     return 0
                 }
-                if keys.count > dbNames.count {
+                if keys.count > conns.count {
                     for key in keys {
-                        if !dbNames.contains(key) {
+                        if !conns.contains(key) {
                             self.dbDict.removeValue(forKey: key)
                         }
                     }
                 }
                 keys = Array(self.dbDict.keys)
-                if keys.count == dbNames.count {
+                if keys.count == conns.count {
                     let set1 = Set(keys)
-                    let set2 = Set(dbNames)
+                    let set2 = Set(conns)
                     let arr = Array(set1.symmetricDifference(set2))
                     if arr.count == 0 {
                         return 1
@@ -794,7 +802,7 @@ enum CapacitorSQLiteError: Error {
 
     // MARK: - isDBOpen
 
-   @objc func isDBOpen(_ dbName: String, readonly: Bool) throws -> NSNumber {
+    @objc func isDBOpen(_ dbName: String, readonly: Bool) throws -> NSNumber {
         if isInit {
             let mDbName = CapacitorSQLite.getDatabaseName(dbName: dbName)
             let connName: String = readonly ? "RO_\(mDbName)" : "RW_\(mDbName)"

package/ios/Plugin/CapacitorSQLitePlugin.m

@@ -44,4 +44,5 @@ CAP_PLUGIN(CapacitorSQLitePlugin, "CapacitorSQLite",
            CAP_PLUGIN_METHOD(setEncryptionSecret, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(changeEncryptionSecret, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(clearEncryptionSecret, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(getFromHTTPRequest, CAPPluginReturnPromise);
 )

package/ios/Plugin/CapacitorSQLitePlugin.swift

@@ -346,8 +346,17 @@ public class CapacitorSQLitePlugin: CAPPlugin {
                     "Connection Array")
             return
         }
+        guard let openModes = call.options["openModes"] as? [String] else {
+            retHandler.rResult(
+                call: call,
+                message: "CheckConnectionsConsistency: Must provide a " +
+                    "OpenModes Array")
+            return
+        }
         do {
-            let res = try implementation?.checkConnectionsConsistency(dbNames)
+            let res = try implementation?
+                .checkConnectionsConsistency(dbNames,
+                                             openModes: openModes)
             var bRes: Bool = false
             if res == 1 {
                 bRes = true
@@ -1149,7 +1158,16 @@ public class CapacitorSQLitePlugin: CAPPlugin {
             if let upgVersionDict: [Int: [String: Any]] = try
                 implementation?.addUpgradeStatement(dbName,
                                                     upgrade: upgrade) {
-                versionUpgrades = ["\(dbName)": upgVersionDict]
+                if (
+                    versionUpgrades[dbName] != nil
+                ){
+                    for (versionKey, upgObj) in upgVersionDict {
+                        versionUpgrades[dbName]![versionKey] = upgObj
+                    }
+                } else {
+                    versionUpgrades = ["\(dbName)": upgVersionDict]
+                }
+
                 retHandler.rResult(call: call)
                 return
             } else {
@@ -1305,6 +1323,13 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
 
     }
+    
+    // MARK: - GetFromHTTPRequest
+
+    @objc func getFromHTTPRequest(_ call: CAPPluginCall) {
+        call.unimplemented("Not implemented on iOS.")
+    }
+
 
     // MARK: - Add Observers
 

package/ios/Plugin/Utils/UtilsUpgrade.swift

@@ -22,10 +22,12 @@ class UtilsUpgrade {
                    currentVersion: Int,
                    targetVersion: Int,
                    databaseLocation: String) throws {
-        print("UtilsUpgrade.onUpgrade: \(currentVersion) => \(targetVersion)")
+        print("UtilsUpgrade.onUpgrade: from \(currentVersion) to \(targetVersion)")
 
         for (versionKey, upgrade) in Array(upgDict).sorted(by: {$0.0 < $1.0}) {
             if versionKey > currentVersion && versionKey <= targetVersion {
+                print("- UtilsUpgrade.onUpgrade toVersion: \(versionKey)")
+                
                 guard let statements = upgrade["statements"] as? [String] else {
                     let msg: String = "Error: onUpgrade statements not given"
                     throw UtilsUpgradeError.onUpgradeFailed(message: msg)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "4.1.0-8",
+  "version": "4.1.1",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -93,6 +93,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^1.5.8"
+    "jeep-sqlite": "^1.6.5"
   }
 }