@capacitor-community/sqlite 5.6.1 → 5.6.2

package/ios/Plugin/Utils/UtilsSQLCipher.swift

@@ -463,7 +463,7 @@ class UtilsSQLCipher {
                 retMode = "wA\(retMode)"
             }
         }
-        if (retMode == "no" || retMode.prefix(2) == "wA")/* && isReturning*/ {
+        if (retMode == "no" || retMode.prefix(2) == "wA") {
             let stmtNames = UtilsSQLStatement
                 .getStmtAndRetColNames(sqlStmt: sqlStmt,
                                        retMode: retMode)
@@ -834,6 +834,12 @@ class UtilsSQLCipher {
         return Int(sqlite3_total_changes(mDB))
     }
 
+    // MARK: - dbLastId
+    
+    class func dbLastId(mDB: OpaquePointer?) -> Int64 {
+        return Int64(sqlite3_last_insert_rowid(mDB))
+    }
+
     // MARK: - Execute
 
     // swiftlint:disable function_body_length
@@ -970,17 +976,17 @@ class UtilsSQLCipher {
                         }
                     }
                 } else {
-                    let resp = try UtilsSQLCipher
-                        .prepareSQL(mDB: mDB, sql: sql, values: values,
-                                    fromJson: false, returnMode: returnMode)
-                    lastId = resp.0
-                    respSet = resp.1
-                    if  lastId == -1 {
-                        let message: String = "lastId < 0"
-                        throw UtilsSQLCipherError.executeSet(
-                            message: message)
-                    }
-                    response = addToResponse(response: response, respSet: respSet)
+                        let resp = try UtilsSQLCipher
+                            .prepareSQL(mDB: mDB, sql: sql, values: values,
+                                        fromJson: false, returnMode: returnMode)
+                        lastId = resp.0
+                        respSet = resp.1
+                        if  lastId == -1 {
+                            let message: String = "lastId < 0"
+                            throw UtilsSQLCipherError.executeSet(
+                                message: message)
+                        }
+                        response = addToResponse(response: response, respSet: respSet)
                 }
             }
 

package/ios/Plugin/Utils/UtilsSQLStatement.swift

@@ -326,8 +326,7 @@ class UtilsSQLStatement {
     // MARK: - isReturning
 
     class func isReturning(sqlStmt: String) -> (Bool, String, String) {
-        var stmt = sqlStmt.replacingOccurrences(of: "\n", with: "")
-            .trimmingCharacters(in: .whitespacesAndNewlines)
+        var stmt = sqlStmt.trimmingCharacters(in: .whitespacesAndNewlines)
         if stmt.hasSuffix(";") {
             // Remove the suffix
             stmt = String(stmt.dropLast())
@@ -360,10 +359,10 @@ class UtilsSQLStatement {
                 if substringAfterValues.lowercased().contains("returning") {
                     return (true, stmtString, resultString)
                 } else {
-                    return (false, stmt, "")
+                    return (false, sqlStmt, "")
                 }
             }
-            return (false, stmt, "")
+            return (false, sqlStmt, "")
 
         case "DELETE", "UPDATE":
             let words = stmt.components(separatedBy: .whitespacesAndNewlines)
@@ -391,11 +390,11 @@ class UtilsSQLStatement {
 
                 return (true, joinedWords, joinedReturningString)
             } else {
-                return (false, stmt, "")
+                return (false, sqlStmt, "")
             }
 
         default:
-            return (false, stmt, "")
+            return (false, sqlStmt, "")
         }
 
     }
@@ -425,14 +424,37 @@ class UtilsSQLStatement {
 
                 let names =
                     "\(substring)".trimmingLeadingAndTrailingSpaces()
-                if names.suffix(1) == ";" {
-                    retStmtNames["names"] = String(names.dropLast())
-                }
+                retStmtNames["names"] = getNames(from: names)
             }
         }
         return retStmtNames
     }
 
+    // MARK: - getNames
+    
+    class func getNames(from input: String) -> String {
+        // Find the index of the first occurrence of ";", "--", or "/*"
+        let indexSemicolon = input.firstIndex(of: ";")
+        let indexDoubleDash = input.range(of: "--")
+        let indexCommentStart = input.range(of: "/*")
+        
+        // Find the minimum index among them
+        var minIndex = input.endIndex
+        if let index = indexSemicolon {
+            minIndex = min(minIndex, index)
+        }
+        if let index = indexDoubleDash?.lowerBound {
+            minIndex = min(minIndex, index)
+        }
+        if let index = indexCommentStart?.lowerBound {
+            minIndex = min(minIndex, index)
+        }
+        
+        // Extract substring up to the minimum index
+        let colnames = String(input[..<minIndex]).trimmingCharacters(in: .whitespacesAndNewlines)
+        return colnames
+    }
+    
     // MARK: - extractCombinedPrimaryKey
 
     class func extractCombinedPrimaryKey(from whereClause: String)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "5.6.1",
+  "version": "5.6.2",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -97,6 +97,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^2.5.10"
+    "jeep-sqlite": "^2.6.0"
   }
 }