GRDB3

.swift-version

@@ -1 +1 @@
-4.0
+4.1

.travis.yml

@@ -26,36 +26,36 @@ jobs:
     ###########################################
     ## Test RxGRDB
 
-    # Test RxGRDBmacOS (Xcode 9.1)
+    # Test RxGRDBmacOS (Xcode 9.3)
     - stage: Test RxGRDB
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode9.1
+      osx_image: xcode9.3
       env:
-        - TID=RxGRDBOSX (Xcode 9.1, macOS)
+        - TID=RxGRDBOSX (Xcode 9.3, macOS)
       script: make test_framework_RxGRDBmacOS
 
-    # Test RxGRDBiOS (Xcode 9.1, iOS <MAXIMUM VERSION>)
+    # Test RxGRDBiOS (Xcode 9.3, iOS <MAXIMUM VERSION>)
     - stage: Test RxGRDB
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode9.1
+      osx_image: xcode9.3
       env:
-        - TID=RxGRDBiOS (Xcode 9.1, iOS <MAX>)
+        - TID=RxGRDBiOS (Xcode 9.3, iOS <MAX>)
       script: make test_framework_RxGRDBiOS_maxTarget
 
-    # Test RxGRDBiOS (Xcode 9.1, iOS <MINIMUM VERSION>))
+    # Test RxGRDBiOS (Xcode 9.3, iOS <MINIMUM VERSION>))
     - stage: Test RxGRDB
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode9.1
+      osx_image: xcode9.3
       env:
-        - TID=RxGRDBiOS (Xcode 9.1, iOS <MIN>)
+        - TID=RxGRDBiOS (Xcode 9.3, iOS <MIN>)
       script: make test_framework_RxGRDBiOS_minTarget
 
     ###########################################
     ## Test Installation Methods
 
     # Cocoapods Lint
     - stage: Test Installation
-      osx_image: xcode9.1
+      osx_image: xcode9.3
       install:
         - gem install cocoapods # Since Travis is not always on latest version
       env:

CHANGELOG.md

@@ -1,6 +1,34 @@
 Release Notes
 =============
 
