Commit bc06e1f
committed
refactor: add @_disfavoredOverload to QueryExpression methods conflicting with stdlib
- Add @_disfavoredOverload to QueryExpression.map() (Optional.swift:273)
- Add @_disfavoredOverload to QueryExpression.flatMap() (Optional.swift:293)
- Remove deprecated .count property that conflicted with Collection.count
These changes resolve ambiguity when QueryExpression extensions are imported
alongside Swift standard library types, ensuring the compiler prefers stdlib
methods for regular Swift types while keeping SQL query building methods
available for QueryExpression types.
This helps packages importing StructuredQueriesPostgres avoid type inference
conflicts when working with regular Swift collections and optionals.
All 835 tests passing.1 parent 9c433b9 commit bc06e1f
File tree
2 files changed
+2
-9
lines changed- Sources
- StructuredQueriesCore
- StructuredQueriesPostgres/Functions/String
2 files changed
+2
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
270 | 270 | | |
271 | 271 | | |
272 | 272 | | |
| 273 | + | |
273 | 274 | | |
274 | 275 | | |
275 | 276 | | |
| |||
289 | 290 | | |
290 | 291 | | |
291 | 292 | | |
| 293 | + | |
292 | 294 | | |
293 | 295 | | |
294 | 296 | | |
| |||
Lines changed: 0 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | 33 | | |
43 | 34 | | |
44 | 35 | | |
| |||
0 commit comments