Prefer key paths when possible

Author: groue

Documentation/AssociationsBasics.md

@@ -939,7 +939,7 @@ struct BookInfo: Decodable, FetchableRecord {
     var country: String
 }
 let bookInfos = try Book
-    .annotated(withRequired: Book.author.select { $0.country })
+    .annotated(withRequired: Book.author.select(\.country)
     .asRequest(of: BookInfo.self)
     .fetchAll(db)
 ```
@@ -1000,7 +1000,7 @@ struct BookInfo: Decodable, FetchableRecord {
     var country: String?
 }
 let bookInfos = try Book
-    .annotated(withOptional: Book.author.select { $0.country })
+    .annotated(withOptional: Book.author.select(\.country))
     .asRequest(of: BookInfo.self)
     .fetchAll(db)
 ```
@@ -1083,7 +1083,7 @@ struct AuthorInfo: Decodable, FetchableRecord {
 }
 let authorInfos = try Author
     .including(all: Author.books
-        .select { $0.title }
+        .select(\.title)
         .forKey("bookTitles"))
     .asRequest(of: AuthorInfo.self)
     .fetchAll(db)
@@ -1350,7 +1350,7 @@ In this chapter, we take the reversed perspective. We list various shapes of dec
 
     let authorInfos = try Author
         .including(all: Author.books
-            .select { $0.title }
+            .select(\.title)
             .forKey("bookTitles"))
         .asRequest(of: AuthorInfo.self)
         .fetchAll(db)
@@ -1677,7 +1677,7 @@ Associations support more refinements:
     }
 
     let distinctBookKinds = Author.books
-        .select { $0.kind }
+        .select(\.kind)
         .distinct()
         .forKey("bookKinds")
 

Documentation/WhyAdoptGRDB.md

@@ -207,7 +207,7 @@ try player.updateChanges {
 
 // SELECT * FROM player ORDER BY score DESC LIMIT 10
 let bestPlayers: [Player] = try Player
-    .order { $0.score.desc }
+    .order(\.score.desc)
     .limit(10)
     .fetchAll(db)
 

GRDB/Documentation.docc/RecordRecommendedPractices.md

@@ -395,7 +395,7 @@ Extensions to the `DerivableRequest` protocol can not change the type of request
 extension QueryInterfaceRequest<Author> {
     // Selects authors' name
     func selectName() -> QueryInterfaceRequest<String> {
-        select { $0.name }
+        select(\.name)
     }
 }
 

README.md

@@ -3302,7 +3302,7 @@ So don't miss the [SQL API](#sqlite-api).
 **The query interface requests** let you fetch values from the database:
 
 ```swift
-let request = Player.filter { $0.email != nil }.order { $0.name }
+let request = Player.filter { $0.email != nil }.order(\.name)
 let players = try request.fetchAll(db)  // [Player]
 let count = try request.fetchCount(db)  // Int
 ```
@@ -3837,7 +3837,7 @@ GRDB comes with a Swift version of many SQLite [built-in operators](https://sqli
 
     ```swift
     // SELECT * FROM player WHERE id IN (SELECT playerId FROM playerSelection)
-    let selectedPlayerIds = PlayerSelection.select { $0.playerId }
+    let selectedPlayerIds = PlayerSelection.select(\.playerId)
     Player.filter { selectedPlayerIds.contains($0.id) }
 
     // SELECT * FROM player WHERE id IN (SELECT playerId FROM playerSelection)

Tests/GRDBTests/AssociationAggregateTests.swift

@@ -121,7 +121,26 @@ class AssociationAggregateTests: GRDBTestCase {
                 """)
         }
     }
-
+    
+    #if compiler(>=6.1)
+    func testAggregateWithGroup_swift61() throws {
+        let dbQueue = try makeDatabaseQueue()
+        try dbQueue.read { db in
+            let request = Team
+                .select(\.name)
+                .annotated(with: Team.players.count)
+                .group(\.name)
+            
+            try assertEqualSQL(db, request, """
+                SELECT "team"."name", COUNT(DISTINCT "player"."id") AS "playerCount" \
+                FROM "team" \
+                LEFT JOIN "player" ON "player"."teamId" = "team"."id" \
+                GROUP BY "team"."name"
+                """)
+        }
+    }
+    #endif
+    
     func testAnnotatedWithHasManyDefaultAverage() throws {
         let dbQueue = try makeDatabaseQueue()
         try dbQueue.read { db in