Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for the union query clause #723

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions Sources/SQLite/Typed/Query.swift
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,27 @@ extension QueryType {
return query
}

// MARK: UNION

/// Adds a `UNION` clause to the query.
///
/// let users = Table("users")
/// let email = Expression<String>("email")
///
/// users.filter(email == "alice@example.com").union(users.filter(email == "sally@example.com"))
/// // SELECT * FROM "users" WHERE email = 'alice@example.com' UNION SELECT * FROM "users" WHERE email = 'sally@example.com'
///
/// - Parameters:
///
/// - table: A query representing the other table.
///
/// - Returns: A query with the given `UNION` clause applied.
public func union(_ table: QueryType) -> Self {
var query = self
query.clauses.union.append(table)
return query
}

// MARK: JOIN

/// Adds a `JOIN` clause to the query.
Expand Down Expand Up @@ -565,6 +586,19 @@ extension QueryType {
Expression<Void>(literal: "OFFSET \(offset)")
])
}

fileprivate var unionClause: Expressible? {
guard !clauses.union.isEmpty else {
return nil
}

return " ".join(clauses.union.map { query in
" ".join([
Expression<Void>(literal: "UNION"),
query
])
})
}

// MARK: -

Expand Down Expand Up @@ -779,6 +813,7 @@ extension QueryType {
joinClause,
whereClause,
groupByClause,
unionClause,
orderClause,
limitOffsetClause
]
Expand Down Expand Up @@ -1154,6 +1189,8 @@ public struct QueryClauses {
var order = [Expressible]()

var limit: (length: Int, offset: Int?)?

var union = [QueryType]()

fileprivate init(_ name: String, alias: String?, database: String?) {
self.from = (name, alias, database)
Expand Down
22 changes: 21 additions & 1 deletion Tests/SQLiteTests/QueryTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -361,5 +361,25 @@ class QueryIntegrationTests : SQLiteTestCase {
let changes = try! db.run(users.delete())
XCTAssertEqual(0, changes)
}


func test_union() throws {
let expectedIDs = [
try db.run(users.insert(email <- "alice@example.com")),
try db.run(users.insert(email <- "sally@example.com"))
]

let query1 = users.filter(email == "alice@example.com")
let query2 = users.filter(email == "sally@example.com")

let actualIDs = try db.prepare(query1.union(query2)).map { $0[id] }
XCTAssertEqual(expectedIDs, actualIDs)

let query3 = users.select(users[*], Expression<Int>(literal: "1 AS weight")).filter(email == "sally@example.com")
let query4 = users.select(users[*], Expression<Int>(literal: "2 AS weight")).filter(email == "alice@example.com")

print(query3.union(query4).order(Expression<Int>(literal: "weight")).asSQL())

let orderedIDs = try db.prepare(query3.union(query4).order(Expression<Int>(literal: "weight"), email)).map { $0[id] }
XCTAssertEqual(Array(expectedIDs.reversed()), orderedIDs)
}
}