Updated Fixes for the Linux version of GRDB

.github/workflows/ubuntu-ci.yml

@@ -0,0 +1,97 @@
+# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
+
+name: "Linux CI"
+
+on:
+  push:
+    branches: 
+      - master
+      - development
+      - grdb_linux_changes
+    paths:
+      - 'GRDB/**'
+      - 'Tests/**'
+      - '.github/workflows/**'
+      - 'Makefile'
+      - 'Package.swift'
+      - 'SQLiteCustom/src'
+  pull_request:
+    paths:
+      - 'GRDB/**'
+      - 'Tests/**'
+      - '.github/workflows/**'
+      - 'Makefile'
+      - 'Package.swift'
+      - 'SQLiteCustom/src'
+
+concurrency: 
+  group: ${{ github.ref_name }}
+  cancel-in-progress: false
+permissions:
+  contents: read
+
+jobs:
+  build-and-test-on-linux:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        swift: ["6.2", "6.1"]
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v5
+
+      - name: Install Swift Dependencies
+        run: | 
+          sudo apt-get update 
+          sudo apt-get install -y \
+          binutils \
+          git \
+          gnupg2 \
+          libc6-dev \
+          libcurl4-openssl-dev \
+          libedit2 \
+          libgcc-13-dev \
+          libpython3-dev \
+          libsqlite3-0 \
+          libstdc++-13-dev \
+          libxml2-dev \
+          libz3-dev \
+          pkg-config \
+          python3-lldb \
+          tzdata \
+          unzip \
+          zip \
+          zlib1g-dev \
+          wget \
+          curl \
+          ca-certificates \
+          util-linux
+
+      - name: Cache Swiftly toolchains
+        id: cache-swiftly
+        uses: actions/cache@v4
+        with:
+          path: ${SWIFTLY_HOME_DIR:-$HOME/.local/share/swiftly}
+          key: swiftly-${{ matrix.os }}-${{ matrix.swift }}
+
+      - name: Install Swift Using Swiftly  
+        if: steps.cache-swiftly.outputs.cache-hit != 'true'
+        run: |
+          curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz
+          tar zxf swiftly-$(uname -m).tar.gz
+          ./swiftly init --quiet-shell-followup -y --skip-install
+          . "${SWIFTLY_HOME_DIR:-$HOME/.local/share/swiftly}/env.sh"
+          hash -r
+          swiftly install ${{ matrix.swift }} --assume-yes --use
+          . "${SWIFTLY_HOME_DIR:-$HOME/.local/share/swiftly}/env.sh"  
+
+      - name: Build SPM Package
+        run: |
+          swift build -c release
+
+      - name: Run tests
+        run: |
+          swift test -c release

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "editor.formatOnSave": false,
+    "editor.insertSpaces": true,
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.trimAutoWhitespace": false
+}

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.
 ///

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

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.

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

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

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 }

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

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? {

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)

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] = []

README.md

@@ -13,6 +13,7 @@
     <a href="https://developer.apple.com/swift/"><img alt="Swift 6.1" src="https://img.shields.io/badge/swift-6.1-orange.svg?style=flat"></a>
     <a href="https://github.com/groue/GRDB.swift/blob/master/LICENSE"><img alt="License" src="https://img.shields.io/github/license/groue/GRDB.swift.svg?maxAge=2592000"></a>
     <a href="https://github.com/groue/GRDB.swift/actions/workflows/CI.yml"><img alt="CI Status" src="https://github.com/groue/GRDB.swift/actions/workflows/CI.yml/badge.svg?branch=master"></a>
+    <a href="https://github.com/groue/GRDB.swift/actions/workflows/ubuntu-ci.yml"><img alt="Linux Status" src="https://github.com/groue/GRDB.swift/actions/workflows/ubuntu-ci.yml/badge.svg?branch=master"></a>
 </p>
 
 ---

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 {

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
     }
 }