Commit 2fc87d4
committed
fix(orm): move QueryBuilder and ScopeChain out of mixin scan path
$integrateComponents("wheels.model") loads every .cfc in vendor/wheels/model/
and mixes their public methods into Model. Having QueryBuilder.cfc and
ScopeChain.cfc in that directory caused their methods (where, orWhere, limit,
get, first, etc.) to be injected directly onto Model instances where they
would fail — variables.whereClauses and other builder state don't exist
on the Model.
Move both files to vendor/wheels/model/query/ which is not scanned
(directoryList recurse=false). Update all `new` references to use
the wheels.model.query.* path. Also fix ScopeChain's delegation to
QueryBuilder methods — use Invoke() instead of onMissingMethod() so
the builder method is called directly.
https://claude.ai/code/session_01TYLbmcU97RcvZUDdyUfS1t1 parent fa0c3ec commit 2fc87d4
File tree
3 files changed
+5
-6
lines changed- vendor/wheels/model
- query
3 files changed
+5
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
| 56 | + | |
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| |||
File renamed without changes.
Lines changed: 3 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
207 | 207 | | |
208 | 208 | | |
209 | 209 | | |
210 | | - | |
211 | | - | |
212 | | - | |
| 210 | + | |
| 211 | + | |
213 | 212 | | |
214 | | - | |
| 213 | + | |
215 | 214 | | |
216 | 215 | | |
217 | 216 | | |
| |||
0 commit comments