Merge pull request #748 from groue/dev/Request

Rename QueryInterfaceRequest to Request
This commit is contained in:
Gwendal Roué authored and GitHub committed 2020-04-04 20:55:18 +02:00
commit a4bda6da96
32 files changed
+250 -246

No files matched your search

+1
View File
@@ -92,6 +92,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
- [#742](https://github.com/groue/GRDB.swift/pull/742): ValueObservation scheduling is no longer an attribute of the observation
- [#745](https://github.com/groue/GRDB.swift/pull/745): Explicit ValueObservation cancellation
- [#747](https://github.com/groue/GRDB.swift/pull/747): Rename GRDBCustomSQLite to GRDB
- [#748](https://github.com/groue/GRDB.swift/pull/748): Rename QueryInterfaceRequest to Request
## 4.12.1
+10 -10
View File
@@ -90,14 +90,14 @@ With GRDB associations, we can streamline these operations (and others), by decl
```swift
extension Author {
static let books = hasMany(Book.self)
var books: QueryInterfaceRequest<Book> {
var books: Request<Book> {
request(for: Author.books)
}
}
extension Book {
static let author = belongsTo(Author.self)
var author: QueryInterfaceRequest<Author> {
var author: Request<Author> {
request(for: Book.author)
}
}
@@ -164,7 +164,7 @@ Generally speaking, associations use the [TableRecord], [FetchableRecord], and [
```swift
extension Book: EncodableRecord {
// The request for the author of a book.
var author: QueryInterfaceRequest<Author> {
var author: Request<Author> {
request(for: Book.author)
}
}
@@ -784,7 +784,7 @@ struct Book: TableRecord, EncodableRecord {
static let author = belongsTo(Author.self)
/// The request for the author of a book
var author: QueryInterfaceRequest<Author> {
var author: Request<Author> {
request(for: Book.author)
}
}
@@ -805,7 +805,7 @@ struct Author: TableRecord, EncodableRecord {
static let books = hasMany(Book.self)
/// The request for the books of an author
var books: QueryInterfaceRequest<Book> {
var books: Request<Book> {
request(for: Author.books)
}
}
@@ -1139,7 +1139,7 @@ The `Team.players` association is ordered by position, so that all team players
extension Team {
static let players = hasMany(Player.self).order(Column("position"))
var players: QueryInterfaceRequest<Player> {
var players: Request<Player> {
request(for: Team.players)
}
}
@@ -1173,7 +1173,7 @@ extension Team {
static let players = hasMany(Player.self, through: playerRoles, using: PlayerRole.player)
var players: QueryInterfaceRequest<Player> {
var players: Request<Player> {
request(for: Team.players)
}
}
@@ -1609,7 +1609,7 @@ And who is the most able to know those coding keys? BookInfo itself, thanks to i
```swift
extension BookInfo {
static func all() -> QueryInterfaceRequest<BookInfo> {
static func all() -> Request<BookInfo> {
Book.including(optional: Book.coverImage)
.including(required: Book.author
.forKey(CodingKeys.authorInfo) // (1)
@@ -1756,7 +1756,7 @@ When you need to compute aggregates **from a single record**, you use [regular a
```swift
struct Author: TableRecord, EncodableRecord {
static let books = hasMany(Book.self)
var books: QueryInterfaceRequest<Book> {
var books: Request<Book> {
request(for: Author.books)
}
}
@@ -1898,7 +1898,7 @@ struct AuthorInfo: Decodable, FetchableRecord {
var author: Author
var numberOfBooks: Int
static func all() -> QueryInterfaceRequest<AuthorInfo> {
static func all() -> Request<AuthorInfo> {
let numberOfBooks = Author.books.count.forKey(CodingKey.numberOfBooks) // <--
return Author
.annotated(with: numberOfBooks)
@@ -34,11 +34,11 @@ extension Player: Codable, FetchableRecord, MutablePersistableRecord {
// Define some useful player requests.
// See https://github.com/groue/GRDB.swift/blob/master/README.md#requests
extension Player {
static func orderedByName() -> QueryInterfaceRequest<Player> {
static func orderedByName() -> Request<Player> {
Player.order(Columns.name)
}
static func orderedByScore() -> QueryInterfaceRequest<Player> {
static func orderedByScore() -> Request<Player> {
Player.order(Columns.score.desc, Columns.name)
}
}
@@ -18,7 +18,7 @@ class PlayersViewController: UITableViewController {
configureTableView()
}
}
private var playersRequest: QueryInterfaceRequest<Player> {
private var playersRequest: Request<Player> {
switch playerOrdering {
case .byName:
return Player.orderedByName()
@@ -242,19 +242,19 @@ try dbQueue.read { db in
}
```
Not *every requests* can be expressed on `DerivableRequest`. For example, [Association Aggregates] are out of scope. When this happens, define your requests in a constrained extension to `QueryInterfaceRequest`:
Not *every requests* can be expressed on `DerivableRequest`. For example, [Association Aggregates] are out of scope. When this happens, define your requests in a constrained extension to `Request`:
```swift
// More requests of Author -------------------------v
extension QueryInterfaceRequest where RowDecoder == Author {
// More requests of Author -----------v
extension Request where RowDecoder == Author {
/// Returns a request for all authors with at least one book
func havingBooks() -> QueryInterfaceRequest<Author> {
func havingBooks() -> Request<Author> {
having(Author.books.isEmpty == false)
}
}
```
Those requests defined on `QueryInterfaceRequest` still compose fluently:
Those requests defined on `Request` still compose fluently:
```swift
try dbQueue.read { db in
@@ -387,14 +387,14 @@ A last extension on your record types will further help navigation from records
```swift
extension Author {
/// The request for the author's books
var books: QueryInterfaceRequest<Book> {
var books: Request<Book> {
request(for: Author.books)
}
}
extension Book {
/// The request for the author of the book
var author: QueryInterfaceRequest<Author> {
var author: Request<Author> {
request(for: Book.author)
}
}
@@ -61,12 +61,12 @@ struct Book: Codable, FetchableRecord, MutablePersistableRecord {
extension Author {
static let books = hasMany(Book.self)
var books: QueryInterfaceRequest<Book> { request(for: Author.books) }
var books: Request<Book> { request(for: Author.books) }
}
extension Book {
static let author = belongsTo(Author.self)
var author: QueryInterfaceRequest<Author> { request(for: Book.author) }
var author: Request<Author> { request(for: Book.author) }
}
//: Populate the database
@@ -265,18 +265,18 @@ extension MyDatabaseDecoder {
// MARK: - Fetch from FetchRequest
static func fetchCursor<R: FetchRequest>(_ db: Database, _ request: R) throws -> MapCursor<RowCursor, DecodedType> {
let (statement, adapter) = try request.prepare(db)
return try fetchCursor(statement, adapter: adapter)
let preparedRequest = try request.makePreparedRequest(db, forSingleResult: false)
return try fetchCursor(preparedRequest.statement, adapter: preparedRequest.adapter)
}
static func fetchAll<R: FetchRequest>(_ db: Database, _ request: R) throws -> [DecodedType] {
let (statement, adapter) = try request.prepare(db)
return try fetchAll(statement, adapter: adapter)
let preparedRequest = try request.makePreparedRequest(db, forSingleResult: false)
return try fetchAll(preparedRequest.statement, adapter: preparedRequest.adapter)
}
static func fetchOne<R: FetchRequest>(_ db: Database, _ request: R) throws -> DecodedType? {
let (statement, adapter) = try request.prepare(db)
return try fetchOne(statement, adapter: adapter)
let preparedRequest = try request.makePreparedRequest(db, forSingleResult: true)
return try fetchOne(preparedRequest.statement, adapter: preparedRequest.adapter)
}
}
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<playground version='5.0' target-platform='macos' display-mode='rendered'>
<playground version='5.0' target-platform='macos' display-mode='raw'>
<timeline fileName='timeline.xctimeline'/>
</playground>
+30 -30
View File
@@ -135,8 +135,8 @@
56300B621C53C42C005A543B /* FetchableRecord+QueryInterfaceRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B601C53C42C005A543B /* FetchableRecord+QueryInterfaceRequestTests.swift */; };
56300B691C53D25E005A543B /* QueryInterfaceExpressionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B671C53D25E005A543B /* QueryInterfaceExpressionsTests.swift */; };
56300B6C1C53D3E8005A543B /* TableRecord+QueryInterfaceRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B6A1C53D3E8005A543B /* TableRecord+QueryInterfaceRequestTests.swift */; };
56300B781C53F592005A543B /* QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B6F1C53F592005A543B /* QueryInterfaceRequest.swift */; };
56300B791C53F592005A543B /* QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B6F1C53F592005A543B /* QueryInterfaceRequest.swift */; };
56300B781C53F592005A543B /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B6F1C53F592005A543B /* Request.swift */; };
56300B791C53F592005A543B /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B6F1C53F592005A543B /* Request.swift */; };
56300B861C54DC95005A543B /* Record+QueryInterfaceRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B841C54DC95005A543B /* Record+QueryInterfaceRequestTests.swift */; };
563082E42430B6BE00C14A05 /* DatabaseCancellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 563082E32430B6BE00C14A05 /* DatabaseCancellable.swift */; };
563082E52430B6BE00C14A05 /* DatabaseCancellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 563082E32430B6BE00C14A05 /* DatabaseCancellable.swift */; };
@@ -259,9 +259,9 @@
5653EB2120944C7C00F46237 /* HasOneAssociation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB0220944C7C00F46237 /* HasOneAssociation.swift */; };
5653EB2220944C7C00F46237 /* HasOneAssociation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB0220944C7C00F46237 /* HasOneAssociation.swift */; };
5653EB2320944C7C00F46237 /* HasOneAssociation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB0220944C7C00F46237 /* HasOneAssociation.swift */; };
5653EB252094A14400F46237 /* QueryInterfaceRequest+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB242094A14400F46237 /* QueryInterfaceRequest+Association.swift */; };
5653EB262094A14400F46237 /* QueryInterfaceRequest+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB242094A14400F46237 /* QueryInterfaceRequest+Association.swift */; };
5653EB272094A14400F46237 /* QueryInterfaceRequest+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB242094A14400F46237 /* QueryInterfaceRequest+Association.swift */; };
5653EB252094A14400F46237 /* Request+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB242094A14400F46237 /* Request+Association.swift */; };
5653EB262094A14400F46237 /* Request+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB242094A14400F46237 /* Request+Association.swift */; };
5653EB272094A14400F46237 /* Request+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB242094A14400F46237 /* Request+Association.swift */; };
5653EC122098738B00F46237 /* SQLGenerationContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EC0B2098738B00F46237 /* SQLGenerationContext.swift */; };
5653EC132098738B00F46237 /* SQLGenerationContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EC0B2098738B00F46237 /* SQLGenerationContext.swift */; };
5653EC142098738B00F46237 /* SQLGenerationContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EC0B2098738B00F46237 /* SQLGenerationContext.swift */; };
@@ -298,7 +298,7 @@
565490D61D5AE252005622CB /* StandardLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5605F1581C672E4000235C62 /* StandardLibrary.swift */; };
565490D81D5AE252005622CB /* DatabaseMigrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A238921B9C750B0082EB20 /* DatabaseMigrator.swift */; };
565490D91D5AE252005622CB /* Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56B7F4391BEB42D500E39BBF /* Migration.swift */; };
565490DA1D5AE252005622CB /* QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B6F1C53F592005A543B /* QueryInterfaceRequest.swift */; };
565490DA1D5AE252005622CB /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B6F1C53F592005A543B /* Request.swift */; };
565490DB1D5AE252005622CB /* SQLCollatedExpression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5605F1891C6B1A8700235C62 /* SQLCollatedExpression.swift */; };
565490DF1D5AE252005622CB /* TableDefinition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566AD8B11D5318F4002EC1A8 /* TableDefinition.swift */; };
565490E01D5AE252005622CB /* FetchedRecordsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A7787C1C6A4DD600F507F6 /* FetchedRecordsController.swift */; };
@@ -315,9 +315,9 @@
5656A8AD2295BFD7001FF3FF /* TableRecord+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8A92295BFD5001FF3FF /* TableRecord+Association.swift */; };
5656A8AE2295BFD7001FF3FF /* TableRecord+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8A92295BFD5001FF3FF /* TableRecord+Association.swift */; };
5656A8AF2295BFD7001FF3FF /* TableRecord+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8A92295BFD5001FF3FF /* TableRecord+Association.swift */; };
5656A8B02295BFD7001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8AA2295BFD6001FF3FF /* TableRecord+QueryInterfaceRequest.swift */; };
5656A8B12295BFD7001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8AA2295BFD6001FF3FF /* TableRecord+QueryInterfaceRequest.swift */; };
5656A8B22295BFD7001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8AA2295BFD6001FF3FF /* TableRecord+QueryInterfaceRequest.swift */; };
5656A8B02295BFD7001FF3FF /* TableRecord+Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8AA2295BFD6001FF3FF /* TableRecord+Request.swift */; };
5656A8B12295BFD7001FF3FF /* TableRecord+Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8AA2295BFD6001FF3FF /* TableRecord+Request.swift */; };
5656A8B22295BFD7001FF3FF /* TableRecord+Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8AA2295BFD6001FF3FF /* TableRecord+Request.swift */; };
5657AAB91D107001006283EF /* NSData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5657AAB81D107001006283EF /* NSData.swift */; };
5657AABC1D107001006283EF /* NSData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5657AAB81D107001006283EF /* NSData.swift */; };
5657AB0F1D10899D006283EF /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5657AB0E1D10899D006283EF /* URL.swift */; };
@@ -817,8 +817,8 @@
AAA4DC77230F1E0600C74B15 /* FetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5636E9BB1D22574100B9B05F /* FetchRequest.swift */; };
AAA4DC78230F1E0600C74B15 /* AssociationAggregate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 563EF42C2161180D007DAACD /* AssociationAggregate.swift */; };
AAA4DC79230F1E0600C74B15 /* SchedulingWatchdog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BB6EA81D3009B100A1CA52 /* SchedulingWatchdog.swift */; };
AAA4DC7A230F1E0600C74B15 /* QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B6F1C53F592005A543B /* QueryInterfaceRequest.swift */; };
AAA4DC7B230F1E0600C74B15 /* TableRecord+QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8AA2295BFD6001FF3FF /* TableRecord+QueryInterfaceRequest.swift */; };
AAA4DC7A230F1E0600C74B15 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56300B6F1C53F592005A543B /* Request.swift */; };
AAA4DC7B230F1E0600C74B15 /* TableRecord+Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8AA2295BFD6001FF3FF /* TableRecord+Request.swift */; };
AAA4DC7C230F1E0600C74B15 /* SQLExpression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56CEB5421EAA359A00BFAF62 /* SQLExpression.swift */; };
AAA4DC7D230F1E0600C74B15 /* EncodableRecord+Encodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5674A6F31F307F600095F066 /* EncodableRecord+Encodable.swift */; };
AAA4DC7E230F1E0600C74B15 /* SQLCollatedExpression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5605F1891C6B1A8700235C62 /* SQLCollatedExpression.swift */; };
@@ -829,7 +829,7 @@
AAA4DC83230F1E0600C74B15 /* FTS3.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56CEB4F81EAA2F4D00BFAF62 /* FTS3.swift */; };
AAA4DC84230F1E0600C74B15 /* CGFloat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5605F1491C672E4000235C62 /* CGFloat.swift */; };
AAA4DC85230F1E0600C74B15 /* Column.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56CEB5401EAA359A00BFAF62 /* Column.swift */; };
AAA4DC86230F1E0600C74B15 /* QueryInterfaceRequest+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB242094A14400F46237 /* QueryInterfaceRequest+Association.swift */; };
AAA4DC86230F1E0600C74B15 /* Request+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5653EB242094A14400F46237 /* Request+Association.swift */; };
AAA4DC87230F1E0600C74B15 /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5605F14F1C672E4000235C62 /* Date.swift */; };
AAA4DC89230F1E0600C74B15 /* TransactionObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566B91321FA4D3810012D5B0 /* TransactionObserver.swift */; };
AAA4DC8A230F1E0600C74B15 /* ValueObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 564CE43021AA901800652B19 /* ValueObserver.swift */; };
@@ -1220,7 +1220,7 @@
56300B601C53C42C005A543B /* FetchableRecord+QueryInterfaceRequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FetchableRecord+QueryInterfaceRequestTests.swift"; sourceTree = "<group>"; };
56300B671C53D25E005A543B /* QueryInterfaceExpressionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryInterfaceExpressionsTests.swift; sourceTree = "<group>"; };
56300B6A1C53D3E8005A543B /* TableRecord+QueryInterfaceRequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TableRecord+QueryInterfaceRequestTests.swift"; sourceTree = "<group>"; };
56300B6F1C53F592005A543B /* QueryInterfaceRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryInterfaceRequest.swift; sourceTree = "<group>"; };
56300B6F1C53F592005A543B /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
56300B841C54DC95005A543B /* Record+QueryInterfaceRequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Record+QueryInterfaceRequestTests.swift"; sourceTree = "<group>"; };
563082E32430B6BE00C14A05 /* DatabaseCancellable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseCancellable.swift; sourceTree = "<group>"; };
563363A91C933FF8000BE133 /* MutablePersistableRecordTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MutablePersistableRecordTests.swift; sourceTree = "<group>"; };
@@ -1277,14 +1277,14 @@
5653EAFA20944C7B00F46237 /* Association.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Association.swift; sourceTree = "<group>"; };
5653EAFB20944C7B00F46237 /* HasManyAssociation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HasManyAssociation.swift; sourceTree = "<group>"; };
5653EB0220944C7C00F46237 /* HasOneAssociation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HasOneAssociation.swift; sourceTree = "<group>"; };
5653EB242094A14400F46237 /* QueryInterfaceRequest+Association.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "QueryInterfaceRequest+Association.swift"; sourceTree = "<group>"; };
5653EB242094A14400F46237 /* Request+Association.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Request+Association.swift"; sourceTree = "<group>"; };
5653EC0B2098738B00F46237 /* SQLGenerationContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLGenerationContext.swift; sourceTree = "<group>"; };
565490A01D5A4798005622CB /* GRDB.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GRDB.framework; sourceTree = BUILT_PRODUCTS_DIR; };
56553C181C3E906C00522B5C /* GRDBOSXCrashTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GRDBOSXCrashTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5656A7F822946B33001FF3FF /* ValueObservationQueryInterfaceRequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValueObservationQueryInterfaceRequestTests.swift; sourceTree = "<group>"; };
5656A81D2295B12F001FF3FF /* SQLAssociation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SQLAssociation.swift; sourceTree = "<group>"; };
5656A8A92295BFD5001FF3FF /* TableRecord+Association.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TableRecord+Association.swift"; sourceTree = "<group>"; };
5656A8AA2295BFD6001FF3FF /* TableRecord+QueryInterfaceRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TableRecord+QueryInterfaceRequest.swift"; sourceTree = "<group>"; };
5656A8AA2295BFD6001FF3FF /* TableRecord+Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TableRecord+Request.swift"; sourceTree = "<group>"; };
5657AAB81D107001006283EF /* NSData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSData.swift; sourceTree = "<group>"; };
5657AB0E1D10899D006283EF /* URL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URL.swift; sourceTree = "<group>"; };
5657AB2F1D108BA9006283EF /* FoundationDataTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FoundationDataTests.swift; sourceTree = "<group>"; };
@@ -1780,7 +1780,7 @@
5656A8162295AFD6001FF3FF /* SQLGeneration */,
56E9FACA221046FD00C703A8 /* SQLInterpolation+QueryInterface.swift */,
5656A8A92295BFD5001FF3FF /* TableRecord+Association.swift */,
5656A8AA2295BFD6001FF3FF /* TableRecord+QueryInterfaceRequest.swift */,
5656A8AA2295BFD6001FF3FF /* TableRecord+Request.swift */,
);
path = QueryInterface;
sourceTree = "<group>";
@@ -1923,8 +1923,8 @@
isa = PBXGroup;
children = (
5653EAF720944BC900F46237 /* Association */,
56300B6F1C53F592005A543B /* QueryInterfaceRequest.swift */,
5653EB242094A14400F46237 /* QueryInterfaceRequest+Association.swift */,
56300B6F1C53F592005A543B /* Request.swift */,
5653EB242094A14400F46237 /* Request+Association.swift */,
5616AAF0207CD45E00AC3664 /* RequestProtocols.swift */,
);
path = Request;
@@ -2729,7 +2729,7 @@
5613ED4621A95B2C00DC7A68 /* ValueReducer.swift in Sources */,
5698AD1C1DAAD17F0056AF8C /* FTS5Tokenizer.swift in Sources */,
56CEB5171EAA324B00BFAF62 /* FTS3+QueryInterface.swift in Sources */,
5656A8B22295BFD7001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */,
5656A8B22295BFD7001FF3FF /* TableRecord+Request.swift in Sources */,
56D91AB22205F8AC00770D8D /* SQLQuery.swift in Sources */,
56B964B71DA51D010002DA19 /* FTS5TokenizerDescriptor.swift in Sources */,
5653EB0B20944C7C00F46237 /* Association.swift in Sources */,
@@ -2744,7 +2744,7 @@
5659F48E1EA8D94E004A4992 /* Utils.swift in Sources */,
564CE43321AA901800652B19 /* ValueObserver.swift in Sources */,
56CEB5671EAA359A00BFAF62 /* SQLSelectable.swift in Sources */,
5653EB272094A14400F46237 /* QueryInterfaceRequest+Association.swift in Sources */,
5653EB272094A14400F46237 /* Request+Association.swift in Sources */,
565490B91D5AE236005622CB /* DatabasePool.swift in Sources */,
56DF37AD23D77AB4009AAA05 /* KeyPathRefining.swift in Sources */,
563B06AD217EF0CC00B38F35 /* ValueObservation.swift in Sources */,
@@ -2783,7 +2783,7 @@
56DDDDF6242F87C70025E381 /* ValueObservationScheduler.swift in Sources */,
5659F49E1EA8D989004A4992 /* Pool.swift in Sources */,
5653EB0E20944C7C00F46237 /* HasManyAssociation.swift in Sources */,
565490DA1D5AE252005622CB /* QueryInterfaceRequest.swift in Sources */,
565490DA1D5AE252005622CB /* Request.swift in Sources */,
565490CA1D5AE252005622CB /* DatabaseDateComponents.swift in Sources */,
565490D01D5AE252005622CB /* NSString.swift in Sources */,
565490DF1D5AE252005622CB /* TableDefinition.swift in Sources */,
@@ -2866,8 +2866,8 @@
5636E9BF1D22574100B9B05F /* FetchRequest.swift in Sources */,
563EF42E2161180D007DAACD /* AssociationAggregate.swift in Sources */,
56BB6EAC1D3009B100A1CA52 /* SchedulingWatchdog.swift in Sources */,
56300B791C53F592005A543B /* QueryInterfaceRequest.swift in Sources */,
5656A8B12295BFD7001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */,
56300B791C53F592005A543B /* Request.swift in Sources */,
5656A8B12295BFD7001FF3FF /* TableRecord+Request.swift in Sources */,
56CEB5561EAA359A00BFAF62 /* SQLExpression.swift in Sources */,
5674A6F91F307F600095F066 /* EncodableRecord+Encodable.swift in Sources */,
5605F18E1C6B1A8700235C62 /* SQLCollatedExpression.swift in Sources */,
@@ -2878,7 +2878,7 @@
56CEB4FD1EAA2F4D00BFAF62 /* FTS3.swift in Sources */,
5605F15A1C672E4000235C62 /* CGFloat.swift in Sources */,
56CEB5481EAA359A00BFAF62 /* Column.swift in Sources */,
5653EB262094A14400F46237 /* QueryInterfaceRequest+Association.swift in Sources */,
5653EB262094A14400F46237 /* Request+Association.swift in Sources */,
5605F1641C672E4000235C62 /* Date.swift in Sources */,
566B91361FA4D3810012D5B0 /* TransactionObserver.swift in Sources */,
564CE43221AA901800652B19 /* ValueObserver.swift in Sources */,
@@ -3409,8 +3409,8 @@
AAA4DC77230F1E0600C74B15 /* FetchRequest.swift in Sources */,
AAA4DC78230F1E0600C74B15 /* AssociationAggregate.swift in Sources */,
AAA4DC79230F1E0600C74B15 /* SchedulingWatchdog.swift in Sources */,
AAA4DC7A230F1E0600C74B15 /* QueryInterfaceRequest.swift in Sources */,
AAA4DC7B230F1E0600C74B15 /* TableRecord+QueryInterfaceRequest.swift in Sources */,
AAA4DC7A230F1E0600C74B15 /* Request.swift in Sources */,
AAA4DC7B230F1E0600C74B15 /* TableRecord+Request.swift in Sources */,
AAA4DC7C230F1E0600C74B15 /* SQLExpression.swift in Sources */,
AAA4DC7D230F1E0600C74B15 /* EncodableRecord+Encodable.swift in Sources */,
AAA4DC7E230F1E0600C74B15 /* SQLCollatedExpression.swift in Sources */,
@@ -3421,7 +3421,7 @@
AAA4DC83230F1E0600C74B15 /* FTS3.swift in Sources */,
AAA4DC84230F1E0600C74B15 /* CGFloat.swift in Sources */,
AAA4DC85230F1E0600C74B15 /* Column.swift in Sources */,
AAA4DC86230F1E0600C74B15 /* QueryInterfaceRequest+Association.swift in Sources */,
AAA4DC86230F1E0600C74B15 /* Request+Association.swift in Sources */,
AAA4DC87230F1E0600C74B15 /* Date.swift in Sources */,
AAA4DC89230F1E0600C74B15 /* TransactionObserver.swift in Sources */,
AAA4DC8A230F1E0600C74B15 /* ValueObserver.swift in Sources */,
@@ -3745,7 +3745,7 @@
563EF42D2161180D007DAACD /* AssociationAggregate.swift in Sources */,
56D91AB02205F8AC00770D8D /* SQLQuery.swift in Sources */,
5616AAF1207CD45E00AC3664 /* RequestProtocols.swift in Sources */,
5656A8B02295BFD7001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */,
5656A8B02295BFD7001FF3FF /* TableRecord+Request.swift in Sources */,
5613ED4421A95B2C00DC7A68 /* ValueReducer.swift in Sources */,
5636E9BC1D22574100B9B05F /* FetchRequest.swift in Sources */,
56BB6EA91D3009B100A1CA52 /* SchedulingWatchdog.swift in Sources */,
@@ -3760,7 +3760,7 @@
569EF0E2200D2D8400A9FA45 /* DatabaseRegion.swift in Sources */,
56CEB4F11EAA2EFA00BFAF62 /* FetchableRecord.swift in Sources */,
56D91AA22205E03700770D8D /* SQLRelation.swift in Sources */,
56300B781C53F592005A543B /* QueryInterfaceRequest.swift in Sources */,
56300B781C53F592005A543B /* Request.swift in Sources */,
56AACAA822ACED7100A40F2A /* Fetch.swift in Sources */,
5605F18D1C6B1A8700235C62 /* SQLCollatedExpression.swift in Sources */,
566B91331FA4D3810012D5B0 /* TransactionObserver.swift in Sources */,
@@ -3795,7 +3795,7 @@
5698AD181DAAD17A0056AF8C /* FTS5Tokenizer.swift in Sources */,
56B964B11DA51D010002DA19 /* FTS5TokenizerDescriptor.swift in Sources */,
560A37A71C8FF6E500949E71 /* SerializedDatabase.swift in Sources */,
5653EB252094A14400F46237 /* QueryInterfaceRequest+Association.swift in Sources */,
5653EB252094A14400F46237 /* Request+Association.swift in Sources */,
5605F1691C672E4000235C62 /* NSString.swift in Sources */,
560D92401C672C3E00F4F92B /* DatabaseValueConvertible.swift in Sources */,
56A8C2301D1914540096E9D4 /* UUID.swift in Sources */,
+2 -2
View File
@@ -32,8 +32,8 @@ public class Statement {
}
// Selected region is computed during statement compilation, and maybe
// optimized for select statements compiled by QueryInterfaceRequest, in
// order to perform focused database observation. See
// optimized for select statements compiled by Request, in order to perform
// focused database observation. See
// SQLQueryGenerator.optimizedSelectedRegion(_:_:)
var selectedRegion = DatabaseRegion()
+3
View File
@@ -134,6 +134,9 @@ extension FetchRequest where RowDecoder == Row {
{ preconditionFailure() }
}
@available(*, unavailable, renamed: "Request")
public typealias QueryInterfaceRequest<T> = Request<T>
extension SQLExpression {
@available(*, unavailable, message: "Use SQLLiteral initializer instead")
public var sqlLiteral: SQLLiteral
@@ -25,7 +25,7 @@ extension TableRecord {
// MARK: Full Text Search
/// Returns a QueryInterfaceRequest with a matching predicate.
/// Returns a Request with a matching predicate.
///
/// // SELECT * FROM book WHERE book MATCH '...'
/// var request = Book.matching(pattern)
@@ -36,7 +36,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func matching(_ pattern: FTS3Pattern?) -> QueryInterfaceRequest<Self> {
public static func matching(_ pattern: FTS3Pattern?) -> Request<Self> {
all().matching(pattern)
}
}
@@ -30,14 +30,14 @@ extension TableRecord {
// MARK: Full Text Search
/// Returns a QueryInterfaceRequest with a matching predicate.
/// Returns a Request with a matching predicate.
///
/// // SELECT * FROM book WHERE book MATCH '...'
/// var request = Book.matching(pattern)
///
/// If the search pattern is nil, the request does not match any
/// database row.
public static func matching(_ pattern: FTS5Pattern?) -> QueryInterfaceRequest<Self> {
public static func matching(_ pattern: FTS5Pattern?) -> Request<Self> {
all().matching(pattern)
}
}
@@ -242,7 +242,7 @@ extension Association {
/// let player: Player
/// let team: Team
///
/// static func all() -> QueryInterfaceRequest<PlayerInfo> {
/// static func all() -> Request<PlayerInfo> {
/// return Player
/// .including(required: Player.team.forKey(CodingKeys.team))
/// .asRequest(of: PlayerInfo.self)
@@ -1,8 +1,8 @@
import Foundation
typealias AssociationAggregatePreparation<RowDecoder> =
(QueryInterfaceRequest<RowDecoder>)
-> (request: QueryInterfaceRequest<RowDecoder>, expression: SQLExpression)
(Request<RowDecoder>)
-> (request: Request<RowDecoder>, expression: SQLExpression)
/// An AssociationAggregate is able to compute aggregated values from a
/// population of associated records.
@@ -1,8 +1,8 @@
extension QueryInterfaceRequest where RowDecoder: TableRecord {
extension Request where RowDecoder: TableRecord {
// MARK: - Association Aggregates
private func annotated(with aggregate: AssociationAggregate<RowDecoder>) -> QueryInterfaceRequest {
private func annotated(with aggregate: AssociationAggregate<RowDecoder>) -> Request {
let (request, expression) = aggregate.prepare(self)
if let key = aggregate.key {
return request.annotated(with: [expression.forKey(key)])
@@ -17,7 +17,7 @@ extension QueryInterfaceRequest where RowDecoder: TableRecord {
/// // FROM player LEFT JOIN book ...
/// var request = Player.all()
/// request = request.annotated(with: Player.books.count)
public func annotated(with aggregates: AssociationAggregate<RowDecoder>...) -> QueryInterfaceRequest {
public func annotated(with aggregates: AssociationAggregate<RowDecoder>...) -> Request {
annotated(with: aggregates)
}
@@ -27,7 +27,7 @@ extension QueryInterfaceRequest where RowDecoder: TableRecord {
/// // FROM player LEFT JOIN book ...
/// var request = Player.all()
/// request = request.annotated(with: [Player.books.count])
public func annotated(with aggregates: [AssociationAggregate<RowDecoder>]) -> QueryInterfaceRequest {
public func annotated(with aggregates: [AssociationAggregate<RowDecoder>]) -> Request {
aggregates.reduce(self) { request, aggregate in
request.annotated(with: aggregate)
}
@@ -41,7 +41,7 @@ extension QueryInterfaceRequest where RowDecoder: TableRecord {
/// // HAVING COUNT(DISTINCT book.rowid) = 0
/// var request = Player.all()
/// request = request.having(Player.books.isEmpty)
public func having(_ predicate: AssociationAggregate<RowDecoder>) -> QueryInterfaceRequest {
public func having(_ predicate: AssociationAggregate<RowDecoder>) -> Request {
let (request, expression) = predicate.prepare(self)
return request.having(expression)
}
@@ -1,7 +1,7 @@
// QueryInterfaceRequest is the type of requests generated by TableRecord:
// Request is the type of query interface requests, generated by TableRecord:
//
// struct Player: TableRecord { ... }
// let playerRequest = Player.all() // QueryInterfaceRequest<Player>
// let playerRequest = Player.all() // Request<Player>
//
// It wraps an SQLQuery, and has an attached type.
//
@@ -16,7 +16,7 @@
// playerRequest.including(required: Player.team) // OK
// fruitRequest.including(required: Player.team) // Does not compile
/// QueryInterfaceRequest is a request that generates SQL for you.
/// Request is a query interface request that generates SQL for you.
///
/// For example:
///
@@ -28,17 +28,17 @@
/// }
///
/// See https://github.com/groue/GRDB.swift#the-query-interface
public struct QueryInterfaceRequest<T> {
public struct Request<T> {
var query: SQLQuery
}
extension QueryInterfaceRequest {
extension Request: KeyPathRefining {
init(relation: SQLRelation) {
self.init(query: SQLQuery(relation: relation))
}
}
extension QueryInterfaceRequest: FetchRequest {
extension Request: FetchRequest {
public typealias RowDecoder = T
/// Returns a tuple that contains a prepared statement that is ready to be
@@ -114,7 +114,7 @@ extension QueryInterfaceRequest: FetchRequest {
}
}
extension QueryInterfaceRequest: SelectionRequest {
extension Request: SelectionRequest {
// MARK: Request Derivation
/// Creates a request which selects *selection*.
@@ -129,7 +129,7 @@ extension QueryInterfaceRequest: SelectionRequest {
/// request
/// .select([Column("id")])
/// .select([Column("email")])
public func select(_ selection: [SQLSelectable]) -> QueryInterfaceRequest {
public func select(_ selection: [SQLSelectable]) -> Self {
map(\.query, { $0.select(selection) })
}
@@ -142,7 +142,7 @@ extension QueryInterfaceRequest: SelectionRequest {
/// let maxScore: Int? = try request.fetchOne(db)
/// }
public func select<RowDecoder>(_ selection: [SQLSelectable], as type: RowDecoder.Type = RowDecoder.self)
-> QueryInterfaceRequest<RowDecoder>
-> Request<RowDecoder>
{
return map(\.query, { $0.select(selection) }).asRequest(of: RowDecoder.self)
}
@@ -156,7 +156,7 @@ extension QueryInterfaceRequest: SelectionRequest {
/// let maxScore: Int? = try request.fetchOne(db)
/// }
public func select<RowDecoder>(_ selection: SQLSelectable..., as type: RowDecoder.Type = RowDecoder.self)
-> QueryInterfaceRequest<RowDecoder>
-> Request<RowDecoder>
{
return select(selection, as: type)
}
@@ -173,7 +173,7 @@ extension QueryInterfaceRequest: SelectionRequest {
sql: String,
arguments: StatementArguments = StatementArguments(),
as type: RowDecoder.Type = RowDecoder.self)
-> QueryInterfaceRequest<RowDecoder>
-> Request<RowDecoder>
{
return select(literal: SQLLiteral(sql: sql, arguments: arguments), as: type)
}
@@ -208,7 +208,7 @@ extension QueryInterfaceRequest: SelectionRequest {
public func select<RowDecoder>(
literal sqlLiteral: SQLLiteral,
as type: RowDecoder.Type = RowDecoder.self)
-> QueryInterfaceRequest<RowDecoder>
-> Request<RowDecoder>
{
return select(sqlLiteral.sqlSelectable, as: type)
}
@@ -220,12 +220,12 @@ extension QueryInterfaceRequest: SelectionRequest {
/// request = request
/// .select([Column("id"), Column("email")])
/// .annotated(with: [Column("name")])
public func annotated(with selection: [SQLSelectable]) -> QueryInterfaceRequest {
public func annotated(with selection: [SQLSelectable]) -> Self {
map(\.query, { $0.annotated(with: selection) })
}
}
extension QueryInterfaceRequest: FilteredRequest {
extension Request: FilteredRequest {
// MARK: Request Derivation
/// Creates a request with the provided *predicate promise* added to the
@@ -234,12 +234,12 @@ extension QueryInterfaceRequest: FilteredRequest {
/// // SELECT * FROM player WHERE 1
/// var request = Player.all()
/// request = request.filter { db in true }
public func filter(_ predicate: @escaping (Database) throws -> SQLExpressible) -> QueryInterfaceRequest {
public func filter(_ predicate: @escaping (Database) throws -> SQLExpressible) -> Self {
map(\.query, { $0.filter(predicate) })
}
}
extension QueryInterfaceRequest: OrderedRequest {
extension Request: OrderedRequest {
// MARK: Request Derivation
/// Creates a request with the provided *orderings promise*.
@@ -255,7 +255,7 @@ extension QueryInterfaceRequest: OrderedRequest {
/// .order{ _ in [Column("email")] }
/// .reversed()
/// .order{ _ in [Column("name")] }
public func order(_ orderings: @escaping (Database) throws -> [SQLOrderingTerm]) -> QueryInterfaceRequest {
public func order(_ orderings: @escaping (Database) throws -> [SQLOrderingTerm]) -> Self {
map(\.query, { $0.order(orderings) })
}
@@ -270,7 +270,7 @@ extension QueryInterfaceRequest: OrderedRequest {
/// // SELECT * FROM player
/// var request = Player.all()
/// request = request.reversed()
public func reversed() -> QueryInterfaceRequest {
public func reversed() -> Self {
map(\.query, { $0.reversed() })
}
@@ -279,56 +279,56 @@ extension QueryInterfaceRequest: OrderedRequest {
/// // SELECT * FROM player
/// var request = Player.all().order(Column("name"))
/// request = request.unordered()
public func unordered() -> QueryInterfaceRequest {
public func unordered() -> Self {
map(\.query, { $0.unordered() })
}
}
extension QueryInterfaceRequest: AggregatingRequest {
extension Request: AggregatingRequest {
// MARK: Request Derivation
/// Creates a request grouped according to *expressions promise*.
public func group(_ expressions: @escaping (Database) throws -> [SQLExpressible]) -> QueryInterfaceRequest {
public func group(_ expressions: @escaping (Database) throws -> [SQLExpressible]) -> Self {
map(\.query, { $0.group(expressions) })
}
/// Creates a request with the provided *predicate* added to the
/// eventual set of already applied predicates.
public func having(_ predicate: SQLExpressible) -> QueryInterfaceRequest {
public func having(_ predicate: SQLExpressible) -> Self {
map(\.query, { $0.having(predicate) })
}
}
extension QueryInterfaceRequest: _JoinableRequest {
extension Request: _JoinableRequest {
/// :nodoc:
public func _including(all association: SQLAssociation) -> QueryInterfaceRequest {
public func _including(all association: SQLAssociation) -> Self {
map(\.query, { $0._including(all: association) })
}
/// :nodoc:
public func _including(optional association: SQLAssociation) -> QueryInterfaceRequest {
public func _including(optional association: SQLAssociation) -> Self {
map(\.query, { $0._including(optional: association) })
}
/// :nodoc:
public func _including(required association: SQLAssociation) -> QueryInterfaceRequest {
public func _including(required association: SQLAssociation) -> Self {
map(\.query, { $0._including(required: association) })
}
/// :nodoc:
public func _joining(optional association: SQLAssociation) -> QueryInterfaceRequest {
public func _joining(optional association: SQLAssociation) -> Self {
map(\.query, { $0._joining(optional: association) })
}
/// :nodoc:
public func _joining(required association: SQLAssociation) -> QueryInterfaceRequest {
public func _joining(required association: SQLAssociation) -> Self {
map(\.query, { $0._joining(required: association) })
}
}
extension QueryInterfaceRequest: JoinableRequest where T: TableRecord { }
extension Request: JoinableRequest where T: TableRecord { }
extension QueryInterfaceRequest: KeyPathRefining {
extension Request {
// MARK: Request Derivation
@@ -341,18 +341,18 @@ extension QueryInterfaceRequest: KeyPathRefining {
/// // SELECT DISTINCT name FROM player
/// var request = Player.select(Column("name"))
/// request = request.distinct()
public func distinct() -> QueryInterfaceRequest {
public func distinct() -> Self {
map(\.query, { $0.distinct() })
}
/// Creates a request which expects a single result.
///
/// It is unlikely you need to call this method. Its net effect is that
/// QueryInterfaceRequest does not use any `LIMIT 1` sql clause when you
/// Request does not use any `LIMIT 1` sql clause when you
/// call a `fetchOne` method.
///
/// :nodoc:
public func expectingSingleResult() -> QueryInterfaceRequest {
public func expectingSingleResult() -> Self {
map(\.query, { $0.expectingSingleResult() })
}
@@ -364,7 +364,7 @@ extension QueryInterfaceRequest: KeyPathRefining {
/// request = request.limit(1)
///
/// Any previous limit is replaced.
public func limit(_ limit: Int, offset: Int? = nil) -> QueryInterfaceRequest {
public func limit(_ limit: Int, offset: Int? = nil) -> Self {
map(\.query, { $0.limit(limit, offset: offset) })
}
@@ -385,7 +385,7 @@ extension QueryInterfaceRequest: KeyPathRefining {
/// .all()
/// .aliased(playerAlias)
/// .including(required: Player.team.filter(Column("avgScore") < playerAlias[Column("score")])
public func aliased(_ alias: TableAlias) -> QueryInterfaceRequest {
public func aliased(_ alias: TableAlias) -> Self {
map(\.query, { $0.qualified(with: alias) })
}
@@ -402,12 +402,12 @@ extension QueryInterfaceRequest: KeyPathRefining {
///
/// - parameter type: The fetched type Target
/// - returns: A typed request bound to type Target.
public func asRequest<RowDecoder>(of type: RowDecoder.Type) -> QueryInterfaceRequest<RowDecoder> {
QueryInterfaceRequest<RowDecoder>(query: query)
public func asRequest<RowDecoder>(of type: RowDecoder.Type) -> Request<RowDecoder> {
Request<RowDecoder>(query: query)
}
}
extension QueryInterfaceRequest {
extension Request {
/// Turns a request into a SQLRelation.
///
/// This method helps initializing associations:
@@ -429,7 +429,7 @@ extension QueryInterfaceRequest {
}
}
extension QueryInterfaceRequest: TableRequest {
extension Request: TableRequest {
/// :nodoc:
public var databaseTableName: String {
switch query.relation.source {
@@ -449,16 +449,16 @@ extension QueryInterfaceRequest: TableRequest {
// let request = Player.limit(10)
// let count = try request.fetchCount(db)
//
// This query is currently never wrapped in a QueryInterfaceRequest
// This query is currently never wrapped in a Request
// So this fatal error can not currently happen.
fatalError("Request is not based on a database table")
}
}
}
extension QueryInterfaceRequest: DerivableRequest where T: TableRecord { }
extension Request: DerivableRequest where T: TableRecord { }
extension QueryInterfaceRequest where T: MutablePersistableRecord {
extension Request where T: MutablePersistableRecord {
// MARK: Batch Delete
@@ -546,7 +546,7 @@ private func prefetch(_ db: Database, associations: [SQLAssociation], in rows: [
return
}
// CAUTION: Keep this code in sync with QueryInterfaceRequest.databaseRegion(_:)
// CAUTION: Keep this code in sync with Request.databaseRegion(_:)
for association in associations {
let pivotMappings = try association.pivot.condition.columnMappings(db)
@@ -579,7 +579,7 @@ private func prefetch(_ db: Database, associations: [SQLAssociation], in rows: [
.map(\.pivot.relation, { $0.qualified(with: pivotAlias) })
.destinationRelation(fromOriginRows: { _ in rows })
.annotated(with: pivotColumns.map { pivotAlias[Column($0)].forKey("grdb_\($0)") })
prefetchedRows = try QueryInterfaceRequest(relation: prefetchedRelation)
prefetchedRows = try Request(relation: prefetchedRelation)
.fetchAll(db)
.grouped(byDatabaseValuesOnColumns: pivotColumns.map { "grdb_\($0)" })
// TODO: can we remove those grdb_ columns now that grouping has been done?
@@ -16,7 +16,7 @@ public struct SQLCollatedExpression {
/// The name of the collation
public let collationName: Database.CollationName
/// Returns an ordering suitable for QueryInterfaceRequest.order()
/// Returns an ordering suitable for Request.order()
///
/// let email: SQLCollatedExpression = Column("email").collating(.nocase)
///
@@ -28,7 +28,7 @@ public struct SQLCollatedExpression {
SQLOrdering.asc(sqlExpression)
}
/// Returns an ordering suitable for QueryInterfaceRequest.order()
/// Returns an ordering suitable for Request.order()
///
/// let email: SQLCollatedExpression = Column("email").collating(.nocase)
///
@@ -41,7 +41,7 @@ public struct SQLCollatedExpression {
}
#if GRDBCUSTOMSQLITE
/// Returns an ordering suitable for QueryInterfaceRequest.order()
/// Returns an ordering suitable for Request.order()
///
/// let email: SQLCollatedExpression = Column("email").collating(.nocase)
///
@@ -53,7 +53,7 @@ public struct SQLCollatedExpression {
SQLOrdering.ascNullsLast(sqlExpression)
}
/// Returns an ordering suitable for QueryInterfaceRequest.order()
/// Returns an ordering suitable for Request.order()
///
/// let email: SQLCollatedExpression = Column("email").collating(.nocase)
///
@@ -3,14 +3,14 @@
/// :nodoc:
extension SQLSpecificExpressible {
/// Returns a value that can be used as an argument to QueryInterfaceRequest.order()
/// Returns a value that can be used as an argument to Request.order()
///
/// See https://github.com/groue/GRDB.swift/#the-query-interface
public var asc: SQLOrderingTerm {
SQLOrdering.asc(sqlExpression)
}
/// Returns a value that can be used as an argument to QueryInterfaceRequest.order()
/// Returns a value that can be used as an argument to Request.order()
///
/// See https://github.com/groue/GRDB.swift/#the-query-interface
public var desc: SQLOrderingTerm {
@@ -18,14 +18,14 @@ extension SQLSpecificExpressible {
}
#if GRDBCUSTOMSQLITE
/// Returns a value that can be used as an argument to QueryInterfaceRequest.order()
/// Returns a value that can be used as an argument to Request.order()
///
/// See https://github.com/groue/GRDB.swift/#the-query-interface
public var ascNullsLast: SQLOrderingTerm {
SQLOrdering.ascNullsLast(sqlExpression)
}
/// Returns a value that can be used as an argument to QueryInterfaceRequest.order()
/// Returns a value that can be used as an argument to Request.order()
///
/// See https://github.com/groue/GRDB.swift/#the-query-interface
public var descNullsFirst: SQLOrderingTerm {
@@ -33,7 +33,7 @@ extension TableRecord {
///
/// struct Book: TableRecord, EncodableRecord {
/// static let author = belongsTo(Author.self)
/// var author: QueryInterfaceRequest<Author> {
/// var author: Request<Author> {
/// return request(for: Book.author)
/// }
/// }
@@ -98,7 +98,7 @@ extension TableRecord {
///
/// struct Author: TableRecord, EncodableRecord {
/// static let books = hasMany(Book.self)
/// var books: QueryInterfaceRequest<Book> {
/// var books: Request<Book> {
/// return request(for: Author.books)
/// }
/// }
@@ -170,7 +170,7 @@ extension TableRecord {
/// struct Country: TableRecord, EncodableRecord {
/// static let passports = hasMany(Passport.self)
/// static let citizens = hasMany(Citizen.self, through: passports, using: Passport.citizen)
/// var citizens: QueryInterfaceRequest<Citizen> {
/// var citizens: Request<Citizen> {
/// return request(for: Country.citizens)
/// }
/// }
@@ -245,7 +245,7 @@ extension TableRecord {
///
/// struct Country: TableRecord, EncodableRecord {
/// static let demographics = hasOne(Demographics.self)
/// var demographics: QueryInterfaceRequest<Demographics> {
/// var demographics: Request<Demographics> {
/// return request(for: Country.demographics)
/// }
/// }
@@ -317,7 +317,7 @@ extension TableRecord {
/// struct Book: TableRecord, EncodableRecord {
/// static let library = belongsTo(Library.self)
/// static let returnAddress = hasOne(Address.self, through: library, using: library.address)
/// var returnAddress: QueryInterfaceRequest<Address> {
/// var returnAddress: Request<Address> {
/// return request(for: Book.returnAddress)
/// }
/// }
@@ -475,7 +475,7 @@ extension TableRecord where Self: EncodableRecord {
///
/// struct Team: TableRecord, EncodableRecord {
/// static let players = hasMany(Player.self)
/// var players: QueryInterfaceRequest<Player> {
/// var players: Request<Player> {
/// return request(for: Team.players)
/// }
/// }
@@ -483,13 +483,13 @@ extension TableRecord where Self: EncodableRecord {
/// let team: Team = ...
/// let players = try team.players.fetchAll(db) // [Player]
public func request<A: Association>(for association: A)
-> QueryInterfaceRequest<A.RowDecoder>
-> Request<A.RowDecoder>
where A.OriginRowDecoder == Self
{
let destinationRelation = association.sqlAssociation.destinationRelation(fromOriginRows: { db in
try [Row(PersistenceContainer(db, self))]
})
return QueryInterfaceRequest(relation: destinationRelation)
return Request(relation: destinationRelation)
}
}
@@ -499,50 +499,50 @@ extension TableRecord {
/// Creates a request that prefetches an association.
public static func including<A: AssociationToMany>(all association: A)
-> QueryInterfaceRequest<Self>
-> Request<Self>
where A.OriginRowDecoder == Self
{
return all().including(all: association)
all().including(all: association)
}
/// Creates a request that includes an association. The columns of the
/// associated record are selected. The returned association does not
/// require that the associated database table contains a matching row.
public static func including<A: Association>(optional association: A)
-> QueryInterfaceRequest<Self>
-> Request<Self>
where A.OriginRowDecoder == Self
{
return all().including(optional: association)
all().including(optional: association)
}
/// Creates a request that includes an association. The columns of the
/// associated record are selected. The returned association requires
/// that the associated database table contains a matching row.
public static func including<A: Association>(required association: A)
-> QueryInterfaceRequest<Self>
-> Request<Self>
where A.OriginRowDecoder == Self
{
return all().including(required: association)
all().including(required: association)
}
/// Creates a request that includes an association. The columns of the
/// associated record are not selected. The returned association does not
/// require that the associated database table contains a matching row.
public static func joining<A: Association>(optional association: A)
-> QueryInterfaceRequest<Self>
-> Request<Self>
where A.OriginRowDecoder == Self
{
return all().joining(optional: association)
all().joining(optional: association)
}
/// Creates a request that includes an association. The columns of the
/// associated record are not selected. The returned association requires
/// that the associated database table contains a matching row.
public static func joining<A: Association>(required association: A)
-> QueryInterfaceRequest<Self>
-> Request<Self>
where A.OriginRowDecoder == Self
{
return all().joining(required: association)
all().joining(required: association)
}
// MARK: - Association Aggregates
@@ -552,7 +552,7 @@ extension TableRecord {
/// // SELECT player.*, COUNT(DISTINCT book.rowid) AS bookCount
/// // FROM player LEFT JOIN book ...
/// var request = Player.annotated(with: Player.books.count)
public static func annotated(with aggregates: AssociationAggregate<Self>...) -> QueryInterfaceRequest<Self> {
public static func annotated(with aggregates: AssociationAggregate<Self>...) -> Request<Self> {
all().annotated(with: aggregates)
}
@@ -561,7 +561,7 @@ extension TableRecord {
/// // SELECT player.*, COUNT(DISTINCT book.rowid) AS bookCount
/// // FROM player LEFT JOIN book ...
/// var request = Player.annotated(with: [Player.books.count])
public static func annotated(with aggregates: [AssociationAggregate<Self>]) -> QueryInterfaceRequest<Self> {
public static func annotated(with aggregates: [AssociationAggregate<Self>]) -> Request<Self> {
all().annotated(with: aggregates)
}
@@ -576,7 +576,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func having(_ predicate: AssociationAggregate<Self>) -> QueryInterfaceRequest<Self> {
public static func having(_ predicate: AssociationAggregate<Self>) -> Request<Self> {
all().having(predicate)
}
}
@@ -10,15 +10,15 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func all() -> QueryInterfaceRequest<Self> {
public static func all() -> Request<Self> {
let relation = SQLRelation(
source: .table(tableName: databaseTableName, alias: nil),
selection: databaseSelection)
return QueryInterfaceRequest(relation: relation)
return Request(relation: relation)
}
/// Creates a request which fetches no record.
public static func none() -> QueryInterfaceRequest<Self> {
public static func none() -> Request<Self> {
all().none() // don't laugh
}
@@ -26,7 +26,7 @@ extension TableRecord {
///
/// // SELECT id, email FROM player
/// let request = Player.select(Column("id"), Column("email"))
public static func select(_ selection: SQLSelectable...) -> QueryInterfaceRequest<Self> {
public static func select(_ selection: SQLSelectable...) -> Request<Self> {
all().select(selection)
}
@@ -34,7 +34,7 @@ extension TableRecord {
///
/// // SELECT id, email FROM player
/// let request = Player.select([Column("id"), Column("email")])
public static func select(_ selection: [SQLSelectable]) -> QueryInterfaceRequest<Self> {
public static func select(_ selection: [SQLSelectable]) -> Request<Self> {
all().select(selection)
}
@@ -45,7 +45,7 @@ extension TableRecord {
public static func select(
sql: String,
arguments: StatementArguments = StatementArguments())
-> QueryInterfaceRequest<Self>
-> Request<Self>
{
return select(literal: SQLLiteral(sql: sql, arguments: arguments))
}
@@ -54,7 +54,7 @@ extension TableRecord {
///
/// // SELECT id, email FROM player
/// let request = Player.select(literal: SQLLiteral(sql: "id, email"))
public static func select(literal sqlLiteral: SQLLiteral) -> QueryInterfaceRequest<Self> {
public static func select(literal sqlLiteral: SQLLiteral) -> Request<Self> {
all().select(literal: sqlLiteral)
}
@@ -69,7 +69,7 @@ extension TableRecord {
public static func select<RowDecoder>(
_ selection: [SQLSelectable],
as type: RowDecoder.Type = RowDecoder.self)
-> QueryInterfaceRequest<RowDecoder>
-> Request<RowDecoder>
{
return all().select(selection, as: type)
}
@@ -85,7 +85,7 @@ extension TableRecord {
public static func select<RowDecoder>(
_ selection: SQLSelectable...,
as type: RowDecoder.Type = RowDecoder.self)
-> QueryInterfaceRequest<RowDecoder>
-> Request<RowDecoder>
{
return all().select(selection, as: type)
}
@@ -102,7 +102,7 @@ extension TableRecord {
sql: String,
arguments: StatementArguments = StatementArguments(),
as type: RowDecoder.Type = RowDecoder.self)
-> QueryInterfaceRequest<RowDecoder>
-> Request<RowDecoder>
{
return all().select(literal: SQLLiteral(sql: sql, arguments: arguments), as: type)
}
@@ -118,7 +118,7 @@ extension TableRecord {
public static func select<RowDecoder>(
literal sqlLiteral: SQLLiteral,
as type: RowDecoder.Type = RowDecoder.self)
-> QueryInterfaceRequest<RowDecoder>
-> Request<RowDecoder>
{
return all().select(literal: sqlLiteral, as: type)
}
@@ -129,7 +129,7 @@ extension TableRecord {
/// le request = Player
/// .select([Column("id"), Column("email")])
/// .annotated(with: [Column("name")])
public static func annotated(with selection: [SQLSelectable]) -> QueryInterfaceRequest<Self> {
public static func annotated(with selection: [SQLSelectable]) -> Request<Self> {
all().annotated(with: selection)
}
@@ -139,7 +139,7 @@ extension TableRecord {
/// le request = Player
/// .select([Column("id"), Column("email")])
/// .annotated(with: Column("name"))
public static func annotated(with selection: SQLSelectable...) -> QueryInterfaceRequest<Self> {
public static func annotated(with selection: SQLSelectable...) -> Request<Self> {
all().annotated(with: selection)
}
@@ -151,7 +151,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func filter(_ predicate: SQLExpressible) -> QueryInterfaceRequest<Self> {
public static func filter(_ predicate: SQLExpressible) -> Request<Self> {
all().filter(predicate)
}
@@ -164,7 +164,7 @@ extension TableRecord {
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func filter<PrimaryKeyType>(key: PrimaryKeyType?)
-> QueryInterfaceRequest<Self>
-> Request<Self>
where PrimaryKeyType: DatabaseValueConvertible
{
return all().filter(key: key)
@@ -179,7 +179,7 @@ extension TableRecord {
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func filter<Sequence>(keys: Sequence)
-> QueryInterfaceRequest<Self>
-> Request<Self>
where Sequence: Swift.Sequence, Sequence.Element: DatabaseValueConvertible
{
return all().filter(keys: keys)
@@ -196,7 +196,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func filter(key: [String: DatabaseValueConvertible?]?) -> QueryInterfaceRequest<Self> {
public static func filter(key: [String: DatabaseValueConvertible?]?) -> Request<Self> {
all().filter(key: key)
}
@@ -211,7 +211,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func filter(keys: [[String: DatabaseValueConvertible?]]) -> QueryInterfaceRequest<Self> {
public static func filter(keys: [[String: DatabaseValueConvertible?]]) -> Request<Self> {
all().filter(keys: keys)
}
@@ -226,7 +226,7 @@ extension TableRecord {
public static func filter(
sql: String,
arguments: StatementArguments = StatementArguments())
-> QueryInterfaceRequest<Self>
-> Request<Self>
{
return filter(literal: SQLLiteral(sql: sql, arguments: arguments))
}
@@ -244,7 +244,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func filter(literal sqlLiteral: SQLLiteral) -> QueryInterfaceRequest<Self> {
public static func filter(literal sqlLiteral: SQLLiteral) -> Request<Self> {
// NOT TESTED
return all().filter(literal: sqlLiteral)
}
@@ -258,7 +258,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func order(_ orderings: SQLOrderingTerm...) -> QueryInterfaceRequest<Self> {
public static func order(_ orderings: SQLOrderingTerm...) -> Request<Self> {
all().order(orderings)
}
@@ -271,7 +271,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func order(_ orderings: [SQLOrderingTerm]) -> QueryInterfaceRequest<Self> {
public static func order(_ orderings: [SQLOrderingTerm]) -> Request<Self> {
all().order(orderings)
}
@@ -286,7 +286,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func orderByPrimaryKey() -> QueryInterfaceRequest<Self> {
public static func orderByPrimaryKey() -> Request<Self> {
all().orderByPrimaryKey()
}
@@ -301,7 +301,7 @@ extension TableRecord {
public static func order(
sql: String,
arguments: StatementArguments = StatementArguments())
-> QueryInterfaceRequest<Self>
-> Request<Self>
{
return all().order(literal: SQLLiteral(sql: sql, arguments: arguments))
}
@@ -320,7 +320,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func order(literal sqlLiteral: SQLLiteral) -> QueryInterfaceRequest<Self> {
public static func order(literal sqlLiteral: SQLLiteral) -> Request<Self> {
all().order(literal: sqlLiteral)
}
@@ -333,7 +333,7 @@ extension TableRecord {
/// The selection defaults to all columns. This default can be changed for
/// all requests by the `TableRecord.databaseSelection` property, or
/// for individual requests with the `TableRecord.select` method.
public static func limit(_ limit: Int, offset: Int? = nil) -> QueryInterfaceRequest<Self> {
public static func limit(_ limit: Int, offset: Int? = nil) -> Request<Self> {
all().limit(limit, offset: offset)
}
@@ -353,7 +353,7 @@ extension TableRecord {
/// let request = Player
/// .aliased(playerAlias)
/// .including(required: Player.team.filter(Column("avgScore") < playerAlias[Column("score")])
public static func aliased(_ alias: TableAlias) -> QueryInterfaceRequest<Self> {
public static func aliased(_ alias: TableAlias) -> Request<Self> {
all().aliased(alias)
}
}
+18 -18
View File
@@ -183,14 +183,14 @@
5656A8702295BD56001FF3FF /* Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8392295BD56001FF3FF /* Association.swift */; };
5656A8712295BD56001FF3FF /* HasOneThroughAssociation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83A2295BD56001FF3FF /* HasOneThroughAssociation.swift */; };
5656A8722295BD56001FF3FF /* HasOneThroughAssociation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83A2295BD56001FF3FF /* HasOneThroughAssociation.swift */; };
5656A8732295BD56001FF3FF /* QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83B2295BD56001FF3FF /* QueryInterfaceRequest.swift */; };
5656A8742295BD56001FF3FF /* QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83B2295BD56001FF3FF /* QueryInterfaceRequest.swift */; };
5656A8732295BD56001FF3FF /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83B2295BD56001FF3FF /* Request.swift */; };
5656A8742295BD56001FF3FF /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83B2295BD56001FF3FF /* Request.swift */; };
5656A8752295BD56001FF3FF /* RequestProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83C2295BD56001FF3FF /* RequestProtocols.swift */; };
5656A8762295BD56001FF3FF /* RequestProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83C2295BD56001FF3FF /* RequestProtocols.swift */; };
5656A8772295BD56001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83D2295BD56001FF3FF /* TableRecord+QueryInterfaceRequest.swift */; };
5656A8782295BD56001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83D2295BD56001FF3FF /* TableRecord+QueryInterfaceRequest.swift */; };
5656A87B2295BD56001FF3FF /* QueryInterfaceRequest+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83F2295BD56001FF3FF /* QueryInterfaceRequest+Association.swift */; };
5656A87C2295BD56001FF3FF /* QueryInterfaceRequest+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83F2295BD56001FF3FF /* QueryInterfaceRequest+Association.swift */; };
5656A8772295BD56001FF3FF /* TableRecord+Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83D2295BD56001FF3FF /* TableRecord+Request.swift */; };
5656A8782295BD56001FF3FF /* TableRecord+Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83D2295BD56001FF3FF /* TableRecord+Request.swift */; };
5656A87B2295BD56001FF3FF /* Request+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83F2295BD56001FF3FF /* Request+Association.swift */; };
5656A87C2295BD56001FF3FF /* Request+Association.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A83F2295BD56001FF3FF /* Request+Association.swift */; };
5656A87D2295BD56001FF3FF /* SQLAssociation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8412295BD56001FF3FF /* SQLAssociation.swift */; };
5656A87E2295BD56001FF3FF /* SQLAssociation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8412295BD56001FF3FF /* SQLAssociation.swift */; };
5656A87F2295BD56001FF3FF /* SQLForeignKeyRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5656A8422295BD56001FF3FF /* SQLForeignKeyRequest.swift */; };
@@ -827,10 +827,10 @@
5656A8382295BD56001FF3FF /* HasManyThroughAssociation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HasManyThroughAssociation.swift; sourceTree = "<group>"; };
5656A8392295BD56001FF3FF /* Association.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Association.swift; sourceTree = "<group>"; };
5656A83A2295BD56001FF3FF /* HasOneThroughAssociation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HasOneThroughAssociation.swift; sourceTree = "<group>"; };
5656A83B2295BD56001FF3FF /* QueryInterfaceRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryInterfaceRequest.swift; sourceTree = "<group>"; };
5656A83B2295BD56001FF3FF /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
5656A83C2295BD56001FF3FF /* RequestProtocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestProtocols.swift; sourceTree = "<group>"; };
5656A83D2295BD56001FF3FF /* TableRecord+QueryInterfaceRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TableRecord+QueryInterfaceRequest.swift"; sourceTree = "<group>"; };
5656A83F2295BD56001FF3FF /* QueryInterfaceRequest+Association.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "QueryInterfaceRequest+Association.swift"; sourceTree = "<group>"; };
5656A83D2295BD56001FF3FF /* TableRecord+Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TableRecord+Request.swift"; sourceTree = "<group>"; };
5656A83F2295BD56001FF3FF /* Request+Association.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Request+Association.swift"; sourceTree = "<group>"; };
5656A8412295BD56001FF3FF /* SQLAssociation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLAssociation.swift; sourceTree = "<group>"; };
5656A8422295BD56001FF3FF /* SQLForeignKeyRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLForeignKeyRequest.swift; sourceTree = "<group>"; };
5656A8432295BD56001FF3FF /* SQLCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLCollection.swift; sourceTree = "<group>"; };
@@ -1381,7 +1381,7 @@
5656A8292295BD56001FF3FF /* SQLGeneration */,
5656A8262295BD56001FF3FF /* SQLInterpolation+QueryInterface.swift */,
5656A8312295BD56001FF3FF /* TableRecord+Association.swift */,
5656A83D2295BD56001FF3FF /* TableRecord+QueryInterfaceRequest.swift */,
5656A83D2295BD56001FF3FF /* TableRecord+Request.swift */,
);
path = QueryInterface;
sourceTree = "<group>";
@@ -1408,8 +1408,8 @@
isa = PBXGroup;
children = (
5656A8332295BD56001FF3FF /* Association */,
5656A83B2295BD56001FF3FF /* QueryInterfaceRequest.swift */,
5656A83F2295BD56001FF3FF /* QueryInterfaceRequest+Association.swift */,
5656A83B2295BD56001FF3FF /* Request.swift */,
5656A83F2295BD56001FF3FF /* Request+Association.swift */,
5656A83C2295BD56001FF3FF /* RequestProtocols.swift */,
);
path = Request;
@@ -2165,13 +2165,13 @@
56CEB4FF1EAA2F4D00BFAF62 /* FTS3.swift in Sources */,
5656A8922295BD56001FF3FF /* SQLSpecificExpressible+QueryInterface.swift in Sources */,
5698AD3A1DABAF4A0056AF8C /* FTS5CustomTokenizer.swift in Sources */,
5656A8742295BD56001FF3FF /* QueryInterfaceRequest.swift in Sources */,
5656A8742295BD56001FF3FF /* Request.swift in Sources */,
566B91181FA4C3F50012D5B0 /* DatabaseCollation.swift in Sources */,
F3BA80181CFB2876003DC1BA /* SerializedDatabase.swift in Sources */,
5674A7051F307FCD0095F066 /* DatabaseValueConvertible+ReferenceConvertible.swift in Sources */,
563082EB2430B6CD00C14A05 /* DatabaseCancellable.swift in Sources */,
F3BA800D1CFB2871003DC1BA /* DatabasePool.swift in Sources */,
5656A87C2295BD56001FF3FF /* QueryInterfaceRequest+Association.swift in Sources */,
5656A87C2295BD56001FF3FF /* Request+Association.swift in Sources */,
F3BA800B1CFB286D003DC1BA /* Database.swift in Sources */,
F3BA80341CFB28A4003DC1BA /* Record.swift in Sources */,
56C0539422ACEECD0029D27D /* Fetch.swift in Sources */,
@@ -2217,7 +2217,7 @@
5644DE7920F8C8EA001FFDDE /* DatabaseValueConversion.swift in Sources */,
56DAA2E01DE9C827006E10C8 /* Cursor.swift in Sources */,
F3BA800C1CFB286F003DC1BA /* DatabaseError.swift in Sources */,
5656A8782295BD56001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */,
5656A8782295BD56001FF3FF /* TableRecord+Request.swift in Sources */,
566B91301FA4D0CC0012D5B0 /* StatementAuthorizer.swift in Sources */,
5656A86A2295BD56001FF3FF /* AssociationAggregate.swift in Sources */,
56C0539C22ACEECD0029D27D /* Map.swift in Sources */,
@@ -2501,13 +2501,13 @@
56CEB4FC1EAA2F4D00BFAF62 /* FTS3.swift in Sources */,
5656A8912295BD56001FF3FF /* SQLSpecificExpressible+QueryInterface.swift in Sources */,
5698AD371DABAF4A0056AF8C /* FTS5CustomTokenizer.swift in Sources */,
5656A8732295BD56001FF3FF /* QueryInterfaceRequest.swift in Sources */,
5656A8732295BD56001FF3FF /* Request.swift in Sources */,
566B91151FA4C3F50012D5B0 /* DatabaseCollation.swift in Sources */,
F3BA80741CFB2E55003DC1BA /* SerializedDatabase.swift in Sources */,
5674A7041F307FCD0095F066 /* DatabaseValueConvertible+ReferenceConvertible.swift in Sources */,
563082EA2430B6CD00C14A05 /* DatabaseCancellable.swift in Sources */,
F3BA80691CFB2E55003DC1BA /* DatabasePool.swift in Sources */,
5656A87B2295BD56001FF3FF /* QueryInterfaceRequest+Association.swift in Sources */,
5656A87B2295BD56001FF3FF /* Request+Association.swift in Sources */,
F3BA80671CFB2E55003DC1BA /* Database.swift in Sources */,
F3BA80901CFB2E7A003DC1BA /* Record.swift in Sources */,
56C0539322ACEECD0029D27D /* Fetch.swift in Sources */,
@@ -2553,7 +2553,7 @@
5644DE7820F8C8EA001FFDDE /* DatabaseValueConversion.swift in Sources */,
56DAA2DD1DE9C827006E10C8 /* Cursor.swift in Sources */,
F3BA80681CFB2E55003DC1BA /* DatabaseError.swift in Sources */,
5656A8772295BD56001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */,
5656A8772295BD56001FF3FF /* TableRecord+Request.swift in Sources */,
566B912D1FA4D0CC0012D5B0 /* StatementAuthorizer.swift in Sources */,
5656A8692295BD56001FF3FF /* AssociationAggregate.swift in Sources */,
56C0539B22ACEECD0029D27D /* Map.swift in Sources */,
+3 -3
View File
@@ -4468,7 +4468,7 @@ Once you have a request, you can fetch the records at the origin of the request:
```swift
// Some request based on `Player`
let request = Player.filter(...)... // QueryInterfaceRequest<Player>
let request = Player.filter(...)... // Request<Player>
// Fetch players:
try request.fetchCursor(db) // A Cursor of Player
@@ -4734,10 +4734,10 @@ try Player.updateAll(db, onConflict: .ignore, /* assignments... */)
Until now, we have seen [requests](#requests) created from any type that adopts the [TableRecord] protocol:
```swift
let request = Player.all() // QueryInterfaceRequest<Player>
let request = Player.all() // Request<Player>
```
Those requests of type `QueryInterfaceRequest` can fetch and count:
Those requests of type `Request` can fetch and count:
```swift
try request.fetchCursor(db) // A Cursor of Player
@@ -27,12 +27,12 @@ private struct PlayerWithOptionalTeam: Decodable, FetchableRecord {
static let team = Player.team.forKey(CodingKeys.team)
}
extension QueryInterfaceRequest where T == Player {
func filter(teamName: String) -> QueryInterfaceRequest<Player> {
extension Request where T == Player {
func filter(teamName: String) -> Request<Player> {
joining(required: PlayerWithOptionalTeam.team.filter(Column("name") == teamName))
}
func orderedByTeamName() -> QueryInterfaceRequest<Player> {
func orderedByTeamName() -> Request<Player> {
let teamAlias = TableAlias()
return joining(optional: PlayerWithOptionalTeam.team.aliased(teamAlias))
.order(teamAlias[Column("name")], Column("name"))
@@ -182,9 +182,9 @@ class AssociationBelongsToSQLDerivationTests: GRDBTestCase {
let abaBase = B.a.aliased(TableAlias(name: "aba"))
let aTransforms = [
{ (r: QueryInterfaceRequest<A>) in return r },
{ (r: QueryInterfaceRequest<A>) in return r.order(Column("id")) },
{ (r: QueryInterfaceRequest<A>) in return r.order(Column("id")).reversed() },
{ (r: Request<A>) in return r },
{ (r: Request<A>) in return r.order(Column("id")) },
{ (r: Request<A>) in return r.order(Column("id")).reversed() },
]
let abTransforms = [
{ (r: BelongsToAssociation<A, B>) in return r },
@@ -223,7 +223,7 @@ class AssociationBelongsToSQLDerivationTests: GRDBTestCase {
return String(sql.suffix(from: prefixEndIndex))
}
XCTAssertEqual(orderClauses, [
// a: { (r: QueryInterfaceRequest<A>) in return r },
// a: { (r: Request<A>) in return r },
// ab: { (r: BelongsToAssociation<A, B>) in return r }
// aba: { (r: HasOneAssociation<B, A>) in return r }
"",
@@ -265,7 +265,7 @@ class AssociationBelongsToSQLDerivationTests: GRDBTestCase {
" ORDER BY \"aba\".\"id\"",
// a: { (r: QueryInterfaceRequest<A>) in return r.order(Column("id")) },
// a: { (r: Request<A>) in return r.order(Column("id")) },
// ab: { (r: BelongsToAssociation<A, B>) in return r }
// aba: { (r: HasOneAssociation<B, A>) in return r }
" ORDER BY \"a\".\"id\"",
@@ -307,7 +307,7 @@ class AssociationBelongsToSQLDerivationTests: GRDBTestCase {
" ORDER BY \"a\".\"id\", \"aba\".\"id\"",
// a: { (r: QueryInterfaceRequest<A>) in return r.order(Column("id")).reversed() }
// a: { (r: Request<A>) in return r.order(Column("id")).reversed() }
// ab: { (r: BelongsToAssociation<A, B>) in return r }
// aba: { (r: HasOneAssociation<B, A>) in return r }
" ORDER BY \"a\".\"id\" DESC",
@@ -182,9 +182,9 @@ class AssociationHasOneSQLDerivationTests: GRDBTestCase {
let abaBase = B.a.aliased(TableAlias(name: "aba"))
let aTransforms = [
{ (r: QueryInterfaceRequest<A>) in return r },
{ (r: QueryInterfaceRequest<A>) in return r.order(Column("id")) },
{ (r: QueryInterfaceRequest<A>) in return r.order(Column("id")).reversed() },
{ (r: Request<A>) in return r },
{ (r: Request<A>) in return r.order(Column("id")) },
{ (r: Request<A>) in return r.order(Column("id")).reversed() },
]
let abTransforms = [
{ (r: HasOneAssociation<A, B>) in return r },
@@ -223,7 +223,7 @@ class AssociationHasOneSQLDerivationTests: GRDBTestCase {
return String(sql.suffix(from: prefixEndIndex))
}
XCTAssertEqual(orderClauses, [
// a: { (r: QueryInterfaceRequest<A>) in return r },
// a: { (r: Request<A>) in return r },
// ab: { (r: BelongsToAssociation<A, B>) in return r }
// aba: { (r: HasOneAssociation<B, A>) in return r }
"",
@@ -265,7 +265,7 @@ class AssociationHasOneSQLDerivationTests: GRDBTestCase {
" ORDER BY \"aba\".\"id\"",
// a: { (r: QueryInterfaceRequest<A>) in return r.order(Column("id")) },
// a: { (r: Request<A>) in return r.order(Column("id")) },
// ab: { (r: BelongsToAssociation<A, B>) in return r }
// aba: { (r: HasOneAssociation<B, A>) in return r }
" ORDER BY \"a\".\"id\"",
@@ -307,7 +307,7 @@ class AssociationHasOneSQLDerivationTests: GRDBTestCase {
" ORDER BY \"a\".\"id\", \"aba\".\"id\"",
// a: { (r: QueryInterfaceRequest<A>) in return r.order(Column("id")).reversed() }
// a: { (r: Request<A>) in return r.order(Column("id")).reversed() }
// ab: { (r: BelongsToAssociation<A, B>) in return r }
// aba: { (r: HasOneAssociation<B, A>) in return r }
" ORDER BY \"a\".\"id\" DESC",
@@ -202,7 +202,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
// .include(B1.aliased("customB"))
let dbQueue = try makeDatabaseQueue()
try dbQueue.inDatabase { db in
let aAlias1 = TableAlias(name: "customA1") // On TableMapping and QueryInterfaceRequest
let aAlias1 = TableAlias(name: "customA1") // On TableMapping and Request
let bAlias = TableAlias(name: "customB") // On BelongsToAssociation
let aAlias2 = TableAlias(name: "customA2") // On HasOneAssociation
@@ -336,7 +336,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
let dbQueue = try makeDatabaseQueue()
try dbQueue.inDatabase { db in
do {
let request: QueryInterfaceRequest<A> = {
let request: Request<A> = {
let parentAlias = TableAlias()
let name = Column("name")
return A
@@ -344,7 +344,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
.filter(parentAlias[name] == "foo")
}()
let request2: QueryInterfaceRequest<A> = {
let request2: Request<A> = {
let parentAlias = TableAlias()
let name = Column("name")
return request
@@ -363,7 +363,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
""")
}
do {
let request: QueryInterfaceRequest<A> = {
let request: Request<A> = {
let parentAlias = TableAlias(name: "parent")
let name = Column("name")
return A
@@ -371,7 +371,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
.filter(parentAlias[name] == "foo")
}()
let request2: QueryInterfaceRequest<A> = {
let request2: Request<A> = {
let parentAlias = TableAlias()
let name = Column("name")
return request
@@ -390,7 +390,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
""")
}
do {
let request: QueryInterfaceRequest<A> = {
let request: Request<A> = {
let parentAlias = TableAlias()
let name = Column("name")
return A
@@ -398,7 +398,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
.filter(parentAlias[name] == "foo")
}()
let request2: QueryInterfaceRequest<A> = {
let request2: Request<A> = {
let parentAlias = TableAlias(name: "parent")
let name = Column("name")
return request
@@ -417,7 +417,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
""")
}
do {
let request: QueryInterfaceRequest<A> = {
let request: Request<A> = {
let parentAlias = TableAlias(name: "parent")
let name = Column("name")
return A
@@ -425,7 +425,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
.filter(parentAlias[name] == "foo")
}()
let request2: QueryInterfaceRequest<A> = {
let request2: Request<A> = {
let parentAlias = TableAlias(name: "parent")
let name = Column("name")
return request
@@ -444,7 +444,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
""")
}
do {
let request: QueryInterfaceRequest<A> = {
let request: Request<A> = {
let parentAlias = TableAlias()
let name = Column("name")
return A
@@ -452,7 +452,7 @@ class AssociationTableAliasTestsSQLTests : GRDBTestCase {
.filter(parentAlias[name] == "foo")
}()
let request2: QueryInterfaceRequest<A> = {
let request2: Request<A> = {
let parentAlias = TableAlias()
let name = Column("name")
return request
+4 -4
View File
@@ -36,7 +36,7 @@ class ColumnExpressionTests: GRDBTestCase {
container[Columns.score] = score
}
static var testRequest: QueryInterfaceRequest<Player> {
static var testRequest: Request<Player> {
// Test expression derivation
return filter(Columns.name != nil).order(Columns.score.desc)
}
@@ -96,7 +96,7 @@ class ColumnExpressionTests: GRDBTestCase {
container[Columns.score] = score
}
static var testRequest: QueryInterfaceRequest<Player> {
static var testRequest: Request<Player> {
// Test expression derivation
return filter(Columns.name != nil).order(Columns.score.desc)
}
@@ -150,7 +150,7 @@ class ColumnExpressionTests: GRDBTestCase {
// Test databaseSelection
static let databaseSelection: [SQLSelectable] = [Columns.id, Columns.name, Columns.score]
static var testRequest: QueryInterfaceRequest<Player> {
static var testRequest: Request<Player> {
// Test expression derivation
return filter(Columns.name != nil).order(Columns.score.desc)
}
@@ -198,7 +198,7 @@ class ColumnExpressionTests: GRDBTestCase {
// Test databaseSelection
static let databaseSelection: [SQLSelectable] = [CodingKeys.id, CodingKeys.name, CodingKeys.score]
static var testRequest: QueryInterfaceRequest<Player> {
static var testRequest: Request<Player> {
// Test expression derivation
return filter(CodingKeys.name != nil).order(CodingKeys.score.desc)
}
+2 -2
View File
@@ -15,7 +15,7 @@ private struct Author: FetchableRecord, PersistableRecord, Codable {
static let databaseTableName = "author"
static let books = hasMany(Book.self)
var books: QueryInterfaceRequest<Book> { request(for: Author.books) }
var books: Request<Book> { request(for: Author.books) }
}
private struct Book: FetchableRecord, PersistableRecord, Codable {
@@ -30,7 +30,7 @@ private struct Book: FetchableRecord, PersistableRecord, Codable {
static let bookFts5 = hasOne(BookFts5.self, using: ForeignKey([Column.rowID]))
#endif
var author: QueryInterfaceRequest<Author> { request(for: Book.author) }
var author: Request<Author> { request(for: Book.author) }
}
private struct BookFts4: TableRecord { }
@@ -21,7 +21,7 @@ private enum Columns: String, ColumnExpression {
case id, name, score, bonus
}
private extension QueryInterfaceRequest where RowDecoder == Player {
private extension Request where RowDecoder == Player {
func incrementScore(_ db: Database) throws {
try updateAll(db, Columns.score += 1)
}
@@ -192,7 +192,7 @@ class QueryInterfaceRequestTests: GRDBTestCase {
try db.execute(sql: "INSERT INTO readers (name, age) VALUES (?, ?)", arguments: ["Arthur", 42])
try db.execute(sql: "INSERT INTO readers (name, age) VALUES (?, ?)", arguments: ["Barbara", 36])
func test(_ request: QueryInterfaceRequest<Reader>) throws {
func test(_ request: Request<Reader>) throws {
let rows = try Row.fetchAll(db, request)
XCTAssertEqual(rows.count, 2)
XCTAssertEqual(rows[0][0] as String, "O'Brien")
@@ -498,51 +498,51 @@ class QueryInterfaceRequestTests: GRDBTestCase {
// This test passes if this method compiles
func testSelectAsTypeInference() {
_ = Reader.select(Col.name) as QueryInterfaceRequest<String>
_ = Reader.select([Col.name]) as QueryInterfaceRequest<String>
_ = Reader.select(sql: "name") as QueryInterfaceRequest<String>
_ = Reader.select(literal: SQLLiteral(sql: "name")) as QueryInterfaceRequest<String>
_ = Reader.all().select(Col.name) as QueryInterfaceRequest<String>
_ = Reader.all().select([Col.name]) as QueryInterfaceRequest<String>
_ = Reader.all().select(sql: "name") as QueryInterfaceRequest<String>
_ = Reader.all().select(literal: SQLLiteral(sql: "name")) as QueryInterfaceRequest<String>
_ = Reader.select(Col.name) as Request<String>
_ = Reader.select([Col.name]) as Request<String>
_ = Reader.select(sql: "name") as Request<String>
_ = Reader.select(literal: SQLLiteral(sql: "name")) as Request<String>
_ = Reader.all().select(Col.name) as Request<String>
_ = Reader.all().select([Col.name]) as Request<String>
_ = Reader.all().select(sql: "name") as Request<String>
_ = Reader.all().select(literal: SQLLiteral(sql: "name")) as Request<String>
func makeRequest() -> QueryInterfaceRequest<String> {
func makeRequest() -> Request<String> {
Reader.select(Col.name)
}
// Those should be, without any ambiguuity, requests of Reader.
do {
let request = Reader.select(Col.name)
_ = request as QueryInterfaceRequest<Reader>
_ = request as Request<Reader>
}
do {
let request = Reader.select([Col.name])
_ = request as QueryInterfaceRequest<Reader>
_ = request as Request<Reader>
}
do {
let request = Reader.select(sql: "name")
_ = request as QueryInterfaceRequest<Reader>
_ = request as Request<Reader>
}
do {
let request = Reader.select(literal: SQLLiteral(sql: "name"))
_ = request as QueryInterfaceRequest<Reader>
_ = request as Request<Reader>
}
do {
let request = Reader.all().select(Col.name)
_ = request as QueryInterfaceRequest<Reader>
_ = request as Request<Reader>
}
do {
let request = Reader.all().select([Col.name])
_ = request as QueryInterfaceRequest<Reader>
_ = request as Request<Reader>
}
do {
let request = Reader.all().select(sql: "name")
_ = request as QueryInterfaceRequest<Reader>
_ = request as Request<Reader>
}
do {
let request = Reader.all().select(literal: SQLLiteral(sql: "name"))
_ = request as QueryInterfaceRequest<Reader>
_ = request as Request<Reader>
}
}
@@ -135,7 +135,7 @@ class TableRecordQueryInterfaceRequestTests: GRDBTestCase {
try db.execute(sql: "INSERT INTO readers (name, age) VALUES (?, ?)", arguments: ["Arthur", 42])
try db.execute(sql: "INSERT INTO readers (name, age) VALUES (?, ?)", arguments: ["Barbara", 36])
func test(_ request: QueryInterfaceRequest<Reader>) throws {
func test(_ request: Request<Reader>) throws {
let rows = try Row.fetchAll(db, request)
XCTAssertEqual(rows.count, 2)
XCTAssertEqual(rows[0][0] as String, "O'Brien")