Commit 20808f2
Move visit_Arel_Nodes_UpdateStatement into Arel::Visitors::OracleCommon
The implementation in oracle.rb and oracle12.rb was byte-identical:
both strip ORDER BY from an UPDATE that has orders but no limit
(Oracle does not allow ORDER BY in UPDATE), and dup the statement
before mutating so the caller's AST stays intact. Moving the method
into OracleCommon removes the duplication and keeps the UPDATE/DELETE
ORDER BY handling alongside the IN-list variants already there.
Adds a direct visitor spec at
spec/active_record/connection_adapters/oracle_enhanced/arel/update_statement_spec.rb
covering each branch:
- UPDATE with orders and no limit strips ORDER BY before super emits SQL.
- UPDATE with orders and a limit keeps ORDER BY (Oracle returns the
error at execute time; the visitor does not try to smooth that over).
- The original UpdateStatement's `orders` attribute is unmodified
after compilation (dup-before-mutate is preserved).
- Arel::Visitors::Oracle (legacy ROWNUM) and Oracle12 produce the
same stripped SQL.
Refs #2663 (task B).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent b6ab786 commit 20808f2
4 files changed
Lines changed: 63 additions & 24 deletions
File tree
- lib/arel/visitors
- spec/active_record/connection_adapters/oracle_enhanced/arel
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | 110 | | |
123 | 111 | | |
124 | 112 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | 58 | | |
71 | 59 | | |
72 | 60 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
148 | 160 | | |
149 | 161 | | |
150 | 162 | | |
| |||
Lines changed: 51 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
0 commit comments