@capacitor-community/sqlite 5.5.2 → 5.6.1-1

package/ios/Plugin/CapacitorSQLite.swift

@@ -1012,7 +1012,6 @@ enum CapacitorSQLiteError: Error {
 
     // MARK: - deleteDatabase
 
-    // swiftlint:disable function_body_length
     // swiftlint:disable cyclomatic_complexity
     @objc func deleteDatabase(_ dbName: String, readonly: Bool) throws {
         guard isInit else {
@@ -1032,8 +1031,9 @@ enum CapacitorSQLiteError: Error {
             if !mDb.isDBOpen() {
                 // check the state of the DB
                 let state: State = UtilsSQLCipher.getDatabaseState(databaseLocation: databaseLocation, databaseName: "\(mDbName)SQLite.db", account: account)
-                if !isEncryption &&  (state.rawValue == "ENCRYPTEDGLOBALSECRET" ||
-                                        state.rawValue == "ENCRYPTEDSECRET") {
+                if !isEncryption && 
+                        (state.rawValue == "ENCRYPTEDGLOBALSECRET" ||
+                         state.rawValue == "ENCRYPTEDSECRET") {
                     var msg = "Cannot delete an Encrypted database with "
                     msg += "No Encryption set in capacitor.config"
                     throw CapacitorSQLiteError.failed(message: msg)
@@ -1067,7 +1067,6 @@ enum CapacitorSQLiteError: Error {
         }
     }
     // swiftlint:enable cyclomatic_complexity
-    // swiftlint:enable function_body_length
 
     // MARK: - isJsonValid
 

package/ios/Plugin/Utils/UtilsDelete.swift

@@ -290,7 +290,7 @@ class UtilsDelete {
         var relatedItems: [[String: Any]] = []
         var key: String = ""
         let t1Names = withRefsNames.map { "t1.\($0)" }
-        let t2Names = colNames.map{ "t2.\($0)" }
+        let t2Names = colNames.map { "t2.\($0)" }
 
         do {
             var whereClause = try UtilsSQLStatement

package/ios/Plugin/Utils/UtilsSQLCipher.swift

@@ -447,7 +447,7 @@ class UtilsSQLCipher {
             msg.append("Database not opened")
             throw UtilsSQLCipherError.prepareSQL(message: msg)
         }
-//        let systemVersion = UIDevice.current.systemVersion
+        //        let systemVersion = UIDevice.current.systemVersion
         var runSQLStatement: OpaquePointer?
         var message: String = ""
         var lastId: Int64 = -1
@@ -554,7 +554,6 @@ class UtilsSQLCipher {
             return (lastId, result)
         }
     }
-    
 
     // MARK: - returningWorkAround
 

package/ios/Plugin/Utils/UtilsSQLStatement.swift

@@ -327,51 +327,49 @@ class UtilsSQLStatement {
 
     class func isReturning(sqlStmt: String) -> (Bool, String, String) {
         var stmt = sqlStmt.replacingOccurrences(of: "\n", with: "")
-                          .trimmingCharacters(in: .whitespacesAndNewlines)
+            .trimmingCharacters(in: .whitespacesAndNewlines)
         if stmt.hasSuffix(";") {
             // Remove the suffix
             stmt = String(stmt.dropLast())
-                        .trimmingCharacters(in: .whitespacesAndNewlines)
+                .trimmingCharacters(in: .whitespacesAndNewlines)
         }
 
-        switch (stmt.prefix(6).uppercased())  {
-            
-          case "INSERT":
+        switch stmt.prefix(6).uppercased() {
+
+        case "INSERT":
             if let valuesIndex = stmt.range(of: "VALUES", options: .caseInsensitive)?.lowerBound,
                let closingParenthesisIndex = stmt.range(of: ")", options: .backwards, range: valuesIndex..<stmt.endIndex)?.upperBound {
-                    guard closingParenthesisIndex < stmt.endIndex else {
-                        stmt += ";"
-                        return (false, stmt, "")
-                    }
+                guard closingParenthesisIndex < stmt.endIndex else {
+                    stmt += ";"
+                    return (false, stmt, "")
+                }
 
-                    let intParenthesisValue = stmt.distance(from: stmt.startIndex, to: closingParenthesisIndex)
-                    let substringAfterValues = stmt[closingParenthesisIndex...]
-                    var resultString = String(substringAfterValues)
-                                .trimmingCharacters(in: .whitespacesAndNewlines)
-                    if resultString.count > 0 && !resultString.hasSuffix(";") {
-                        resultString += ";"
-                    }
+                let intParenthesisValue = stmt.distance(from: stmt.startIndex, to: closingParenthesisIndex)
+                let substringAfterValues = stmt[closingParenthesisIndex...]
+                var resultString = String(substringAfterValues)
+                    .trimmingCharacters(in: .whitespacesAndNewlines)
+                if resultString.count > 0 && !resultString.hasSuffix(";") {
+                    resultString += ";"
+                }
 
-                    let substringStartToEndParenthesis = stmt[...closingParenthesisIndex]
-                    let stmtString = String(substringStartToEndParenthesis)
-                                .trimmingCharacters(in: .whitespacesAndNewlines)
-                                .appending(";")
+                let substringStartToEndParenthesis = stmt[...closingParenthesisIndex]
+                let stmtString = String(substringStartToEndParenthesis)
+                    .trimmingCharacters(in: .whitespacesAndNewlines)
+                    .appending(";")
 
-                    if substringAfterValues.lowercased().contains("returning") {
-                        return (true,stmtString,resultString)
-                    } else {
-                        return (false, stmt, "")
-                    }
+                if substringAfterValues.lowercased().contains("returning") {
+                    return (true, stmtString, resultString)
+                } else {
+                    return (false, stmt, "")
                 }
-                return (false, stmt, "")
-            
-            
-          case "DELETE", "UPDATE":
+            }
+            return (false, stmt, "")
+
+        case "DELETE", "UPDATE":
             let words = stmt.components(separatedBy: .whitespacesAndNewlines)
             var wordsBeforeReturning: [String] = []
             var returningString: [String] = []
 
-
             var isReturningOutsideMessage = false
             for word in words {
                 if word.lowercased() == "returning" {
@@ -387,7 +385,7 @@ class UtilsSQLStatement {
                 let joinedWords = wordsBeforeReturning.joined(separator: " ") + ";"
                 var joinedReturningString = returningString.joined(separator: " ")
                 if joinedReturningString.count > 0 &&
-                            !joinedReturningString.hasSuffix(";") {
+                    !joinedReturningString.hasSuffix(";") {
                     joinedReturningString += ";"
                 }
 
@@ -395,11 +393,11 @@ class UtilsSQLStatement {
             } else {
                 return (false, stmt, "")
             }
-            
-          default:
+
+        default:
             return (false, stmt, "")
         }
-        
+
     }
 
     // MARK: - wordsAfter
@@ -410,13 +408,13 @@ class UtilsSQLStatement {
         }
         return Array(words.suffix(from: index + 1))
     }
-    
+
     // MARK: - getStmtAndRetColNames
 
     class func getStmtAndRetColNames(sqlStmt: String, retMode: String)
     -> [String: String] {
         var retStmtNames: [String: String] = [:]
-        
+
         let (isReturning, stmt, suffix) = isReturning(sqlStmt: sqlStmt)
         retStmtNames["stmt"] = stmt
         retStmtNames["names"] = ""
@@ -426,7 +424,7 @@ class UtilsSQLStatement {
                 let substring = suffix[returningIndex.upperBound...]
 
                 let names =
-                "\(substring)".trimmingLeadingAndTrailingSpaces()
+                    "\(substring)".trimmingLeadingAndTrailingSpaces()
                 if names.suffix(1) == ";" {
                     retStmtNames["names"] = String(names.dropLast())
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "5.5.2",
+  "version": "5.6.1-1",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -59,11 +59,11 @@
     "prepublishOnly": "npm run build && npm run build-electron && npm run docgen"
   },
   "devDependencies": {
-    "@capacitor/android": "^5.5.1",
-    "@capacitor/cli": "^5.5.1",
-    "@capacitor/core": "^5.5.1",
+    "@capacitor/android": "^5.6.0",
+    "@capacitor/cli": "^5.6.0",
+    "@capacitor/core": "^5.6.0",
     "@capacitor/docgen": "^0.0.17",
-    "@capacitor/ios": "^5.5.1",
+    "@capacitor/ios": "^5.6.0",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -97,6 +97,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^2.5.8"
+    "jeep-sqlite": "^2.5.10"
   }
 }

package/src/definitions.ts

@@ -2207,7 +2207,6 @@ export class SQLiteDBConnection implements ISQLiteDBConnection {
     try {
       if (!this.readonly) {
         if (values && values.length > 0) {
-
           res = await this.sqlite.run({
             database: this.dbName,
             statement: statement,

package/src/web.ts

@@ -2,6 +2,7 @@ import { WebPlugin } from '@capacitor/core';
 
 import type {
   CapacitorSQLitePlugin,
+  capConnectionOptions,
   capAllConnectionsOptions,
   capChangeSecretOptions,
   capEchoOptions,
@@ -131,7 +132,7 @@ export class CapacitorSQLiteWeb
     return echoResult;
   }
 
-  async createConnection(options: capSQLiteOptions): Promise<void> {
+  async createConnection(options: capConnectionOptions): Promise<void> {
     this.ensureJeepSqliteIsAvailable();
     this.ensureWebstoreIsOpen();
 
@@ -204,6 +205,7 @@ export class CapacitorSQLiteWeb
     } catch (err) {
       throw new Error(`${err}`);
     }
+
   }
   async beginTransaction(options: capSQLiteOptions): Promise<capSQLiteChanges> {
     this.ensureJeepSqliteIsAvailable();
@@ -284,6 +286,7 @@ export class CapacitorSQLiteWeb
     } catch (err) {
       throw new Error(`${err}`);
     }
+
   }
 
   async executeSet(options: capSQLiteSetOptions): Promise<capSQLiteChanges> {
@@ -553,6 +556,7 @@ export class CapacitorSQLiteWeb
     }
   }
 
+
   ////////////////////////////////////
   ////// UNIMPLEMENTED METHODS
   ////////////////////////////////////