Merge pull request #11 from sroebert/bugfix/utf8-binding

Fixed correct utf8 length when binding string
vapor · Oct 24, 2016 · 45ca240 · 45ca240
2 parents 49288db + 964470b
commit 45ca240
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Sources/SQLite/SQLite.swift b/Sources/SQLite/SQLite.swift
@@ -221,7 +221,7 @@ extension SQLite {
         }
 
         public func bind(_ value: String) throws {
-            let strlen = Int32(value.utf8CString.count)
+            let strlen = Int32(value.utf8.count)
             if sqlite3_bind_text(pointer, nextBindPosition, value, strlen, SQLITE_TRANSIENT) != SQLITE_OK {
                 throw SQLiteError.bind(database.errorMessage)
             }

diff --git a/Tests/SQLiteTests/SQLite3Tests.swift b/Tests/SQLiteTests/SQLite3Tests.swift
@@ -59,10 +59,15 @@ class SQLite3Tests: XCTestCase {
             try _ = database.execute("INSERT INTO `foo` VALUES(?)") { statement in
                 try statement.bind(unicode)
             }
-
-            if let results = try database.execute("SELECT * FROM `foo`").first {
-                XCTAssertEqual(results.data["bar"], unicode)
-            }
+
+            let selectAllResults = try database.execute("SELECT * FROM `foo`").first
+            XCTAssertNotNil(selectAllResults)
+            XCTAssertEqual(selectAllResults!.data["bar"], unicode)
+
+            let selectWhereResults = try database.execute("SELECT * FROM `foo` WHERE bar = '\(unicode)'").first
+            XCTAssertNotNil(selectWhereResults)
+            XCTAssertEqual(selectWhereResults!.data["bar"], unicode)
+
         } catch {
             XCTFail(error.localizedDescription)
         }