Merge pull request #428 from groue/feature/SQLite-3.25.2

Upgrade custom SQLite builds to version 3.25.2
groue · Oct 8, 2018 · 35e1de4 · 35e1de4
2 parents 1c5cecf + 697709c
commit 35e1de4
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ This release comes with **Association Aggregates**. They let you compute values
 
 - [#422](https://github.com/groue/GRDB.swift/pull/422): Refining Association Requests
 - [#423](https://github.com/groue/GRDB.swift/pull/423): Association Aggregates
+- [#428](https://github.com/groue/GRDB.swift/pull/428): Upgrade custom SQLite builds to version 3.25.2 (thanks to [@swiftlyfalling](https://github.com/swiftlyfalling/SQLiteLib))
 
 
 ### Documentation Diff

diff --git a/Documentation/CustomSQLiteBuilds.md b/Documentation/CustomSQLiteBuilds.md
@@ -3,7 +3,7 @@ Custom SQLite Builds
 
 By default, GRDB uses the version of SQLite that ships with the target operating system.
 
-**You can build GRDB with a custom build of [SQLite 3.24.0](https://www.sqlite.org/changes.html).**
+**You can build GRDB with a custom build of [SQLite 3.25.2](https://www.sqlite.org/changes.html).**
 
 A custom SQLite build can activate extra SQLite features, and extra GRDB features as well, such as support for the [FTS5 full-text search engine](../../../#full-text-search), and [SQLite Pre-Update Hooks](../../../#support-for-sqlite-pre-update-hooks).
 

diff --git a/README.md b/README.md
@@ -311,7 +311,7 @@ Installation
 
 See [Encryption](#encryption) for the installation procedure of GRDB with SQLCipher.
 
-See [Custom SQLite builds](Documentation/CustomSQLiteBuilds.md) for the installation procedure of GRDB with a customized build of SQLite 3.24.0.
+See [Custom SQLite builds](Documentation/CustomSQLiteBuilds.md) for the installation procedure of GRDB with a customized build of SQLite 3.25.2.
 
 See [Enabling FTS5 Support](#enabling-fts5-support) for the installation procedure of GRDB with support for the FTS5 full-text engine.
 

diff --git a/SQLiteCustom/src b/SQLiteCustom/src
diff --git a/Tests/GRDBTests/DatabaseLogErrorTests.swift b/Tests/GRDBTests/DatabaseLogErrorTests.swift
@@ -12,9 +12,11 @@ class DatabaseLogErrorTests: GRDBTestCase {
     func testErrorLog() throws {
         let dbQueue = try makeDatabaseQueue()
         dbQueue.inDatabase { db in
-            _ = try? db.execute("That's not SQL.")
+            _ = try? db.execute("Abracadabra")
         }
         XCTAssertEqual(lastResultCode!, ResultCode.SQLITE_ERROR)
-        XCTAssertEqual(lastMessage!, "near \"That\": syntax error")
+        // Don't check for exact error message because it depends on SQLite version
+        XCTAssert(lastMessage!.contains("syntax error"))
+        XCTAssert(lastMessage!.contains("Abracadabra"))
     }
 }
diff --git a/Tests/GRDBTests/DatabasePoolConcurrencyTests.swift b/Tests/GRDBTests/DatabasePoolConcurrencyTests.swift
@@ -947,7 +947,6 @@ class DatabasePoolConcurrencyTests: GRDBTestCase {
             }
             do {
                 try future.wait()
-                XCTFail("Expected error")
             } catch let error as DatabaseError {
                 XCTAssertEqual(error.resultCode, .SQLITE_BUSY)
                 XCTAssertEqual(error.message!, "database is locked")