@capacitor-community/sqlite 5.0.5-1 → 5.0.5

package/ios/Plugin/CapacitorSQLite.swift

@@ -735,7 +735,7 @@ enum CapacitorSQLiteError: Error {
     // MARK: - ExecuteSet
 
     @objc func executeSet(_ dbName: String, set: [[String: Any]],
-                          transaction: Bool, readonly: Bool)
+                          transaction: Bool, readonly: Bool, returnMode: String)
     throws -> [String: Any] {
         if isInit {
             let mDbName = CapacitorSQLite.getDatabaseName(dbName: dbName)
@@ -750,7 +750,8 @@ enum CapacitorSQLiteError: Error {
             }
             if !mDb.isNCDB() && mDb.isDBOpen() {
                 do {
-                    let res = try mDb.execSet(set: set, transaction: transaction)
+                    let res = try mDb.execSet(set: set, transaction: transaction,
+                                              returnMode: returnMode)
                     return res
                 } catch DatabaseError.execSet(let message) {
                     throw CapacitorSQLiteError.failed(message: message)
@@ -771,8 +772,9 @@ enum CapacitorSQLiteError: Error {
 
     // swiftlint:disable function_body_length
     // swiftlint:disable cyclomatic_complexity
+    // swiftlint:disable function_parameter_count
     @objc func run(_ dbName: String, statement: String, values: [Any],
-                   transaction: Bool, readonly: Bool)
+                   transaction: Bool, readonly: Bool, returnMode: String)
     throws -> [String: Any] {
         if isInit {
             let mDbName = CapacitorSQLite.getDatabaseName(dbName: dbName)
@@ -834,7 +836,8 @@ enum CapacitorSQLiteError: Error {
                         }
                     }
                     let res = try mDb.runSQL(sql: statement, values: val,
-                                             transaction: transaction)
+                                             transaction: transaction,
+                                             returnMode: returnMode)
                     return res
                 } catch DatabaseError.runSQL(let message) {
                     throw CapacitorSQLiteError.failed(message: message)
@@ -850,6 +853,7 @@ enum CapacitorSQLiteError: Error {
             throw CapacitorSQLiteError.failed(message: initMessage)
         }
     }
+    // swiftlint:enable function_parameter_count
     // swiftlint:enable cyclomatic_complexity
     // swiftlint:enable function_body_length
 

package/ios/Plugin/CapacitorSQLitePlugin.swift

@@ -767,10 +767,12 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
         let transaction: Bool = call.getBool("transaction") ?? true
         let readOnly: Bool = call.getBool("readonly") ?? false
+        let returnMode: String = call.getString("returnMode") ?? "no"
         do {
             if let res = try implementation?.executeSet(dbName, set: set,
                                                         transaction: transaction,
-                                                        readonly: readOnly) {
+                                                        readonly: readOnly,
+                                                        returnMode: returnMode) {
                 retHandler.rChanges(call: call, ret: res)
                 return
             } else {
@@ -823,13 +825,15 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
         let transaction: Bool = call.getBool("transaction") ?? true
         let readOnly: Bool = call.getBool("readonly") ?? false
+        let returnMode: String = call.getString("returnMode") ?? "no"
         do {
             if let res = try
                 implementation?.run(dbName,
                                     statement: statement,
                                     values: values,
                                     transaction: transaction,
-                                    readonly: readOnly) {
+                                    readonly: readOnly,
+                                    returnMode: returnMode) {
                 retHandler.rChanges(call: call, ret: res)
                 return
             } else {
@@ -1414,7 +1418,6 @@ public class CapacitorSQLitePlugin: CAPPlugin {
             return
         }
         DispatchQueue.global(qos: .background).async {
-
             do {
                 try self.implementation?.getFromHTTPRequest(call, url: url)
                 DispatchQueue.main.async {

package/ios/Plugin/Database.swift

@@ -297,13 +297,17 @@ class Database {
 
     // MARK: - ExecSet
 
-    func execSet(set: [[String: Any]], transaction: Bool = true) throws -> [String: Int64] {
+    // swiftlint:disable function_body_length
+    func execSet(set: [[String: Any]], transaction: Bool = true,
+                 returnMode: String = "no") throws -> [String: Any] {
         var msg: String = "Failed in execSet : "
         let initChanges = UtilsSQLCipher.dbChanges(mDB: mDb)
         var changes: Int = -1
         var lastId: Int64 = -1
-        var changesDict: [String: Int64] = ["lastId": lastId,
-                                            "changes": Int64(changes)]
+        var response: [[String: Any]] = []
+        var changesDict: [String: Any] = ["lastId": lastId,
+                                          "changes": changes,
+                                          "values": [[:]]]
 
         // Start a transaction
         if transaction {
@@ -316,12 +320,15 @@ class Database {
         }
         // Execute the query
         do {
-            lastId = try UtilsSQLCipher
-                .executeSet(mDB: self, set: set)
+            let resp = try UtilsSQLCipher
+                .executeSet(mDB: self, set: set, returnMode: returnMode)
+            lastId = resp.0
+            response = resp.1
             changes = UtilsSQLCipher
                 .dbChanges(mDB: mDb) - initChanges
-            changesDict["changes"] = Int64(changes)
+            changesDict["changes"] = changes
             changesDict["lastId"] = lastId
+            changesDict["values"] = response
 
         } catch UtilsSQLCipherError
                     .executeSet(let message) {
@@ -352,12 +359,13 @@ class Database {
 
     // MARK: - RunSQL
 
-    func runSQL(sql: String, values: [Any], transaction: Bool = true) throws -> [String: Int64] {
+    func runSQL(sql: String, values: [Any], transaction: Bool = true,
+                returnMode: String = "no") throws -> [String: Any] {
         var msg: String = "Failed in runSQL : "
         var changes: Int = -1
         var lastId: Int64 = -1
+        var response: [[String: Any]] = []
         let initChanges = UtilsSQLCipher.dbChanges(mDB: mDb)
-
         // Start a transaction
         if transaction {
             do {
@@ -370,9 +378,11 @@ class Database {
         }
         // Execute the query
         do {
-            lastId = try UtilsSQLCipher
+            let resp = try UtilsSQLCipher
                 .prepareSQL(mDB: self, sql: sql, values: values,
-                            fromJson: false)
+                            fromJson: false, returnMode: returnMode)
+            lastId = resp.0
+            response = resp.1
         } catch UtilsSQLCipherError.prepareSQL(let message) {
             if transaction {
                 do {
@@ -400,8 +410,9 @@ class Database {
             }
         }
         changes = UtilsSQLCipher.dbChanges(mDB: mDb) - initChanges
-        let result: [String: Int64] = ["changes": Int64(changes),
-                                       "lastId": lastId]
+        let result: [String: Any] = ["changes": changes,
+                                     "lastId": lastId,
+                                     "values": response]
         return result
     }
 
@@ -511,6 +522,8 @@ class Database {
 
     func setSyncDate(syncDate: String ) throws -> Bool {
         var retBool: Bool = false
+        var lastId: Int64 = -1
+        var resp: [String: Any] = [:]
         do {
             let isExists: Bool = try UtilsJson.isTableExists(
                 mDB: self, tableName: "sync_table")
@@ -524,8 +537,9 @@ class Database {
                 let syncTime: Int = Int(date.timeIntervalSince1970)
                 var stmt: String = "UPDATE sync_table SET sync_date = "
                 stmt.append("\(syncTime) WHERE id = 1;")
-                let retRun = try runSQL(sql: stmt, values: [])
-                if let lastId: Int64 = retRun["lastId"] {
+                resp = try runSQL(sql: stmt, values: [])
+                if let mLastId: Int64 = resp["lastId"] as? Int64 {
+                    lastId = mLastId
                     if lastId != -1 {
                         retBool = true
                     }

package/ios/Plugin/ImportExportJson/ExportToJson.swift

@@ -88,6 +88,7 @@ class ExportToJson {
     // MARK: - ExportToJson - SetLastExportDate
 
     class func setLastExportDate(mDB: Database, sTime: Int) throws {
+        var lastId: Int64 = -1
         do {
             let isExists: Bool = try UtilsJson.isTableExists(
                 mDB: mDB, tableName: "sync_table")
@@ -103,8 +104,10 @@ class ExportToJson {
             } else {
                 stmt = "INSERT INTO sync_table (sync_date) VALUES (\(sTime));"
             }
-            let lastId: Int64 = try UtilsSQLCipher.prepareSQL(
-                mDB: mDB, sql: stmt, values: [], fromJson: false)
+            let resp = try UtilsSQLCipher.prepareSQL(
+                mDB: mDB, sql: stmt, values: [], fromJson: false,
+                returnMode: "no")
+            lastId = resp.0
             if lastId < 0 {
                 throw ExportToJsonError.setLastExportDate(
                     message: "lastId < 0")
@@ -149,9 +152,11 @@ class ExportToJson {
                 // define the delete statement
                 let delStmt = "DELETE FROM \(table) WHERE sql_deleted = 1 " +
                     "AND last_modified < \(lastExportDate);"
-                lastId = try UtilsSQLCipher.prepareSQL(mDB: mDB, sql: delStmt,
-                                                       values: [],
-                                                       fromJson: true)
+                let resp = try UtilsSQLCipher.prepareSQL(mDB: mDB, sql: delStmt,
+                                                         values: [],
+                                                         fromJson: true,
+                                                         returnMode: "no")
+                lastId = resp.0
                 if lastId < 0 {
                     let msg = "DelExportedRows: lastId < 0"
                     throw ExportToJsonError.delExportedRows(message: msg)

package/ios/Plugin/ImportExportJson/ImportFromJson.swift

@@ -384,6 +384,7 @@ class ImportFromJson {
         mDB: Database, mode: String,
         mValues: [[UncertainValue<String, Int, Double>]],
         tableName: String) throws {
+        var lastId: Int64 = -1
         // Check if table exists
         do {
             let isTab: Bool = try UtilsJson
@@ -443,8 +444,9 @@ class ImportFromJson {
                     if stmt.prefix(6) == "DELETE" {
                         rowValues = []
                     }
-                    let lastId: Int64 = try UtilsSQLCipher.prepareSQL(
-                        mDB: mDB, sql: stmt, values: rowValues, fromJson: true)
+                    let resp = try UtilsSQLCipher.prepareSQL(
+                        mDB: mDB, sql: stmt, values: rowValues, fromJson: true, returnMode: "no")
+                    lastId = resp.0
                     if lastId < 0 {
                         throw ImportFromJsonError.createTableData(
                             message: "lastId < 0")

package/ios/Plugin/Utils/UtilsDownloadFromHTTP.swift

@@ -39,80 +39,80 @@ class UtilsDownloadFromHTTP {
                     isDirectory: false
                 )
 
-            let task = URLSession.shared.downloadTask(with: mUrl) {
-                (tempURL, response, error) in
-                // Early exit on error
-                guard let tempURL = tempURL else {
-                    let msg = "\(String(describing: error?.localizedDescription))"
-                    print("\(msg)")
-                    completion(.failure(UtilsDownloadError.downloadFromHTTPFailed))
-                    return
-                }
-                if let httpResponse = response as? HTTPURLResponse {
-                    switch httpResponse.statusCode {
-                    case 200:
-                        do {
-                            // Remove any existing document at file
-                            if FileManager.default.fileExists(
-                                atPath: fileCacheURL.path) {
-                                try FileManager.default.removeItem(
-                                    atPath: fileCacheURL.path)
-                            }
-
-                            // Copy the tempURL to file
-                            try FileManager.default.copyItem(
-                                at: tempURL,
-                                to: fileCacheURL
-                            )
-                            // Delete the tempUrl file
-                            try FileManager.default.removeItem(at: tempURL)
-                            let dbURL = try UtilsFile.getDatabaseLocationURL(
-                                databaseLocation: databaseLocation)
-                            if isZip {
-                                // get the zip files
-                                let zipList: [String] = try UtilsFile
-                                    .getFileList(path: cacheURL.path,
-                                                 ext: ".zip")
-                                // loop through the database files
-                                for zip in zipList {
-                                    _ = try UtilsFile.unzipToDatabase(
-                                        fromURL: cacheURL,
-                                        databaseLocation: tmp,
-                                        zip: zip,
-                                        overwrite: true)
+            let task = URLSession.shared
+                .downloadTask(with: mUrl) {(tempURL, response, error) in
+                    // Early exit on error
+                    guard let tempURL = tempURL else {
+                        let msg = "\(String(describing: error?.localizedDescription))"
+                        print("\(msg)")
+                        completion(.failure(UtilsDownloadError.downloadFromHTTPFailed))
+                        return
+                    }
+                    if let httpResponse = response as? HTTPURLResponse {
+                        switch httpResponse.statusCode {
+                        case 200:
+                            do {
+                                // Remove any existing document at file
+                                if FileManager.default.fileExists(
+                                    atPath: fileCacheURL.path) {
+                                    try FileManager.default.removeItem(
+                                        atPath: fileCacheURL.path)
                                 }
-                                // Delete the zip file
-                                try FileManager.default.removeItem(
-                                    at: fileCacheURL)
 
+                                // Copy the tempURL to file
+                                try FileManager.default.copyItem(
+                                    at: tempURL,
+                                    to: fileCacheURL
+                                )
+                                // Delete the tempUrl file
+                                try FileManager.default.removeItem(at: tempURL)
+                                let dbURL = try UtilsFile.getDatabaseLocationURL(
+                                    databaseLocation: databaseLocation)
+                                if isZip {
+                                    // get the zip files
+                                    let zipList: [String] = try UtilsFile
+                                        .getFileList(path: cacheURL.path,
+                                                     ext: ".zip")
+                                    // loop through the database files
+                                    for zip in zipList {
+                                        _ = try UtilsFile.unzipToDatabase(
+                                            fromURL: cacheURL,
+                                            databaseLocation: tmp,
+                                            zip: zip,
+                                            overwrite: true)
+                                    }
+                                    // Delete the zip file
+                                    try FileManager.default.removeItem(
+                                        at: fileCacheURL)
+
+                                }
+                                try UtilsFile.moveAllDBSQLite(
+                                    fromURL: cacheURL,
+                                    dirUrl: dbURL)
+                                completion(.success(true))
+                                return
                             }
-                            try UtilsFile.moveAllDBSQLite(
-                                fromURL: cacheURL,
-                                dirUrl: dbURL)
-                            completion(.success(true))
-                            return
-                        }
 
-                        // Handle potential file system errors
-                        catch let error {
-                            let msg = "\(error.localizedDescription)"
+                            // Handle potential file system errors
+                            catch let error {
+                                let msg = "\(error.localizedDescription)"
+                                print("\(msg)")
+                                completion(.failure(UtilsDownloadError.downloadFromHTTPFailed))
+                                return
+                            }
+                        default:
+                            let msg = "Download: GET resquest not successful. http status code \(httpResponse.statusCode)"
                             print("\(msg)")
                             completion(.failure(UtilsDownloadError.downloadFromHTTPFailed))
                             return
                         }
-                    default:
-                        let msg = "Download: GET resquest not successful. http status code \(httpResponse.statusCode)"
+                    } else {
+                        let msg = "Download: not a valid http response"
                         print("\(msg)")
                         completion(.failure(UtilsDownloadError.downloadFromHTTPFailed))
                         return
                     }
-                } else {
-                    let msg = "Download: not a valid http response"
-                    print("\(msg)")
-                    completion(.failure(UtilsDownloadError.downloadFromHTTPFailed))
-                    return
                 }
-            }
             // Start the download
             task.resume()
         }

package/ios/Plugin/Utils/UtilsDrop.swift

@@ -233,7 +233,8 @@ class UtilsDrop {
             retChanges = try self.dropViews(mDB: mDB)
             if changes >= 0 {
                 _ = try UtilsSQLCipher.prepareSQL(mDB: mDB, sql: "VACUUM;",
-                                                  values: [], fromJson: false)
+                                                  values: [], fromJson: false,
+                                                  returnMode: "no")
                 changes = UtilsSQLCipher.dbChanges(mDB: mDB.mDb) -
                     initChanges
             }