Add `QueryExpression<Optional>.map,flatMap` #80

stephencelis · 2025-06-16T18:55:54Z

This PR adds helpers that make it a little easier to work with optional query expressions in a builder.

For example, if you want to execute a LIKE operator on an optional string, you currently have to resort to one of the following workarounds, that either muddy the underlying SQL or require escape hatches outside the type system:

.where { ($0.title ?? "").like("%foo%") }
// WHERE coalesce("title", '') LIKE '%foo%'

.where { #sql("\($0.title) LIKE '%foo%'") }
// WHERE "title" LIKE '%foo%'

This PR introduces map and flatMap operations on optional QueryExpressions that unwraps the expression, giving you additional flexibility in how you express your builder code:

.where { $0.title.map { $0.like("%foo%") } ?? false }
// WHERE coalesce("title" LIKE '%foo%', 0)

While this is more code than the above options, some may prefer its readability, and should we merge the other optional helpers from #61, it could be further shortened:

.where { $0.title.map { $0.like("%foo%") } }
// WHERE "title" LIKE '%foo%'

This PR adds helpers that make it a little easier to work with optional query expressions in a builder. For example, if you want to execute a `LIKE` operator on an optional string, you currently have to resort to one of the following workarounds: ```swift .where { ($0.title ?? "").like("%foo%") } // or: .where { #sql("\($0.title) LIKE '%foo%') } ``` This PR introduces `map` and `flatMap` operations on optional `QueryExpression`s that unwraps the expression, giving you additional flexibility in how you express your builder code: ```swift .where { $0.title.map { $0.like("%foo%") } ?? false } ``` While this is more code than the above options, some may prefer its readability, and should we merge the other optional helpers from #61, it could be further shortened: ```swift .where { $0.title.map { $0.like("%foo%") } } ```

* Add `QueryExpression<Optional>.map,flatMap` This PR adds helpers that make it a little easier to work with optional query expressions in a builder. For example, if you want to execute a `LIKE` operator on an optional string, you currently have to resort to one of the following workarounds: ```swift .where { ($0.title ?? "").like("%foo%") } // or: .where { #sql("\($0.title) LIKE '%foo%') } ``` This PR introduces `map` and `flatMap` operations on optional `QueryExpression`s that unwraps the expression, giving you additional flexibility in how you express your builder code: ```swift .where { $0.title.map { $0.like("%foo%") } ?? false } ``` While this is more code than the above options, some may prefer its readability, and should we merge the other optional helpers from #61, it could be further shortened: ```swift .where { $0.title.map { $0.like("%foo%") } } ``` * tests

* Temporary triggers * wip * touch triggers * fix * wip * wip * wip * wip * wip * Remove trailing comma (#75) * Remove trailing comma while we support Swift 6.0 * compile for swift 6.0 * Don't require decodable fields in `GROUP BY` (#79) This PR allows the following to work without qualifying the expression type: ```diff Reminder.group { - #sql("date(\($0.dueDate))", as: Date?.self) + #sql("date(\($0.dueDate))") } ``` * Add `QueryExpression<Optional>.map,flatMap` (#80) * Add `QueryExpression<Optional>.map,flatMap` This PR adds helpers that make it a little easier to work with optional query expressions in a builder. For example, if you want to execute a `LIKE` operator on an optional string, you currently have to resort to one of the following workarounds: ```swift .where { ($0.title ?? "").like("%foo%") } // or: .where { #sql("\($0.title) LIKE '%foo%') } ``` This PR introduces `map` and `flatMap` operations on optional `QueryExpression`s that unwraps the expression, giving you additional flexibility in how you express your builder code: ```swift .where { $0.title.map { $0.like("%foo%") } ?? false } ``` While this is more code than the above options, some may prefer its readability, and should we merge the other optional helpers from #61, it could be further shortened: ```swift .where { $0.title.map { $0.like("%foo%") } } ``` * tests * wip * wip * wip * wip * wip * find update remove later * Revert "find update remove later" This reverts commit a3de95c. * wip * wip * wip * more overloads * wip * wip * wip * Support multiple statements in triggers * Reuse query fragment builder * wip * wip * wip * wip --------- Co-authored-by: Brandon Williams <[email protected]> Co-authored-by: Brandon Williams <[email protected]>

* Add `QueryExpression<Optional>.map,flatMap` This PR adds helpers that make it a little easier to work with optional query expressions in a builder. For example, if you want to execute a `LIKE` operator on an optional string, you currently have to resort to one of the following workarounds: ```swift .where { ($0.title ?? "").like("%foo%") } // or: .where { #sql("\($0.title) LIKE '%foo%') } ``` This PR introduces `map` and `flatMap` operations on optional `QueryExpression`s that unwraps the expression, giving you additional flexibility in how you express your builder code: ```swift .where { $0.title.map { $0.like("%foo%") } ?? false } ``` While this is more code than the above options, some may prefer its readability, and should we merge the other optional helpers from pointfreeco#61, it could be further shortened: ```swift .where { $0.title.map { $0.like("%foo%") } } ``` * tests

* Temporary triggers * wip * touch triggers * fix * wip * wip * wip * wip * wip * Remove trailing comma (pointfreeco#75) * Remove trailing comma while we support Swift 6.0 * compile for swift 6.0 * Don't require decodable fields in `GROUP BY` (pointfreeco#79) This PR allows the following to work without qualifying the expression type: ```diff Reminder.group { - #sql("date(\($0.dueDate))", as: Date?.self) + #sql("date(\($0.dueDate))") } ``` * Add `QueryExpression<Optional>.map,flatMap` (pointfreeco#80) * Add `QueryExpression<Optional>.map,flatMap` This PR adds helpers that make it a little easier to work with optional query expressions in a builder. For example, if you want to execute a `LIKE` operator on an optional string, you currently have to resort to one of the following workarounds: ```swift .where { ($0.title ?? "").like("%foo%") } // or: .where { #sql("\($0.title) LIKE '%foo%') } ``` This PR introduces `map` and `flatMap` operations on optional `QueryExpression`s that unwraps the expression, giving you additional flexibility in how you express your builder code: ```swift .where { $0.title.map { $0.like("%foo%") } ?? false } ``` While this is more code than the above options, some may prefer its readability, and should we merge the other optional helpers from pointfreeco#61, it could be further shortened: ```swift .where { $0.title.map { $0.like("%foo%") } } ``` * tests * wip * wip * wip * wip * wip * find update remove later * Revert "find update remove later" This reverts commit a3de95c. * wip * wip * wip * more overloads * wip * wip * wip * Support multiple statements in triggers * Reuse query fragment builder * wip * wip * wip * wip --------- Co-authored-by: Brandon Williams <[email protected]> Co-authored-by: Brandon Williams <[email protected]>

* Add `QueryExpression<Optional>.map,flatMap` This PR adds helpers that make it a little easier to work with optional query expressions in a builder. For example, if you want to execute a `LIKE` operator on an optional string, you currently have to resort to one of the following workarounds: ```swift .where { ($0.title ?? "").like("%foo%") } // or: .where { #sql("\($0.title) LIKE '%foo%') } ``` This PR introduces `map` and `flatMap` operations on optional `QueryExpression`s that unwraps the expression, giving you additional flexibility in how you express your builder code: ```swift .where { $0.title.map { $0.like("%foo%") } ?? false } ``` While this is more code than the above options, some may prefer its readability, and should we merge the other optional helpers from pointfreeco#61, it could be further shortened: ```swift .where { $0.title.map { $0.like("%foo%") } } ``` * tests

* Temporary triggers * wip * touch triggers * fix * wip * wip * wip * wip * wip * Remove trailing comma (pointfreeco#75) * Remove trailing comma while we support Swift 6.0 * compile for swift 6.0 * Don't require decodable fields in `GROUP BY` (pointfreeco#79) This PR allows the following to work without qualifying the expression type: ```diff Reminder.group { - #sql("date(\($0.dueDate))", as: Date?.self) + #sql("date(\($0.dueDate))") } ``` * Add `QueryExpression<Optional>.map,flatMap` (pointfreeco#80) * Add `QueryExpression<Optional>.map,flatMap` This PR adds helpers that make it a little easier to work with optional query expressions in a builder. For example, if you want to execute a `LIKE` operator on an optional string, you currently have to resort to one of the following workarounds: ```swift .where { ($0.title ?? "").like("%foo%") } // or: .where { #sql("\($0.title) LIKE '%foo%') } ``` This PR introduces `map` and `flatMap` operations on optional `QueryExpression`s that unwraps the expression, giving you additional flexibility in how you express your builder code: ```swift .where { $0.title.map { $0.like("%foo%") } ?? false } ``` While this is more code than the above options, some may prefer its readability, and should we merge the other optional helpers from pointfreeco#61, it could be further shortened: ```swift .where { $0.title.map { $0.like("%foo%") } } ``` * tests * wip * wip * wip * wip * wip * find update remove later * Revert "find update remove later" This reverts commit a3de95c. * wip * wip * wip * more overloads * wip * wip * wip * Support multiple statements in triggers * Reuse query fragment builder * wip * wip * wip * wip --------- Co-authored-by: Brandon Williams <[email protected]> Co-authored-by: Brandon Williams <[email protected]>

stephencelis requested a review from mbrandonw June 16, 2025 18:55

mbrandonw approved these changes Jun 16, 2025

View reviewed changes

tests

265beea

stephencelis merged commit 073c8ae into main Jun 16, 2025
3 checks passed

stephencelis deleted the optional-map branch June 16, 2025 19:09

Playrom mentioned this pull request Sep 28, 2025

Cannot use like operator on optional column #191

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add `QueryExpression<Optional>.map,flatMap` #80

Add `QueryExpression<Optional>.map,flatMap` #80

Uh oh!

stephencelis commented Jun 16, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Add QueryExpression<Optional>.map,flatMap #80

Add QueryExpression<Optional>.map,flatMap #80

Uh oh!

Conversation

stephencelis commented Jun 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Add `QueryExpression<Optional>.map,flatMap` #80

Add `QueryExpression<Optional>.map,flatMap` #80

stephencelis commented Jun 16, 2025 •

edited

Loading