@capacitor-community/sqlite 3.4.2-5 → 3.4.3-2

package/ios/Plugin/Utils/UtilsDrop.swift

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

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

@@ -13,6 +13,7 @@ enum UtilsSQLCipherError: Error {
     case openOrCreateDatabase(message: String)
     case bindFailed
     case setForeignKeyConstraintsEnabled(message: String)
+    case getForeignKeysStateFailed(message: String)
     case getVersion(message: String)
     case setVersion(message: String)
     case closeDB(message: String)
@@ -23,6 +24,9 @@ enum UtilsSQLCipherError: Error {
     case commitTransaction(message: String)
     case execute(message: String)
     case prepareSQL(message: String)
+    case deleteSQL(message: String)
+    case findReferenciesAndUpdate(message: String)
+    case getReferencies(message: String)
     case querySQL(message: String)
     case fetchColumnInfo(message: String)
     case deleteDB(message: String)
@@ -159,27 +163,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"
@@ -254,6 +237,40 @@ class UtilsSQLCipher {
 
     }
 
+    // MARK: - GetForeignKeysState
+
+    class func getForeignKeysState(mDB: Database) throws -> Int {
+        var msg: String = "Error ForeignKeysState: "
+        if !mDB.isDBOpen() {
+            msg.append("Database not opened")
+            throw UtilsSQLCipherError.getForeignKeysStateFailed(message: msg)
+        }
+        var fkState: Int = 0
+
+        let sqltr: String = "PRAGMA foreign_keys;"
+        do {
+            var resForKeys =  try UtilsSQLCipher.querySQL(mDB: mDB,
+                                                          sql: sqltr,
+                                                          values: [])
+            if resForKeys.count > 1 {
+                resForKeys.removeFirst()
+                guard let res: Int64 = resForKeys[0]["foreign_keys"]
+                        as? Int64 else {
+                    throw UtilsSQLCipherError.getForeignKeysStateFailed(
+                        message: "Error get foreign keys failed")
+                }
+                if res > 0 {
+                    fkState =  Int(truncatingIfNeeded: res)
+
+                }
+            }
+            return fkState
+        } catch UtilsSQLCipherError.querySQL(let message) {
+            throw UtilsSQLCipherError.getForeignKeysStateFailed(
+                message: message)
+        }
+    }
+
     // MARK: - GetVersion
 
     class func getVersion(mDB: Database) throws -> Int {
@@ -283,7 +300,7 @@ class UtilsSQLCipher {
             }
             return version
         } catch UtilsSQLCipherError.querySQL(let message) {
-            throw UtilsUpgradeError.getDatabaseVersionFailed(
+            throw UtilsSQLCipherError.getVersion(
                 message: message)
         }
     }
@@ -394,8 +411,9 @@ class UtilsSQLCipher {
     // MARK: - PrepareSQL
 
     // swiftlint:disable function_body_length
-    class func prepareSQL(mDB: Database,
-                          sql: String, values: [Any]) throws -> Int64 {
+    // swiftlint:disable cyclomatic_complexity
+    class func prepareSQL(mDB: Database, sql: String, values: [Any],
+                          fromJson: Bool) throws -> Int64 {
         var msg: String = "Error prepareSQL: "
         if !mDB.isDBOpen() {
             msg.append("Database not opened")
@@ -404,9 +422,19 @@ class UtilsSQLCipher {
         var runSQLStatement: OpaquePointer?
         var message: String = ""
         var lastId: Int64 = -1
-
+        var sqlStmt = sql
+        // Check for DELETE statement
+        if !fromJson && sqlStmt.prefix(6).uppercased() == "DELETE" {
+            do {
+                sqlStmt = try deleteSQL(mDB: mDB, sql: sql,
+                                        values: values)
+            } catch UtilsSQLCipherError.deleteSQL(let message) {
+                let msg = "Error: prepareSQL \(message)"
+                throw UtilsSQLCipherError.prepareSQL(message: msg)
+            }
+        }
         var returnCode: Int32 = sqlite3_prepare_v2(
-            mDB.mDb, sql, -1, &runSQLStatement, nil)
+            mDB.mDb, sqlStmt, -1, &runSQLStatement, nil)
         if returnCode == SQLITE_OK {
             if !values.isEmpty {
                 // do the binding of values
@@ -450,8 +478,198 @@ class UtilsSQLCipher {
             return lastId
         }
     }
+    // swiftlint:enable cyclomatic_complexity
     // swiftlint:enable function_body_length
 
+    // MARK: - deleteSQL
+
+    class func deleteSQL(mDB: Database, sql: String, values: [Any]) throws -> String {
+        var sqlStmt = sql
+        do {
+            let isLast: Bool = try UtilsJson.isLastModified(mDB: mDB)
+            if isLast {
+                if let range: Range<String.Index> = sql
+                    .range(of: "WHERE", options: .caseInsensitive) {
+                    let index: Int = sql
+                        .distance(from: sql.startIndex, to: range.lowerBound)
+                    let preStmt = String(sql.stringRange(fromIdx: 0,
+                                                         toIdx: (index - 1)))
+                    let clauseStmt = String(sql.stringRange(fromIdx: index,
+                                                            toIdx: sql.count))
+                    let tableName = (preStmt.deletingPrefix("DELETE FROM"))
+                        .trimmingLeadingAndTrailingSpaces()
+                    sqlStmt = "UPDATE \(tableName) SET sql_deleted = 1 "
+                    sqlStmt += clauseStmt
+                    // Find REFERENCIES if any and update the sql_deleted column
+                    try findReferenciesAndUpdate(mDB: mDB,
+                                                 tableName: tableName,
+                                                 whereStmt: clauseStmt,
+                                                 values: values)
+                } else {
+                    let msg: String = "deleteSQL cannot find a WHERE clause"
+                    throw UtilsSQLCipherError.deleteSQL(message: msg)
+                }
+            }
+            return sqlStmt
+        } catch UtilsSQLCipherError.findReferenciesAndUpdate(let message) {
+            throw UtilsSQLCipherError.deleteSQL(message: message)
+        } catch UtilsJsonError.isLastModified(let message) {
+            throw UtilsSQLCipherError.deleteSQL(message: message)
+        }
+    }
+
+    // MARK: - findReferencesAndUpdate
+
+    class func findReferenciesAndUpdate(mDB: Database, tableName: String,
+                                        whereStmt: String,
+                                        values: [Any]) throws {
+        do {
+            let referencies = try getReferencies(mDB: mDB,
+                                                 tableName: tableName)
+            if referencies.count <= 0 {
+                return
+            }
+            // Loop through referencies
+            for ref in referencies {
+                // get the tableName of the references
+                let refTable: String = getReferencesTableName(value: ref)
+                if refTable.count <= 0 {
+                    continue
+                }
+                // get the columnName
+                let colName: String = getReferencesColumnName(value: ref)
+                if colName.count <= 0 {
+                    continue
+                }
+                // update the where clause
+                let uWhereStmt: String = updateWhere(whStmt: whereStmt,
+                                                     colName: colName)
+
+                if uWhereStmt.count <= 0 {
+                    continue
+                }
+                //update sql_deleted for this references
+                let stmt = "UPDATE \(refTable) SET sql_deleted = 1 " +
+                    uWhereStmt
+                let lastId = try prepareSQL(mDB: mDB, sql: stmt,
+                                            values: values, fromJson: false)
+                if lastId == -1 {
+                    let msg = "UPDATE sql_deleted failed for references " +
+                        "table: \(refTable) "
+                    throw UtilsSQLCipherError
+                    .findReferenciesAndUpdate(message: msg)
+                }
+            }
+            return
+        } catch UtilsSQLCipherError.prepareSQL(let message) {
+            throw UtilsSQLCipherError
+            .findReferenciesAndUpdate(message: message)
+        } catch UtilsSQLCipherError.querySQL(let message) {
+            throw UtilsSQLCipherError
+            .findReferenciesAndUpdate(message: message)
+        }
+
+    }
+
+    // MARK: - getReferencies
+
+    class func getReferencies(mDB: Database, tableName: String)
+    throws -> [[String: Any]] {
+        // find the REFERENCIES
+        var sqlStmt = "SELECT sql FROM sqlite_master "
+        sqlStmt += "WHERE sql LIKE('%REFERENCES%') AND "
+        sqlStmt += "sql LIKE('%\(tableName)%') AND sql LIKE('%ON DELETE%');"
+        do {
+            var referencies: [[String: Any]] = try querySQL(mDB: mDB,
+                                                            sql: sqlStmt,
+                                                            values: [])
+            if referencies.count > 1 {
+                referencies.removeFirst()
+            }
+            return referencies
+        } catch UtilsSQLCipherError.querySQL(let message) {
+            throw UtilsSQLCipherError
+            .getReferencies(message: message)
+        }
+    }
+
+    // MARK: - getReferencesTableName
+
+    class func getReferencesTableName(value: [String: Any]) -> String {
+
+        var tableName: String = ""
+        if let refValue = value["sql"] as? String {
+
+            if let range: Range<String.Index> = refValue
+                .range(of: "CREATE TABLE", options: .caseInsensitive) {
+                let index: Int = refValue
+                    .distance(from: refValue.startIndex, to: range.lowerBound)
+                let stmt = String(refValue.stringRange(fromIdx: index + 13,
+                                                       toIdx: refValue.count))
+                if let oPar = stmt.firstIndex(of: "(") {
+                    let idx: Int = stmt.distance(from: stmt.startIndex, to: oPar)
+                    tableName = String(stmt.stringRange(fromIdx: 0, toIdx: idx))
+                        .trimmingLeadingAndTrailingSpaces()
+                }
+            }
+        }
+        return tableName
+    }
+
+    // MARK: - getReferencesColumnName
+
+    class func getReferencesColumnName(value: [String: Any]) -> String {
+
+        var colName: String = ""
+        if let refValue = value["sql"] as? String {
+
+            if let range: Range<String.Index> = refValue
+                .range(of: "FOREIGN KEY", options: .caseInsensitive) {
+                let index: Int = refValue
+                    .distance(from: refValue.startIndex, to: range.lowerBound)
+                let stmt = String(refValue.stringRange(fromIdx: index + 12,
+                                                       toIdx: refValue.count))
+                if let oPar = stmt.firstIndex(of: "(") {
+                    let idxOPar: Int = stmt.distance(from: stmt.startIndex,
+                                                     to: oPar) + 1
+                    if let cPar = stmt.firstIndex(of: ")") {
+                        let idxCPar: Int = stmt
+                            .distance(from: stmt.startIndex,
+                                      to: cPar)
+                        colName = String(stmt.stringRange(fromIdx: idxOPar,
+                                                          toIdx: idxCPar))
+                            .trimmingLeadingAndTrailingSpaces()
+
+                    }
+                }
+            }
+        }
+
+        return colName
+    }
+
+    class func updateWhere(whStmt: String, colName: String) -> String {
+        var whereStmt = ""
+        if let range: Range<String.Index> = whStmt
+            .range(of: "WHERE", options: .caseInsensitive) {
+            let index: Int = whStmt
+                .distance(from: whStmt.startIndex, to: range.lowerBound)
+            let stmt = String(whStmt.stringRange(fromIdx: index + 6,
+                                                 toIdx: whStmt.count))
+            if let fEqual = stmt.firstIndex(of: "=") {
+                let idxfEqual: Int = stmt.distance(from: stmt.startIndex,
+                                                   to: fEqual)
+                let whereColName = String(stmt.stringRange(fromIdx: 0,
+                                                           toIdx: idxfEqual))
+                    .trimmingLeadingAndTrailingSpaces()
+                whereStmt = whStmt.replacingOccurrences(of: whereColName, with: colName)
+
+            }
+        }
+
+        return whereStmt
+    }
+
     // MARK: - querySQL
 
     class func querySQL(mDB: Database, sql: String,
@@ -586,8 +804,34 @@ class UtilsSQLCipher {
             msg.append("Database not opened")
             throw UtilsSQLCipherError.execute(message: msg)
         }
+        var sqlStmt = sql
+        if sql.localizedCaseInsensitiveContains("DELETE FROM") {
+            sqlStmt = sqlStmt.replacingOccurrences(of: "\n",
+                                                   with: "")
+            var stmtArr = sqlStmt.components(separatedBy: ";")
+            stmtArr.removeLast()
+            var resArr: [String] = []
+            for stmt in stmtArr {
+                let trimStmt = stmt
+                    .trimmingLeadingAndTrailingSpaces().prefix(11).uppercased()
+                if trimStmt == "DELETE FROM" &&
+                    stmt.localizedCaseInsensitiveContains("WHERE") {
+                    let whereStmt = stmt.trimmingLeadingAndTrailingSpaces()
+                    do {
+                        let rStmt: String = try deleteSQL(mDB: mDB, sql: whereStmt, values: [])
+                        resArr.append(rStmt)
+                    } catch UtilsSQLCipherError.deleteSQL(let message) {
+                        let msg = "Error: execute \(message)"
+                        throw UtilsSQLCipherError.execute(message: msg)
+                    }
+                } else {
+                    resArr.append(String(stmt))
+                }
+            }
+            sqlStmt = resArr.joined(separator: ";")
+        }
 
-        let returnCode: Int32 = sqlite3_exec(mDB.mDb, sql, nil,
+        let returnCode: Int32 = sqlite3_exec(mDB.mDb, sqlStmt, nil,
                                              nil, nil)
         if returnCode != SQLITE_OK {
             let errmsg: String = String(
@@ -654,7 +898,7 @@ class UtilsSQLCipher {
                         for vals in arrValues {
                             lastId = try UtilsSQLCipher
                                 .prepareSQL(mDB: mDB, sql: sql,
-                                            values: vals)
+                                            values: vals, fromJson: false)
                             if  lastId == -1 {
                                 let message: String = "lastId < 0"
                                 throw UtilsSQLCipherError
@@ -664,7 +908,8 @@ class UtilsSQLCipher {
                     }
                 } else {
                     lastId = try UtilsSQLCipher
-                        .prepareSQL(mDB: mDB, sql: sql, values: values)
+                        .prepareSQL(mDB: mDB, sql: sql, values: values,
+                                    fromJson: false)
                     if  lastId == -1 {
                         let message: String = "lastId < 0"
                         throw UtilsSQLCipherError.executeSet(
@@ -762,6 +1007,9 @@ class UtilsSQLCipher {
         }
 
     }
+
+    // MARK: - parse
+
     class func parse(mVar: Any) -> Bool {
         var ret: Bool = false
         if mVar is NSArray {

package/ios/Plugin/Utils/UtilsUpgrade.swift

@@ -15,14 +15,13 @@ enum UtilsUpgradeError: Error {
     case backupTableFailed(message: String)
     case getTableColumnNamesFailed(message: String)
     case updateDatabaseVersionFailed(message: String)
-    case getDatabaseVersionFailed(message: String)
     case findCommonColumnsFailed(message: String)
     case arrayIntersectionFailed(message: String)
     case updateNewTablesDataFailed(message: String)
     case executeStatementProcessFailed(message: String)
     case executeSetProcessFailed(message: String)
 }
-
+// swiftlint:disable file_length
 // swiftlint:disable type_body_length
 class UtilsUpgrade {
     let utilsDrop: UtilsDrop = UtilsDrop()
@@ -88,6 +87,13 @@ class UtilsUpgrade {
             if statement.count > 0 {
                 _ = try executeStatementProcess(mDB: mDB,
                                                 statement: statement)
+                // -> Drop _temp_tables
+                _ = try UtilsDrop
+                    .dropTempTables(mDB: mDB,
+                                    alterTables: self.alterTables)
+                // -> Do some cleanup
+                self.alterTables = [:]
+                self.commonColumns = [:]
 
                 // here we assume that the Set contains only
                 //  - the data for new tables as INSERT statements
@@ -116,6 +122,25 @@ class UtilsUpgrade {
             throw UtilsUpgradeError.onUpgradeFailed(message: msg)
         } catch UtilsUpgradeError.executeStatementProcessFailed(
                     let message) {
+            var msg: String = message
+            do {
+                // -> Drop _temp_tables
+                _ = try UtilsDrop
+                    .dropTempTables(mDB: mDB,
+                                    alterTables: self.alterTables)
+                // -> Do some cleanup
+                self.alterTables = [:]
+                self.commonColumns = [:]
+
+            } catch UtilsDropError.dropTempTablesFailed(let message) {
+                msg += ": \(message)"
+                throw UtilsUpgradeError.onUpgradeFailed(
+                    message: message)
+            }
+
+            throw UtilsUpgradeError.onUpgradeFailed(
+                message: message)
+        } catch UtilsDropError.dropTempTablesFailed(let message) {
             throw UtilsUpgradeError.onUpgradeFailed(
                 message: message)
         } catch UtilsUpgradeError.executeSetProcessFailed(
@@ -194,6 +219,7 @@ class UtilsUpgrade {
     throws {
         var changes: Int = -1
         do {
+
             // -> backup all existing tables  "tableName" in
             //    "temp_tableName"
             _ = try backupTables(mDB: mDB)
@@ -216,13 +242,6 @@ class UtilsUpgrade {
             // -> Update the new table's data from old table's data
             _ = try updateNewTablesData(mDB: mDB)
 
-            // -> Drop _temp_tables
-            _ = try UtilsDrop
-                .dropTempTables(mDB: mDB,
-                                alterTables: self.alterTables)
-            // -> Do some cleanup
-            self.alterTables = [:]
-            self.commonColumns = [:]
         } catch UtilsUpgradeError.backupTablesFailed(let message) {
             throw UtilsUpgradeError.executeStatementProcessFailed(
                 message: message)
@@ -243,9 +262,6 @@ class UtilsUpgrade {
                     let message) {
             throw UtilsUpgradeError.executeStatementProcessFailed(
                 message: message)
-        } catch UtilsDropError.dropTempTablesFailed(let message) {
-            throw UtilsUpgradeError.executeStatementProcessFailed(
-                message: message)
         }
 
     }
@@ -276,9 +292,12 @@ class UtilsUpgrade {
             columnNames = try getTableColumnNames(mDB: mDB,
                                                   tableName: tableName)
             alterTables["\(tableName)"] = columnNames
+            let tmpTable = "_temp_\(tableName)"
+            let delStmt: String  = "DROP TABLE IF EXISTS \(tmpTable);"
+            _ = try mDB.runSQL(sql: delStmt, values: [])
             // prefix the table with _temp_
             var stmt: String = "ALTER TABLE \(tableName) RENAME "
-            stmt.append("TO _temp_\(tableName);")
+            stmt.append("TO \(tmpTable);")
             let retRun: [String: Int64] = try mDB.runSQL(
                 sql: stmt, values: [])
             guard let changes: Int64 = retRun["changes"] else {
@@ -392,3 +411,4 @@ class UtilsUpgrade {
     }
 }
 // swiftlint:enable type_body_length
+// swiftlint:enable file_length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.4.2-5",
+  "version": "3.4.3-2",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -55,10 +55,10 @@
     "prepublishOnly": "npm run build && npm run build-electron && npm run docgen"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.4.2",
-    "@capacitor/core": "^3.4.2",
+    "@capacitor/android": "^3.4.3",
+    "@capacitor/core": "^3.4.3",
     "@capacitor/docgen": "^0.0.17",
-    "@capacitor/ios": "^3.4.2",
+    "@capacitor/ios": "^3.4.3",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -74,7 +74,7 @@
     "typescript": "~4.0.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "~3.4.1"
+    "@capacitor/core": "~3.4.3"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",
@@ -93,6 +93,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^1.4.0"
+    "jeep-sqlite": "^1.5.0"
   }
 }