Merge branch 'development' into sqlcipher-spm-upstream

groue · groue · commit a3036feb48ba · 2026-02-01T15:11:22.000+01:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "editor.formatOnSave": false,
+    "editor.insertSpaces": true,
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.trimAutoWhitespace": false
+}
diff --git a/GRDB/Core/DispatchQueueActor.swift b/GRDB/Core/DispatchQueueActor.swift
@@ -1,4 +1,8 @@
+#if os(Linux)
+@preconcurrency import Dispatch
+#else
 import Dispatch
+#endif
 
 /// An actor that runs in a DispatchQueue.
 ///
diff --git a/GRDB/Core/Support/CoreGraphics/CGFloat.swift b/GRDB/Core/Support/CoreGraphics/CGFloat.swift
@@ -1,5 +1,8 @@
 #if canImport(CoreGraphics)
 import CoreGraphics
+#elseif !canImport(Darwin)
+import Foundation
+#endif
 
 /// CGFloat adopts DatabaseValueConvertible
 extension CGFloat: DatabaseValueConvertible {
@@ -15,4 +18,3 @@ extension CGFloat: DatabaseValueConvertible {
         return CGFloat(double)
     }
 }
-#endif
diff --git a/GRDB/Core/Support/Foundation/Date.swift b/GRDB/Core/Support/Foundation/Date.swift
@@ -12,7 +12,6 @@ import GRDBSQLite
 
 import Foundation
 
-#if !os(Linux)
 /// NSDate is stored in the database using the format
 /// "yyyy-MM-dd HH:mm:ss.SSS", in the UTC time zone.
 extension NSDate: DatabaseValueConvertible {
@@ -41,7 +40,6 @@ extension NSDate: DatabaseValueConvertible {
         return cast(date)
     }
 }
-#endif
 
 /// Date is stored in the database using the format
 /// "yyyy-MM-dd HH:mm:ss.SSS", in the UTC time zone.
diff --git a/GRDB/Core/Support/Foundation/Decimal.swift b/GRDB/Core/Support/Foundation/Decimal.swift
@@ -1,4 +1,3 @@
-#if !os(Linux)
 // Import C SQLite functions
 #if GRDBCIPHER // CocoaPods (SQLCipher subspec)
 import SQLCipher
@@ -68,4 +67,3 @@ extension Decimal: StatementColumnConvertible {
 
 @usableFromInline
 let _posixLocale = Locale(identifier: "en_US_POSIX")
-#endif
diff --git a/GRDB/Core/Support/Foundation/NSData.swift b/GRDB/Core/Support/Foundation/NSData.swift
@@ -1,4 +1,3 @@
-#if !os(Linux)
 import Foundation
 
 /// NSData is convertible to and from DatabaseValue.
@@ -24,4 +23,3 @@ extension NSData: DatabaseValueConvertible {
         return cast(data)
     }
 }
