@capacitor-community/sqlite 5.6.1-2 → 5.6.1-4

package/ios/Plugin/ImportExportJson/ExportToJson.swift

@@ -1197,7 +1197,9 @@ class ExportToJson {
                 row.append(val)
             } else if values[pos][names[jpos]] is Int64 && (
                         INTEGERAFFINITY.contains(types[jpos].uppercased()) ||
-                            NUMERICAFFINITY.contains(types[jpos].uppercased())) {
+                        INTEGERAFFINITY.contains(types[jpos]
+                            .components(separatedBy: "(")[0].uppercased()) ||
+                        NUMERICAFFINITY.contains(types[jpos].uppercased())) {
                 guard let val = values[pos][names[jpos]] as? Int64
                 else {
                     throw ExportToJsonError.createValues(
@@ -1206,8 +1208,8 @@ class ExportToJson {
                 row.append(val)
             } else if values[pos][names[jpos]] is Int64 && (
                         REALAFFINITY.contains(types[jpos].uppercased())  ||
-                            NUMERICAFFINITY.contains(types[jpos]
-                                                        .components(separatedBy: "(")[0].uppercased())) {
+                        NUMERICAFFINITY.contains(types[jpos]
+                            .components(separatedBy: "(")[0].uppercased())) {
                 guard let val = values[pos][names[jpos]] as? Int64
                 else {
                     throw ExportToJsonError.createValues(
@@ -1217,18 +1219,26 @@ class ExportToJson {
             } else if values[pos][names[jpos]] is Double && (
                         REALAFFINITY.contains(types[jpos].uppercased()) ||
                             NUMERICAFFINITY.contains(types[jpos]
-                                                        .components(separatedBy: "(")[0].uppercased())) {
+                                .components(separatedBy: "(")[0].uppercased())) {
                 guard let val = values[pos][names[jpos]] as? Double
                 else {
                     throw ExportToJsonError.createValues(
                         message: "Error value must be double")
                 }
                 row.append(val)
+            } else if values[pos][names[jpos]] is [UInt8] &&
+                        BLOBAFFINITY.contains(types[jpos].uppercased()) {
+                guard let val = values[pos][names[jpos]] as? [UInt8]
+                else {
+                    throw ExportToJsonError.createValues(
+                        message: "Error value must be [UInt8]")
+                }
+                row.append(val)
 
             } else {
                 throw ExportToJsonError.createValues(
                     message: "Error value is not (string, nsnull," +
-                        "int64,double")
+                        "int64,double,[UInt8]) ")
             }
         }
         return row

package/ios/Plugin/ImportExportJson/JsonSQLite.swift

@@ -51,7 +51,7 @@ public struct JsonTable: Codable {
     var schema: [JsonColumn]?
     var indexes: [JsonIndex]?
     var triggers: [JsonTrigger]?
-    var values: [[UncertainValue<String, Int, Double>]]?
+    var values: [[UncertainValue<String, Int, Double, [UInt8]>]]?
 
     public func show() {
         print("name: \(name) ")
@@ -141,12 +141,13 @@ public struct JsonTrigger: Codable {
         print("logic: \(logic) ")
     }
 }
-public struct UncertainValue<T: Codable, U: Codable, V: Codable>: Codable {
+public struct UncertainValue<T: Codable, U: Codable, V: Codable, W: Codable>: Codable {
     public var tValue: T?
     public var uValue: U?
     public var vValue: V?
+    public var wValue: W?
     public var value: Any? {
-        return tValue ?? uValue ?? vValue
+        return tValue ?? uValue ?? vValue ?? wValue
     }
     public init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()
@@ -155,6 +156,9 @@ public struct UncertainValue<T: Codable, U: Codable, V: Codable>: Codable {
         if uValue == nil {
             vValue = try? container.decode(V.self)
         }
+        if vValue == nil {
+            wValue = try? container.decode(W.self)
+        }
     }
 }
 public struct JsonView: Codable {

package/ios/Plugin/Utils/UtilsBinding.swift

@@ -70,15 +70,12 @@ class UtilsBinding {
             sqlite3_bind_blob(handle, Int32(idx), data.bytes,
                               Int32(data.bytes.count), SQLITETRANSIENT)
         } else if let value = value {
-            let isDict = checkTypeDict(from: value)
-            if isDict {
-                
-                let sortedValues = extractSortedValues(from: value as! [String : Int])
+            if let dict = value as? [String: Int] {
+                let sortedValues = extractSortedValues(from: dict)
                 let data: Data = Data(sortedValues)
                 sqlite3_bind_blob(handle, Int32(idx), data.bytes,
-                                  Int32(data.bytes.count), SQLITETRANSIENT)
+                            Int32(data.bytes.count), SQLITETRANSIENT)
             }
-
         } else {
             throw UtilsSQLCipherError.bindFailed
         }

package/ios/Plugin/Utils/UtilsDelete.swift

@@ -374,7 +374,6 @@ class UtilsDelete {
 
     class func getCurrentTimeAsInteger() -> Int {
         let currentTime = Date().timeIntervalSince1970
-        print(">>>> in  getCurrentTimeAsInteger currentTime: \(currentTime)")
         return Int(currentTime)
     }
 

package/ios/Plugin/Utils/UtilsJson.swift

@@ -191,7 +191,7 @@ class UtilsJson {
 
     class func checkColumnTypes (
         mDB: Database, types: [String],
-        values: [UncertainValue<String, Int, Double>]) -> Bool {
+        values: [UncertainValue<String, Int, Double, [UInt8]>]) -> Bool {
         var isRetType: Bool = true
         for ipos in 0..<values.count {
             isRetType = UtilsJson.isType(
@@ -204,7 +204,7 @@ class UtilsJson {
     // MARK: - ImportFromJson - IsType
 
     class func isType(stype: String,
-                      avalue: UncertainValue<String, Int, Double>)
+                      avalue: UncertainValue<String, Int, Double, [UInt8]>)
     -> Bool {
         var ret: Bool = false
         // swiftlint:disable force_unwrapping
@@ -266,7 +266,7 @@ class UtilsJson {
     // MARK: - ImportFromJson - GetValuesFromRow
 
     class func getValuesFromRow(
-        rowValues: [ UncertainValue<String, Int, Double>]) -> [Any] {
+        rowValues: [ UncertainValue<String, Int, Double, [UInt8]>]) -> [Any] {
         var retArray: [Any] = []
         for ipos in 0..<rowValues.count {
             let value = rowValues[ipos].value
@@ -354,7 +354,7 @@ class UtilsJson {
 
     class func checkRowValidity(
         mDB: Database, jsonNamesTypes: JsonNamesTypes,
-        row: [UncertainValue<String, Int, Double>], pos: Int,
+        row: [UncertainValue<String, Int, Double, [UInt8]>], pos: Int,
         tableName: String) throws {
         if jsonNamesTypes.names.count != row.count {
             let message: String = """

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "5.6.1-2",
+  "version": "5.6.1-4",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",