+## 0.11.0
+
+Released June 7, 2018 • [diff](https://github.com/RxSwiftCommunity/RxGRDB/compare/v0.10.0...v0.11.0)
+
+### New
+
+- Support for GRDB 3.0
+- The new DatabaseRegionConvertible protocol allows better request encapsulation ([documentation](README.md#databaseregionconvertible-protocol))
+
+### Breaking Changes
+
+- "Fetch tokens" and the `mapFetch` operator were ill-advised, and have been removed. Now please use the new `DatabaseWriter.fetch(from:startImmediately:scheduler:values:)` method instead, which produces exactly the same observable:
+
+    ```diff
+     // Old way
+    -let values = dbQueue.rx
+    -    .fetchTokens(in: [request, ...])
+    -    .mapFetch { db in
+    -        try fetchResults(db)
+    -    }
+
+     // New way
+    +let values = dbQueue.rx.fetch(from: [request, ...]) { db in
+    +    try fetchResults(db)
+    +}
+    ```
+
+
 ## 0.10.0
 
 Released March 26, 2018 • [diff](https://github.com/RxSwiftCommunity/RxGRDB/compare/v0.9.0...v0.10.0)

Documentation/Playgrounds/RxGRDB.playground/Contents.swift

@@ -1,35 +1,54 @@
-//: Playground - noun: a place where people can play
-
+//: To run this playground:
+//:
+//: - Run `pod install` in the terminal
+//: - Open RxGRDB.xcworkspace
+//: - Select the RxGRDBmacOS scheme: menu Product > Scheme > RxGRDBmacOS
+//: - Build: menu Product > Build
+//: - Select the playground in the Playgrounds Group
+//: - Run the playground
 import GRDB
 import RxGRDB
+import PlaygroundSupport
+PlaygroundPage.current.needsIndefiniteExecution = true
 
+//: Create a database:
 let dbQueue = DatabaseQueue()
-try dbQueue.inDatabase { db in
-    try db.create(table: "persons") { t in
-        t.column("id", .integer).primaryKey()
-        t.column("name", .text)
+try dbQueue.write { db in
+    try db.create(table: "player") { t in
+        t.autoIncrementedPrimaryKey("id")
+        t.column("name", .text).notNull()
+        t.column("score", .integer).notNull()
+    }
+}
+
+//: Define a Player record:
+struct Player: Codable, FetchableRecord, MutablePersistableRecord {
+    var id: Int64?
+    var name: String
+    var score: Int
+
+    static let databaseTableName = "player"
+    mutating func didInsert(with rowID: Int64, for column: String?) {
+        id = rowID
     }
 }
 
-let request = SQLRequest("SELECT * FROM persons")
-request.rx
-    .changes(in: dbQueue)
-    .subscribe(onNext: { db in
-        let count = try! request.fetchCount(db)
-        print("Number of persons: \(count)")
+//: Track the number of players:
+Player.all().rx
+    .fetchCount(in: dbQueue)
+    .subscribe(onNext: { count in
+        print("Number of players: \(count)")
     })
-// Prints "Number of persons: 0"
 
-try dbQueue.inDatabase { db in
-    try db.execute("INSERT INTO persons (name) VALUES (?)", arguments: ["Arthur"])
-    // Prints "Number of persons: 1"
-    try db.execute("INSERT INTO persons (name) VALUES (?)", arguments: ["Barbara"])
-    // Prints "Number of persons: 2"
+//: Modify the database:
+try dbQueue.write { db in
+    var player = Player(id: nil, name: "Arthur", score: 100)
+    try player.insert(db)
 }
 
-try dbQueue.inTransaction { db in
-    try db.execute("INSERT INTO persons (name) VALUES (?)", arguments: ["Craig"])
-    try db.execute("INSERT INTO persons (name) VALUES (?)", arguments: ["David"])
-    return .commit
+try dbQueue.write { db in
+    var player = Player(id: nil, name: "Barbara", score: 250)
+    try player.insert(db)
+    player = Player(id: nil, name: "Craig", score: 150)
+    try player.insert(db)
 }
-// Prints "Number of persons: 4"

Documentation/Playgrounds/RxGRDB.playground/contents.xcplayground

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='macos'>
+<playground version='5.0' target-platform='macos' display-mode='rendered'>
     <timeline fileName='timeline.xctimeline'/>
 </playground>

Documentation/RxGRDBDemo/RxGRDBDemo.xcodeproj/project.pbxproj

@@ -129,7 +129,6 @@
 				56E1F9771F8101EE00793BFA /* Resources */,
 				569E8501200A5C720028D1EC /* Embed Frameworks */,
 				B0756943CADD6226BB774BD5 /* [CP] Embed Pods Frameworks */,
-				141918CC9EFD532C181264F0 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -188,21 +187,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		141918CC9EFD532C181264F0 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../../Pods/Target Support Files/Pods-RxGRDBDemo/Pods-RxGRDBDemo-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		95963AD3C11B669F6A76FFF0 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Documentation/RxGRDBDemo/RxGRDBDemo/AppDatabase.swift

@@ -24,14 +24,14 @@ struct AppDatabase {
         var migrator = DatabaseMigrator()
 
         migrator.registerMigration("v1.0") { db in
-            try db.create(table: "players") { t in
-                t.column("id", .integer).primaryKey()
+            try db.create(table: "player") { t in
+                t.autoIncrementedPrimaryKey("id")
                 t.column("name", .text).notNull().collate(.localizedCaseInsensitiveCompare)
                 t.column("score", .integer).notNull()
             }
 
-            try db.create(table: "places") { t in
-                t.column("id", .integer).primaryKey()
+            try db.create(table: "place") { t in
+                t.autoIncrementedPrimaryKey("id")
                 t.column("latitude", .double).notNull()
                 t.column("longitude", .double).notNull()
             }

Documentation/RxGRDBDemo/RxGRDBDemo/Place.swift

@@ -27,27 +27,25 @@ struct Place: Codable {
     }
 }
 
-// Define colums so that we can build GRDB requests
-extension Place {
-    enum Columns {
-        static let id = Column("id")
-    }
-}
-
 // Adopt RowConvertible so that we can fetch places from the database.
 // Implementation is automatically derived from Codable.
-extension Place: RowConvertible { }
+extension Place: FetchableRecord { }
 
 // Adopt MutablePersistable so that we can create/update/delete places in the database.
 // Implementation is partially derived from Codable.
-extension Place: MutablePersistable {
-    static let databaseTableName = "places"
+extension Place: MutablePersistableRecord {
+    static let databaseTableName = "place"
+
+    enum Columns: String, ColumnExpression {
+        case id, latitude, longitude
+    }
+
     mutating func didInsert(with rowID: Int64, for column: String?) {
         id = rowID
     }
 }
 
-// Support for place randomization
+// Place randomization
 extension Place {
     static func randomCoordinate() -> CLLocationCoordinate2D {
         let paris = CLLocationCoordinate2D(latitude: 48.8534100, longitude: 2.3488000)

Documentation/RxGRDBDemo/RxGRDBDemo/PlaceAnnotation.swift

@@ -23,20 +23,19 @@ final class PlaceAnnotation: NSObject, MKAnnotation {
     }
 }
 
-// Have PlaceAnnotation adopt RowConvertible, Persistable, and Diffable, so
-// that it can feed the `primaryKeySortedDiff` observable.
+// Have PlaceAnnotation adopt FetchableRecord and PersistableRecord, so
+// that it can feed PrimaryKeyDiffScanner:
 
-extension PlaceAnnotation: RowConvertible {
+extension PlaceAnnotation: FetchableRecord {
     convenience init(row: Row) {
         self.init(place: Place(row: row))
     }
 }
 
-extension PlaceAnnotation: Persistable {
+extension PlaceAnnotation: PersistableRecord {
     static let databaseTableName = Place.databaseTableName
 
     func encode(to container: inout PersistenceContainer) {
         place.encode(to: &container)
     }
 }
-

Documentation/RxGRDBDemo/RxGRDBDemo/PlacesViewController.swift

@@ -73,8 +73,10 @@ extension PlacesViewController {
     }
 
     @IBAction func stressTest() {
-        DispatchQueue.concurrentPerform(iterations: 50) { _ in
-            self.refresh()
+        for _ in 0..<50 {
+            DispatchQueue.global().async {
+                self.refresh()
+            }
         }
     }
 }
@@ -89,7 +91,7 @@ extension PlacesViewController: MKMapViewDelegate {
         // To efficiently update the map view as database content changes, we
         // use PrimaryKeyDiffScanner. It requires the tracked database request
         // to be sorted by primary key:
-        let placeAnnotations = PlaceAnnotation.order(Place.Columns.id)
+        let placeAnnotations = PlaceAnnotation.orderByPrimaryKey()
 
         let diffScanner = try! dbPool.read { db in
             try PrimaryKeyDiffScanner(

Documentation/RxGRDBDemo/RxGRDBDemo/Player.swift

@@ -7,28 +7,25 @@ struct Player: Codable {
     var score: Int
 }
 
-// Define colums so that we can build GRDB requests
-extension Player {
-    enum Columns {
-        static let name = Column("name")
-        static let score = Column("score")
-    }
-}
-
 // Adopt RowConvertible so that we can fetch players from the database.
 // Implementation is automatically derived from Codable.
-extension Player: RowConvertible { }
+extension Player: FetchableRecord { }
 
 // Adopt MutablePersistable so that we can create/update/delete players in the database.
 // Implementation is partially derived from Codable.
-extension Player: MutablePersistable {
-    static let databaseTableName = "players"
+extension Player: MutablePersistableRecord {
+    static let databaseTableName = "player"
+
+    enum Columns: String, ColumnExpression {
+        case id, name, score
+    }
+
     mutating func didInsert(with rowID: Int64, for column: String?) {
         id = rowID
     }
 }
 
-// Support for player randomization
+// Player randomization
 extension Player {
     private static let names = ["Arthur", "Anita", "Barbara", "Bernard", "Craig", "Chiara", "David", "Dean", "Éric", "Elena", "Fatima", "Frederik", "Gilbert", "Georgette", "Henriette", "Hassan", "Ignacio", "Irene", "Julie", "Jack", "Karl", "Kristel", "Louis", "Liz", "Masashi", "Mary", "Noam", "Nicole", "Ophelie", "Oleg", "Pascal", "Patricia", "Quentin", "Quinn", "Raoul", "Rachel", "Stephan", "Susie", "Tristan", "Tatiana", "Ursule", "Urbain", "Victor", "Violette", "Wilfried", "Wilhelmina", "Yvon", "Yann", "Zazie", "Zoé"]
 

Documentation/RxGRDBDemo/RxGRDBDemo/PlayersViewController.swift

@@ -120,8 +120,10 @@ extension PlayersViewController {
     }
 
     @IBAction func stressTest() {
-        DispatchQueue.concurrentPerform(iterations: 50) { _ in
-            self.refresh()
+        for _ in 0..<50 {
+            DispatchQueue.global().async {
+                self.refresh()
+            }
         }
     }
 }

Makefile

@@ -19,6 +19,7 @@ XCODEBUILD := set -o pipefail && $(shell command -v xcodebuild)
 XCODEVERSION_FULL := $(word 2, $(shell xcodebuild -version))
 XCODEVERSION_MAJOR := $(shell xcodebuild -version 2>&1 | grep Xcode | cut -d' ' -f2 | cut -d'.' -f1)
 XCODEVERSION_MINOR := $(shell xcodebuild -version 2>&1 | grep Xcode | cut -d' ' -f2 | cut -d'.' -f2)
+XCODEVERSION_PATCH := $(shell xcodebuild -version 2>&1 | grep Xcode | cut -d' ' -f2 | cut -d'.' -f3)
 
 # The Xcode Version, containing only the "MAJOR.MINOR" (ex. "8.3" for Xcode 8.3, 8.3.1, etc.)
 XCODEVERSION := $(XCODEVERSION_MAJOR).$(XCODEVERSION_MINOR)
@@ -33,17 +34,15 @@ XCPRETTY_PATH := $(shell command -v xcpretty 2> /dev/null)
 # xcodebuild actions to run test targets
 TEST_ACTIONS = clean build build-for-testing test-without-building
 
-# xcodebuild destination to run tests on iOS 8.1 (requires a pre-installed simulator)
-MIN_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 4s,OS=8.1"
-
-ifeq ($(XCODEVERSION),9.2)
-  MAX_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 8,OS=11.2"
-else ifeq ($(XCODEVERSION),9.1)
- MAX_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 8,OS=11.1"
-else ifeq ($(XCODEVERSION),9.0)
-  MAX_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 8,OS=11.0"
+# When adding support for an Xcode version, look for available devices with `instruments -s devices`
+ifeq ($(XCODEVERSION),9.4)
+  MAX_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 8,OS=11.4"
+  MIN_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 4s,OS=9.0"
+else ifeq ($(XCODEVERSION),9.3)
+  MAX_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 8,OS=11.3"
+  MIN_IOS_DESTINATION = "platform=iOS Simulator,name=iPhone 4s,OS=9.0"
 else
-  # Xcode < 9.0 is not supported
+  # Swift 4.1 required: Xcode < 9.3 is not supported
 endif
 
 # If xcpretty is available, use it for xcodebuild output

Podfile

@@ -3,7 +3,7 @@ workspace 'RxGRDB.xcworkspace'
 
 def common
     pod 'RxSwift', '~> 4.0'
-    pod 'GRDB.swift', '~> 2.6'
+    pod 'GRDB.swift', '~> 3.0'
 end
 
 target 'RxGRDBiOS' do