-#endif
diff --git a/GRDB/Core/Support/Foundation/NSNumber.swift b/GRDB/Core/Support/Foundation/NSNumber.swift
@@ -1,4 +1,4 @@
-#if !os(Linux) && !os(Windows)
+#if !os(Windows)
 import Foundation
 
 private let integerRoundingBehavior = NSDecimalNumberHandler(
@@ -81,10 +81,18 @@ extension NSNumber: DatabaseValueConvertible {
     /// Otherwise, returns nil.
     public static func fromDatabaseValue(_ dbValue: DatabaseValue) -> Self? {
         switch dbValue.storage {
+        case .int64(let int64) where self is NSDecimalNumber.Type:
+            let number = NSDecimalNumber(value: int64)
+            return number as? Self
         case .int64(let int64):
-            return self.init(value: int64)
+            let number = NSNumber(value: int64)
+            return number as? Self
+        case .double(let double) where self is NSDecimalNumber.Type:
+            let number = NSDecimalNumber(value: double)
+            return number as? Self
         case .double(let double):
-            return self.init(value: double)
+            let number = NSNumber(value: double)
+            return number as? Self
         case let .string(string):
             // Must match Decimal.fromDatabaseValue(_:)
             guard let decimal = Decimal(string: string, locale: posixLocale) else { return nil }
diff --git a/GRDB/Core/Support/Foundation/NSString.swift b/GRDB/Core/Support/Foundation/NSString.swift
@@ -1,4 +1,3 @@
-#if !os(Linux)
 import Foundation
 
 /// NSString adopts DatabaseValueConvertible
@@ -24,4 +23,3 @@ extension NSString: DatabaseValueConvertible {
         return self.init(string: string)
     }
 }
-#endif
diff --git a/GRDB/Core/Support/Foundation/URL.swift b/GRDB/Core/Support/Foundation/URL.swift
@@ -1,12 +1,16 @@
 import Foundation
 
-#if !os(Linux) && !os(Windows)
+#if !os(Windows)
 /// NSURL stores its absoluteString in the database.
 extension NSURL: DatabaseValueConvertible {
     
     /// Returns a TEXT database value containing the absolute URL.
     public var databaseValue: DatabaseValue {
-        absoluteString?.databaseValue ?? .null
+        #if !canImport(Darwin)
+            absoluteString.databaseValue
+        #else
+            absoluteString?.databaseValue ?? .null
+        #endif
     }
     
     public static func fromDatabaseValue(_ dbValue: DatabaseValue) -> Self? {
diff --git a/GRDB/Core/Support/Foundation/UUID.swift b/GRDB/Core/Support/Foundation/UUID.swift
@@ -12,7 +12,7 @@ import GRDBSQLite
 
 import Foundation
 
-#if !os(Linux) && !os(Windows)
+#if !os(Windows)
 /// NSUUID adopts DatabaseValueConvertible
 extension NSUUID: DatabaseValueConvertible {
     /// Returns a BLOB database value containing the uuid bytes.
@@ -36,10 +36,17 @@ extension NSUUID: DatabaseValueConvertible {
         switch dbValue.storage {
         case .blob(let data) where data.count == 16:
             return data.withUnsafeBytes {
-                self.init(uuidBytes: $0.bindMemory(to: UInt8.self).baseAddress)
+                #if canImport(Darwin)
+                    self.init(uuidBytes: $0.bindMemory(to: UInt8.self).baseAddress)
+                #else
+                    guard let uuidBytes = $0.bindMemory(to: UInt8.self).baseAddress else {
+                        return nil as Self?
+                    }
+                    return NSUUID(uuidBytes: uuidBytes) as? Self
+                #endif
             }
         case .string(let string):
-            return self.init(uuidString: string)
+            return NSUUID(uuidString: string) as? Self
         default:
             return nil
         }
@@ -91,8 +98,8 @@ extension UUID: StatementColumnConvertible {
             self.init(uuid: uuid.uuid)
         case SQLITE_BLOB:
             guard sqlite3_column_bytes(sqliteStatement, index) == 16,
-                  let blob = sqlite3_column_blob(sqliteStatement, index) else
-            {
+                  let blob = sqlite3_column_blob(sqliteStatement, index)
+            else {
                 return nil
             }
             self.init(uuid: blob.assumingMemoryBound(to: uuid_t.self).pointee)
diff --git a/Package.swift b/Package.swift
@@ -15,6 +15,8 @@ let darwinPlatforms: [Platform] = [
 var swiftSettings: [SwiftSetting] = [
     .define("SQLITE_ENABLE_FTS5"),
     .define("SQLITE_ENABLE_SNAPSHOT"),
+    // Not all Linux distributions have support for WAL snapshots.
+    .define("SQLITE_DISABLE_SNAPSHOT", .when(platforms: [.linux])),
 ]
 var cSettings: [CSetting] = []
 var dependencies: [PackageDescription.Package.Dependency] = []
diff --git a/README.md b/README.md
@@ -100,7 +100,7 @@ try dbQueue.write { db in
 }
 
 try dbQueue.read { db in
-    let player = try Player.find(db, id: "1"))
+    let player = try Player.find(db, id: "1")
     
     let bestPlayers = try Player
         .order(\.score.desc)
diff --git a/Tests/GRDBTests/CGFloatTests.swift b/Tests/GRDBTests/CGFloatTests.swift
@@ -1,7 +1,12 @@
 import XCTest
-import CoreGraphics
 import GRDB
 
+#if canImport(CoreGraphics)
+import CoreGraphics
+#elseif !canImport(Darwin)
+import Foundation
+#endif
+
 class CGFloatTests: GRDBTestCase {
     
     func testCGFLoat() throws {
diff --git a/Tests/GRDBTests/DatabaseErrorTests.swift b/Tests/GRDBTests/DatabaseErrorTests.swift
@@ -216,6 +216,9 @@ class DatabaseErrorTests: GRDBTestCase {
     }
     
     func testNSErrorBridging() throws {
+#if !canImport(Darwin)
+        throw XCTSkip("NSError bridging not available on non-Darwin platforms")
+#else
         let dbQueue = try makeDatabaseQueue()
         try dbQueue.inDatabase { db in
             try db.create(table: "parents") { $0.column("id", .integer).primaryKey() }
@@ -229,5 +232,6 @@ class DatabaseErrorTests: GRDBTestCase {
                 XCTAssertNotNil(error.localizedFailureReason)
             }
         }
+#endif
     }
 }
diff --git a/Tests/GRDBTests/DatabaseMigratorTests.swift b/Tests/GRDBTests/DatabaseMigratorTests.swift
@@ -10,6 +10,9 @@ class DatabaseMigratorTests : GRDBTestCase {
     }
     
     func testEmptyMigratorSync() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test(writer: some DatabaseWriter) throws {
             let migrator = DatabaseMigrator()
             try migrator.migrate(writer)
@@ -18,9 +21,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
     
     func testEmptyMigratorAsync() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test(writer: some DatabaseWriter) throws {
             let expectation = self.expectation(description: "")
             let migrator = DatabaseMigrator()
@@ -38,9 +45,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
     
     func testEmptyMigratorPublisher() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test(writer: some DatabaseWriter) throws {
             let migrator = DatabaseMigrator()
             let publisher = migrator.migratePublisher(writer)
@@ -51,9 +62,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
     
     func testNonEmptyMigratorSync() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test(writer: some DatabaseWriter) throws {
             var migrator = DatabaseMigrator()
             migrator.registerMigration("createPersons") { db in
@@ -95,9 +110,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
     
     func testNonEmptyMigratorAsync() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test(writer: some DatabaseWriter) throws {
             var migrator = DatabaseMigrator()
             migrator.registerMigration("createPersons") { db in
@@ -146,9 +165,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
     
     func testNonEmptyMigratorPublisher() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test(writer: some DatabaseWriter) throws {
             var migrator = DatabaseMigrator()
             migrator.registerMigration("createPersons") { db in
@@ -198,9 +221,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
 
     func testEmptyMigratorPublisherIsAsynchronous() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test(writer: some DatabaseWriter) throws {
             let migrator = DatabaseMigrator()
             let expectation = self.expectation(description: "")
@@ -220,9 +247,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
     
     func testNonEmptyMigratorPublisherIsAsynchronous() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test(writer: some DatabaseWriter) throws {
             var migrator = DatabaseMigrator()
             migrator.registerMigration("first", migrate: { _ in })
@@ -243,9 +274,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
     
     func testMigratorPublisherDefaultScheduler() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test<Writer: DatabaseWriter>(writer: Writer) {
             var migrator = DatabaseMigrator()
             migrator.registerMigration("first", migrate: { _ in })
@@ -268,9 +303,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
     
     func testMigratorPublisherCustomScheduler() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test<Writer: DatabaseWriter>(writer: Writer) {
             var migrator = DatabaseMigrator()
             migrator.registerMigration("first", migrate: { _ in })
@@ -294,9 +333,13 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
 
     func testMigrateUpTo() throws {
+#if !canImport(Combine)
+        throw XCTSkip("Combine not supported on this platform")
+#else
         func test(writer: some DatabaseWriter) throws {
             var migrator = DatabaseMigrator()
             migrator.registerMigration("a") { db in
@@ -345,6 +388,7 @@ class DatabaseMigratorTests : GRDBTestCase {
         try Test(test).run { try DatabaseQueue() }
         try Test(test).runAtTemporaryDatabasePath { try DatabaseQueue(path: $0) }
         try Test(test).runAtTemporaryDatabasePath { try DatabasePool(path: $0) }
+#endif
     }
     
     func testMigrationFailureTriggersRollback() throws {
diff --git a/Tests/GRDBTests/DatabasePoolConcurrencyTests.swift b/Tests/GRDBTests/DatabasePoolConcurrencyTests.swift
diff --git a/Tests/GRDBTests/DatabaseQueueTests.swift b/Tests/GRDBTests/DatabaseQueueTests.swift
diff --git a/Tests/GRDBTests/DatabaseRegionObservationTests.swift b/Tests/GRDBTests/DatabaseRegionObservationTests.swift
diff --git a/Tests/GRDBTests/DatabaseSnapshotTests.swift b/Tests/GRDBTests/DatabaseSnapshotTests.swift
diff --git a/Tests/GRDBTests/FailureTestCase.swift b/Tests/GRDBTests/FailureTestCase.swift
diff --git a/Tests/GRDBTests/ValueObservationRecorderTests.swift b/Tests/GRDBTests/ValueObservationRecorderTests.swift
diff --git a/Tests/GRDBTests/ValueObservationTests.swift b/Tests/GRDBTests/ValueObservationTests.swift

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`#if canImport(CoreGraphics)`
`2`	`2`	`import CoreGraphics`
	`3`	`+#elseif !canImport(Darwin)`
	`4`	`+import Foundation`
	`5`	`+#endif`
`3`	`6`
`4`	`7`	`/// CGFloat adopts DatabaseValueConvertible`
`5`	`8`	`extension CGFloat: DatabaseValueConvertible {`
`@@ -15,4 +18,3 @@ extension CGFloat: DatabaseValueConvertible {`
`15`	`18`	`return CGFloat(double)`
`16`	`19`	`}`
`17`	`20`	`}`
`18`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import GRDBSQLite`
`12`	`12`
`13`	`13`	`import Foundation`
`14`	`14`
`15`		`-#if !os(Linux)`
`16`	`15`	`/// NSDate is stored in the database using the format`
`17`	`16`	`/// "yyyy-MM-dd HH:mm:ss.SSS", in the UTC time zone.`
`18`	`17`	`extension NSDate: DatabaseValueConvertible {`
`@@ -41,7 +40,6 @@ extension NSDate: DatabaseValueConvertible {`
`41`	`40`	`return cast(date)`
`42`	`41`	`}`
`43`	`42`	`}`
`44`		`-#endif`
`45`	`43`
`46`	`44`	`/// Date is stored in the database using the format`
`47`	`45`	`/// "yyyy-MM-dd HH:mm:ss.SSS", in the UTC time zone.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#if !os(Linux)`
`2`	`1`	`import Foundation`
`3`	`2`
`4`	`3`	`/// NSData is convertible to and from DatabaseValue.`
`@@ -24,4 +23,3 @@ extension NSData: DatabaseValueConvertible {`
`24`	`23`	`return cast(data)`
`25`	`24`	`}`
`26`	`25`	`}`
`27`		`-#endif`