Reactivate #416

Author: jberkel

Sources/SQLite/Core/Blob.swift

@@ -21,26 +21,55 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 //
+import Foundation
 
-public struct Blob {
+public final class Blob {
 
-    public let bytes: [UInt8]
+    public let data: NSData
 
-    public init(bytes: [UInt8]) {
-        self.bytes = bytes
+    public var bytes: UnsafeRawPointer {
+        data.bytes
     }
 
-    public init(bytes: UnsafeRawPointer, length: Int) {
-        let i8bufptr = UnsafeBufferPointer(start: bytes.assumingMemoryBound(to: UInt8.self), count: length)
-        self.init(bytes: [UInt8](i8bufptr))
+    public var length: Int {
+        data.count
     }
 
-    public func toHex() -> String {
-        bytes.map {
-            ($0 < 16 ? "0" : "") + String($0, radix: 16, uppercase: false)
-        }.joined(separator: "")
+    public convenience init(bytes: [UInt8]) {
+        let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: bytes.count)
+        for idx in 0..<bytes.count {
+            buffer.advanced(by: idx).pointee = bytes[idx]
+        }
+
+        let data = NSData(
+            bytesNoCopy: UnsafeMutableRawPointer(buffer),
+            length: bytes.count,
+            freeWhenDone: true
+        )
+        self.init(data: data)
     }
 
+    public convenience init(bytes: UnsafeRawPointer, length: Int) {
+        self.init(data: NSData(bytes: bytes, length: length))
+    }
+
+    public init(data: NSData) {
+        self.data = data
+    }
+
+    public func toHex() -> String {
+        let bytes = bytes.assumingMemoryBound(to: UInt8.self)
+
+        var hex = ""
+        for idx in 0..<length {
+            let byte = bytes.advanced(by: idx).pointee
+            if byte < 16 {
+                hex += "0"
+            }
+            hex += String(byte, radix: 16, uppercase: false)
+        }
+        return hex
+    }
 }
 
 extension Blob: CustomStringConvertible {

Sources/SQLite/Core/Connection.swift

@@ -741,7 +741,7 @@ extension Context {
     func set(result: Binding?) {
         switch result {
         case let blob as Blob:
-            sqlite3_result_blob(self, blob.bytes, Int32(blob.bytes.count), nil)
+            sqlite3_result_blob(self, blob.bytes, Int32(blob.length), nil)
         case let double as Double:
             sqlite3_result_double(self, double)
         case let int as Int64:

Sources/SQLite/Core/Statement.swift

@@ -103,7 +103,7 @@ public final class Statement {
         if value == nil {
             sqlite3_bind_null(handle, Int32(idx))
         } else if let value = value as? Blob {
-            sqlite3_bind_blob(handle, Int32(idx), value.bytes, Int32(value.bytes.count), SQLITE_TRANSIENT)
+            sqlite3_bind_blob(handle, Int32(idx), value.bytes, Int32(value.length), SQLITE_TRANSIENT)
         } else if let value = value as? Double {
             sqlite3_bind_double(handle, Int32(idx), value)
         } else if let value = value as? Int64 {

Sources/SQLite/Foundation.swift

@@ -31,13 +31,11 @@ extension Data: Value {
     }
 
     public static func fromDatatypeValue(_ dataValue: Blob) -> Data {
-        Data(dataValue.bytes)
+        dataValue.data as Data
     }
 
     public var datatypeValue: Blob {
-        withUnsafeBytes { (pointer: UnsafeRawBufferPointer) -> Blob in
-            Blob(bytes: pointer.baseAddress!, length: count)
-        }
+        Blob(data: self as NSData)
     }
 
 }

Tests/SQLiteTests/Core/BlobTests.swift

@@ -11,13 +11,19 @@ class BlobTests: XCTestCase {
 
     func test_init_array() {
         let blob = Blob(bytes: [42, 42, 42])
-        XCTAssertEqual(blob.bytes, [42, 42, 42])
+        XCTAssertEqual(blob.byteArray, [42, 42, 42])
     }
 
     func test_init_unsafeRawPointer() {
         let pointer = UnsafeMutablePointer<UInt8>.allocate(capacity: 3)
         pointer.initialize(repeating: 42, count: 3)
         let blob = Blob(bytes: pointer, length: 3)
-        XCTAssertEqual(blob.bytes, [42, 42, 42])
+        XCTAssertEqual(blob.byteArray, [42, 42, 42])
+    }
+}
+
+extension Blob {
+    var byteArray: [UInt8] {
+        [UInt8](data)
     }
 }

Tests/SQLiteTests/Core/StatementTests.swift

@@ -22,7 +22,7 @@ class StatementTests: SQLiteTestCase {
         let statement = try db.prepare("SELECT email FROM users")
         XCTAssert(try statement.step())
         let blob = statement.row[0] as Blob
-        XCTAssertEqual("[email protected]", String(bytes: blob.bytes, encoding: .utf8)!)
+        XCTAssertEqual("[email protected]", String(data: blob.data as Data, encoding: .utf8)!)
     }
 
     func test_zero_sized_blob_returns_null() throws {
@@ -31,7 +31,7 @@ class StatementTests: SQLiteTestCase {
         try db.run(blobs.create { $0.column(blobColumn) })
         try db.run(blobs.insert(blobColumn <- Blob(bytes: [])))
         let blobValue = try db.scalar(blobs.select(blobColumn).limit(1, offset: 0))
-        XCTAssertEqual([], blobValue.bytes)
+        XCTAssertEqual([], blobValue.byteArray)
     }
 
     func test_prepareRowIterator() throws {

Tests/SQLiteTests/FoundationTests.swift

@@ -5,7 +5,7 @@ class FoundationTests: XCTestCase {
     func testDataFromBlob() {
         let data = Data([1, 2, 3])
         let blob = data.datatypeValue
-        XCTAssertEqual([1, 2, 3], blob.bytes)
+        XCTAssertEqual([1, 2, 3], blob.byteArray)
     }
 
     func testBlobToData() {