@capacitor-community/sqlite 3.4.2-3 → 3.4.2

package/ios/Plugin/CapacitorSQLitePlugin.swift

@@ -724,7 +724,7 @@ public class CapacitorSQLitePlugin: CAPPlugin {
 
         }
         do {
-            if let res = try
+            if let res: [[String: Any]] = try
                 implementation?.query(dbName,
                                       statement: statement,
                                       values: values) {

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) {
@@ -72,9 +79,10 @@ class ExportToJson {
             // get the view's name
             var stmtV: String = "SELECT name,sql FROM sqlite_master WHERE "
             stmtV.append("type = 'view' AND name NOT LIKE 'sqlite_%';")
-            let resViews =  try UtilsSQLCipher.querySQL(
+            var resViews =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: stmtV, values: [])
-            if resViews.count > 0 {
+            if resViews.count > 1 {
+                resViews.removeFirst()
                 views = try ExportToJson
                     .getViews(mDB: mDB,
                               resViews: resViews)
@@ -85,9 +93,10 @@ class ExportToJson {
             var query: String = "SELECT name,sql FROM sqlite_master WHERE "
             query.append("type = 'table' AND name NOT LIKE 'sqlite_%' ")
             query.append("AND name NOT LIKE 'sync_table';")
-            let resTables =  try UtilsSQLCipher.querySQL(
+            var resTables =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resTables.count > 0 {
+            if resTables.count > 1 {
+                resTables.removeFirst()
                 let isExists: Bool = try UtilsJson.isTableExists(
                     mDB: mDB, tableName: "sync_table")
                 if !isExists && expMode == "partial" {
@@ -528,9 +537,10 @@ class ExportToJson {
         var ret: Int64 = -1
         let query: String = "SELECT sync_date FROM sync_table;"
         do {
-            let resSyncDate =  try UtilsSQLCipher.querySQL(
+            var resSyncDate =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resSyncDate.count > 0 {
+            if resSyncDate.count > 1 {
+                resSyncDate.removeFirst()
                 guard let res: Int64 = resSyncDate[0]["sync_date"] as?
                         Int64 else {
                     throw ExportToJsonError.getSyncDate(
@@ -548,6 +558,7 @@ class ExportToJson {
     // MARK: - ExportToJson - GetTablesModified
 
     // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     class func getTablesModified(mDB: Database,
                                  tables: [[String: Any]],
                                  syncDate: Int64)
@@ -569,6 +580,9 @@ class ExportToJson {
                 do {
                     var resQuery =  try UtilsSQLCipher.querySQL(
                         mDB: mDB, sql: query, values: [])
+                    if resQuery.count > 1 {
+                        resQuery.removeFirst()
+                    }
                     if resQuery.count != 1 {
                         break
                     } else {
@@ -585,6 +599,9 @@ class ExportToJson {
                         query.append("\(syncDate);")
                         resQuery =  try UtilsSQLCipher.querySQL(
                             mDB: mDB, sql: query, values: [])
+                        if resQuery.count > 1 {
+                            resQuery.removeFirst()
+                        }
                         if resQuery.count != 1 {
                             break
                         } else {
@@ -618,6 +635,8 @@ class ExportToJson {
         }
         return retObj
     }
+    // swiftlint:enable cyclomatic_complexity
+    // swiftlint:enable function_body_length
 
     // MARK: - ExportToJson - ModEmbeddedParentheses
 
@@ -751,9 +770,10 @@ class ExportToJson {
         query.append("type = 'index' AND tbl_name = '\(tableName)' ")
         query.append("AND sql NOTNULL;")
         do {
-            let resIndexes =  try UtilsSQLCipher.querySQL(
+            var resIndexes =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resIndexes.count > 0 {
+            if resIndexes.count > 1 {
+                resIndexes.removeFirst()
                 for ipos in 0..<resIndexes.count {
                     var row: [String: String] = [:]
                     let keys: [String] = Array(resIndexes[ipos].keys)
@@ -837,9 +857,10 @@ class ExportToJson {
         query.append("type = 'trigger' AND tbl_name = '\(tableName)' ")
         query.append("AND sql NOTNULL;")
         do {
-            let resTriggers =  try UtilsSQLCipher.querySQL(
+            var resTriggers =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resTriggers.count > 0 {
+            if resTriggers.count > 1 {
+                resTriggers.removeFirst()
                 for ipos in 0..<resTriggers.count {
                     var row: [String: String] = [:]
                     let keys: [String] = Array(resTriggers[ipos].keys)
@@ -952,9 +973,10 @@ class ExportToJson {
 
         var retValues: [[Any]] = []
         do {
-            let resValues =  try UtilsSQLCipher.querySQL(
+            var resValues =  try UtilsSQLCipher.querySQL(
                 mDB: mDB, sql: query, values: [])
-            if resValues.count > 0 {
+            if resValues.count > 1 {
+                resValues.removeFirst()
                 for ipos in 0..<resValues.count {
                     var row: [Any] = []
                     do {
@@ -981,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(
@@ -1002,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(
@@ -1025,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/UtilsBinding.swift

@@ -24,10 +24,10 @@ class UtilsBinding {
                                           value: value, idx: idx)
                     idx += 1
                 } else {
-                    message = "Error: querySQL bind failed "
+                    message = "Error: bindValues bind failed "
                 }
             } catch let error as NSError {
-                message = "Error: querySQL bind failed "
+                message = "Error: bindValues bind failed "
                 message.append("\(error.localizedDescription)")
             }
             if message.count > 0 { break }

package/ios/Plugin/Utils/UtilsDrop.swift

@@ -33,8 +33,9 @@ class UtilsDrop {
         query.append("AND name NOT LIKE 'sqlite_%' ")
         query.append("ORDER BY rootpage DESC;")
         do {
-            let resQuery = try mDB.selectSQL(sql: query, values: [])
+            var resQuery = try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 for ipos in 0..<resQuery.count {
                     if let mName = resQuery[ipos]["name"] as? String {
                         names.append("\(mName)")
@@ -81,8 +82,9 @@ class UtilsDrop {
         query.append("type='view' AND name NOT LIKE 'sqlite_%' ")
         query.append("ORDER BY rootpage DESC;")
         do {
-            let resQuery = try mDB.selectSQL(sql: query, values: [])
+            var resQuery = try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 for ipos in 0..<resQuery.count {
                     if let mName = resQuery[ipos]["name"] as? String {
                         names.append("\(mName)")
@@ -128,8 +130,9 @@ class UtilsDrop {
         var query: String = "SELECT name FROM sqlite_master WHERE "
         query.append("type='index' AND name NOT LIKE 'sqlite_%';")
         do {
-            let resQuery = try mDB.selectSQL(sql: query, values: [])
+            var resQuery = try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 for ipos in 0..<resQuery.count {
                     if let mName = resQuery[ipos]["name"] as? String {
                         indexes.append("\(mName)")
@@ -174,8 +177,9 @@ class UtilsDrop {
         var query: String = "SELECT name FROM sqlite_master WHERE "
         query.append("type='trigger';")
         do {
-            let resQuery = try mDB.selectSQL(sql: query, values: [])
+            var resQuery = try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 for ipos in 0..<resQuery.count {
                     if let mName = resQuery[ipos]["name"] as? String {
                         triggers.append("\(mName)")

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 {
 
@@ -38,9 +40,14 @@ class UtilsJson {
         query.append(tableName)
         query.append("';")
         do {
-            let resQuery: [Any] = try UtilsSQLCipher
+            var resQuery: [Any] = try UtilsSQLCipher
                 .querySQL(mDB: mDB, sql: query, values: [])
-            if resQuery.count > 0 {ret = true}
+            if resQuery.count > 0 {
+                resQuery.removeFirst()
+                if resQuery.count == 1 {
+                    ret = true
+                }
+            }
         } catch UtilsSQLCipherError.querySQL(let message) {
             throw UtilsJsonError.tableNotExists(message: message)
         }
@@ -89,9 +96,14 @@ class UtilsJson {
         query.append(viewName)
         query.append("';")
         do {
-            let resQuery: [Any] = try UtilsSQLCipher
+            var resQuery: [Any] = try UtilsSQLCipher
                 .querySQL(mDB: mDB, sql: query, values: [])
-            if resQuery.count > 0 {ret = true}
+            if resQuery.count > 0 {
+                resQuery.removeFirst()
+                if resQuery.count == 1 {
+                    ret = true
+                }
+            }
         } catch UtilsSQLCipherError.querySQL(let message) {
             throw UtilsJsonError.viewNotExists(message: message)
         }
@@ -109,8 +121,9 @@ class UtilsJson {
         query.append(tableName)
         query.append(");")
         do {
-            let resQuery =  try mDB.selectSQL(sql: query, values: [])
+            var resQuery =  try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {
+                resQuery.removeFirst()
                 var names: [String] = []
                 var types: [String] = []
                 for ipos in 0..<resQuery.count {
@@ -190,9 +203,12 @@ class UtilsJson {
             query.append("\(key);")
         }
         do {
-            let resQuery =  try mDB.selectSQL(sql: query, values: [])
-            if resQuery.count == 1 {
-                ret = true
+            var resQuery =  try mDB.selectSQL(sql: query, values: [])
+            if resQuery.count > 1 {
+                resQuery.removeFirst()
+                if resQuery.count == 1 {
+                    ret = true
+                }
             }
         } catch DatabaseError.selectSQL(let message) {
             throw UtilsJsonError.isIdExists(
@@ -224,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 {
@@ -360,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"
@@ -266,10 +245,11 @@ class UtilsSQLCipher {
 
         let sqltr: String = "PRAGMA user_version;"
         do {
-            let resVersion =  try UtilsSQLCipher.querySQL(mDB: mDB,
+            var resVersion =  try UtilsSQLCipher.querySQL(mDB: mDB,
                                                           sql: sqltr,
                                                           values: [])
-            if resVersion.count > 0 {
+            if resVersion.count > 1 {
+                resVersion.removeFirst()
                 guard let res: Int64 = resVersion[0]["user_version"]
                         as? Int64 else {
                     throw UtilsSQLCipherError.getVersion(
@@ -504,10 +484,13 @@ class UtilsSQLCipher {
     // MARK: - FetchColumnInfo
 
     // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     class func fetchColumnInfo(handle: OpaquePointer?)
     throws -> [[String: Any]] {
         var result: [[String: Any]] = []
         var columnCount: Int32 = 0
+        var columnNames: [String] = []
+        var columnData: [String: Any] = [:]
 
         while sqlite3_step(handle) == SQLITE_ROW {
             columnCount = sqlite3_column_count(handle)
@@ -521,6 +504,13 @@ class UtilsSQLCipher {
                     throw UtilsSQLCipherError
                     .fetchColumnInfo(message: message)
                 }
+                if columnNames.count <= columnCount {
+                    columnNames.append(String(cString: name))
+                    if columnNames.count == columnCount {
+                        columnData["ios_columns"] = columnNames
+                        result.append(columnData)
+                    }
+                }
                 switch sqlite3_column_type(handle, Int32(index)) {
                 case SQLITE_INTEGER:
                     let val: Int64 = sqlite3_column_int64(handle, index)
@@ -558,6 +548,7 @@ class UtilsSQLCipher {
         }
         return result
     }
+    // swiftlint:enable cyclomatic_complexity
     // swiftlint:enable function_body_length
 
     // MARK: - dbChanges

package/ios/Plugin/Utils/UtilsUpgrade.swift

@@ -307,9 +307,10 @@ class UtilsUpgrade {
         var retNames: [String] = []
         let query: String = "PRAGMA table_info('\(tableName)');"
         do {
-            let resColumns: [[String: Any]] =  try
+            var resColumns: [[String: Any]] =  try
                 mDB.selectSQL(sql: query, values: [])
             if resColumns.count > 0 {
+                resColumns.removeFirst()
                 for rColumn in resColumns {
                     guard let columnName: String = rColumn["name"] as?
                             String else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.4.2-3",
+  "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"
   }
 }