@capacitor-community/sqlite 3.4.2-5 → 3.4.2

package/ios/Plugin/ImportExportJson/ExportToJson.swift

@@ -28,9 +28,16 @@ enum ExportToJsonError: Error {
     case modEmbeddedParentheses(message: String)
     case getViews(message: String)
 }
-
+var REALAFFINITY: [String] = ["REAL", "DOUBLE", "DOUBLE PRECISION", "FLOAT"]
+var INTEGERAFFINITY: [String] = ["INTEGER", "INT", "TINYINT", "SMALLINT",
+                                 "MEDIUMINT", "BIGINT", "UNSIGNED BIG INT",
+                                 "INT2", "INT8"]
+var TEXTAFFINITY: [String] = ["TEXT", "CHARACTER", "VARCHAR", "VARYING CHARACTER",
+                              "NCHAR", "NATIVE CHARACTER", "NVARCHAR", "CLOB"]
+var BLOBAFFINITY: [String] = ["BLOB"]
+var NUMERICAFFINITY: [String] = ["NUMERIC", "DECIMAL", "BOOLEAN", "DATE",
+                                 "DATETIME"]
 class ExportToJson {
-
     // MARK: - JsonNotifications - NotifyExportProgressEvent
 
     class func notifyExportProgressEvent(msg: String) {
@@ -996,14 +1003,19 @@ class ExportToJson {
 
     // MARK: - ExportToJson - CreateRowValues
 
+    // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     class func createRowValues(values: [[String: Any]], pos: Int,
                                names: [String],
                                types: [String] ) throws -> [Any] {
         var row: [Any] = []
         for jpos in 0..<names.count {
-
-            //            if types[jpos] == "INTEGER" {
-            if values[pos][names[jpos]] is String {
+            if values[pos][names[jpos]] is String  && (TEXTAFFINITY
+                                                        .contains(types[jpos].components(separatedBy: "(")[0]
+                                                                    .uppercased())
+                                                        || BLOBAFFINITY.contains(types[jpos].uppercased())
+                                                        || NUMERICAFFINITY.contains(types[jpos].uppercased())
+            ) {
                 guard let val = values[pos][names[jpos]] as? String
                 else {
                     throw ExportToJsonError.createValues(
@@ -1017,14 +1029,29 @@ class ExportToJson {
                         message: "Error value must be NSNull")
                 }
                 row.append(val)
-            } else if values[pos][names[jpos]] is Int64 {
+            } else if values[pos][names[jpos]] is Int64 && (
+                        INTEGERAFFINITY.contains(types[jpos].uppercased()) ||
+                            NUMERICAFFINITY.contains(types[jpos].uppercased())) {
                 guard let val = values[pos][names[jpos]] as? Int64
                 else {
                     throw ExportToJsonError.createValues(
                         message: "Error value must be Int64")
                 }
                 row.append(val)
-            } else if values[pos][names[jpos]] is Double {
+            } else if values[pos][names[jpos]] is Int64 && (
+                        REALAFFINITY.contains(types[jpos].uppercased())  ||
+                            NUMERICAFFINITY.contains(types[jpos]
+                                                        .components(separatedBy: "(")[0].uppercased())) {
+                guard let val = values[pos][names[jpos]] as? Int64
+                else {
+                    throw ExportToJsonError.createValues(
+                        message: "Error value must be double")
+                }
+                row.append(Double(val))
+            } else if values[pos][names[jpos]] is Double && (
+                        REALAFFINITY.contains(types[jpos].uppercased()) ||
+                            NUMERICAFFINITY.contains(types[jpos]
+                                                        .components(separatedBy: "(")[0].uppercased())) {
                 guard let val = values[pos][names[jpos]] as? Double
                 else {
                     throw ExportToJsonError.createValues(
@@ -1040,6 +1067,8 @@ class ExportToJson {
         }
         return row
     }
+    // swiftlint:enable cyclomatic_complexity
+    // swiftlint:enable function_body_length
 
 }
 // swiftlint:enable type_body_length

package/ios/Plugin/ImportExportJson/ImportFromJson.swift

@@ -236,7 +236,7 @@ class ImportFromJson {
             stmt.append(" AFTER UPDATE ON ")
             stmt.append(tableName)
             stmt.append(" FOR EACH ROW ")
-            stmt.append("WHEN NEW.last_modified <= OLD.last_modified ")
+            stmt.append("WHEN NEW.last_modified < OLD.last_modified ")
             stmt.append("BEGIN UPDATE ")
             stmt.append(tableName)
             stmt.append(" SET last_modified = (strftime('%s','now')) ")
@@ -409,6 +409,8 @@ class ImportFromJson {
             // Check row validity
             let row: [UncertainValue<String, Int, Double>] =
                 mValues[jpos]
+            var isRun: Bool = true
+
             /* Remove types checking for allowing RDBMS Types
              do {
              try UtilsJson.checkRowValidity(
@@ -429,19 +431,26 @@ class ImportFromJson {
                                         jsonNamesTypes: jsonNamesTypes)
                 let rowValues = UtilsJson.getValuesFromRow(
                     rowValues: row)
-                let lastId: Int64 = try UtilsSQLCipher.prepareSQL(
-                    mDB: mDB, sql: stmt, values: rowValues)
-                if lastId < 0 {
-                    throw ImportFromJsonError.createTableData(
-                        message: "lastId < 0")
+                isRun = try UtilsJson.checkUpdate(mDB: mDB, stmt: stmt,
+                                                  values: rowValues,
+                                                  tableName: tableName,
+                                                  names: jsonNamesTypes.names,
+                                                  types: jsonNamesTypes.types)
+
+                if isRun {
+                    let lastId: Int64 = try UtilsSQLCipher.prepareSQL(
+                        mDB: mDB, sql: stmt, values: rowValues)
+                    if lastId < 0 {
+                        throw ImportFromJsonError.createTableData(
+                            message: "lastId < 0")
+                    }
                 }
-            } catch ImportFromJsonError.createRowStatement(
-                        let message) {
-                throw ImportFromJsonError.createTableData(
-                    message: message)
+            } catch UtilsJsonError.checkUpdate(let message) {
+                throw ImportFromJsonError.createTableData(message: message)
+            } catch ImportFromJsonError.createRowStatement(let message) {
+                throw ImportFromJsonError.createTableData(message: message)
             } catch UtilsSQLCipherError.prepareSQL(let message) {
-                throw ImportFromJsonError.createTableData(
-                    message: message)
+                throw ImportFromJsonError.createTableData(message: message)
             }
         }
         return

package/ios/Plugin/Utils/UtilsJson.swift

@@ -18,8 +18,10 @@ enum UtilsJsonError: Error {
     case validateTriggers(message: String)
     case validateViews(message: String)
     case isLastModified(message: String)
-}
+    case checkUpdate(message: String)
+    case checkValues(message: String)}
 
+// swiftlint:disable file_length
 // swiftlint:disable type_body_length
 class UtilsJson {
 
@@ -238,6 +240,70 @@ class UtilsJson {
         return retArray
     }
 
+    // MARK: - ImportFromJson - CheckUpdate
+
+    // swiftlint:disable function_parameter_count
+    class func checkUpdate(mDB: Database, stmt: String, values: [Any],
+                           tableName: String, names: [String],
+                           types: [String]) throws -> Bool {
+        var isRun: Bool = true
+        if stmt.prefix(6) == "UPDATE" {
+            var query: String = "SELECT * FROM \(tableName) WHERE \(names[0]) = "
+            if type(of: values[0]) == String.self {
+                query.append("'\(values[0])';")
+            } else {
+                query.append("\(values[0]);")
+            }
+
+            do {
+                // create the table data
+                let resValues: [[Any]] = try ExportToJson
+                    .createValues(mDB: mDB, query: query, names: names,
+                                  types: types)
+                if resValues.count > 0 {
+                    isRun = try checkValues(values: values, nValues: resValues[0])
+                    return isRun
+                } else {
+                    let msg = "CheckUpdate statement returns nothing"
+                    throw UtilsJsonError.checkUpdate(message: msg)
+                }
+            } catch ExportToJsonError.createValues(let message) {
+                throw UtilsJsonError.checkUpdate(message: message)
+            } catch UtilsJsonError.checkValues(let message) {
+                throw UtilsJsonError.checkUpdate(message: message)
+            }
+        }
+        return isRun
+    }
+    // swiftlint:enable function_parameter_count
+
+    // MARK: - ImportFromJson - CheckValues
+
+    class func checkValues(values: [Any], nValues: [Any]) throws -> Bool {
+        if values.count > 0 && nValues.count > 0
+            && values.count == nValues.count {
+            let valuesWithIndex = values.enumerated()
+            for (index, mValue) in valuesWithIndex {
+                let rValue = nValues[index]
+                if type(of: rValue) == Double.self {
+                    if let dValue =  rValue as? Double {
+                        if let dValues = mValue as? Double {
+                            if !dValue.isEqual(to: dValues) {
+                                return true
+                            }
+                        }
+                    }
+                } else if rValue as AnyObject !== values[index] as AnyObject {
+                    return true
+                }
+            }
+            return false
+        } else {
+            let msg = "CheckValues Both arrays not the same length"
+            throw UtilsJsonError.checkValues(message: msg)
+        }
+
+    }
     // MARK: - ImportFromJson - SetNameForUpdate
 
     class func setNameForUpdate(names: [String]) -> String {
@@ -374,3 +440,4 @@ class UtilsJson {
 
 }
 // swiftlint:enable type_body_length
+// swiftlint:enable file_length

package/ios/Plugin/Utils/UtilsSQLCipher.swift

@@ -159,27 +159,6 @@ class UtilsSQLCipher {
                 let msg: String = "Cannot open the DB"
                 throw UtilsSQLCipherError.openOrCreateDatabase(message: msg)
             }
-
-            /* this should work but doe not sqlite3_key_v2 is not known
-             if password.count > 0 {
-             let nKey:Int32 = Int32(password.count)
-             if sqlite3_key_v2(mDB!, filename, password, nKey) == SQLITE_OK {
-             var stmt: String = "SELECT count(*) FROM "
-             stmt.append("sqlite_master;")
-             if sqlite3_exec(mDB, stmt, nil, nil, nil) !=
-             SQLITE_OK {
-             print("Unable to open a database \(filename)")
-             throw UtilsSQLCipherError
-             .openOrCreateDatabase(message: msg)
-             }
-             } else  {
-             print("Unable to open a database \(filename)")
-             throw UtilsSQLCipherError
-             .openOrCreateDatabase(message: msg)
-             }
-             }
-             print("Successfully opened database \(filename)")
-             */
             return mDB
         } else {
             let message: String = "open_v2 failed"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.4.2-5",
+  "version": "3.4.2",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -74,7 +74,7 @@
     "typescript": "~4.0.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "~3.4.1"
+    "@capacitor/core": "~3.4.2"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",
@@ -93,6 +93,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^1.4.0"
+    "jeep-sqlite": "^1.4.1"
   }
 }