Commit 4dadbbd
authored
fix: apply recursive CTE column-list aliases to the static term (apache#23098)
## Which issue does this PR close?
- Closes apache#23097.
## Rationale for this change
`WITH RECURSIVE t(n) AS (...)` failed to plan because the CTE's declared
column-list names (the `t(n)` part) were never applied to the recursive
working relation. They were applied (via `apply_table_alias`) only after
the whole CTE plan was built, but the working table is derived from the
static term's schema *before* that — so the self-reference couldn't
resolve the declared names and planning failed with `Schema error: No
field named n. Valid fields are t."Int64(1)".`. PostgreSQL and DuckDB
accept the query; aliasing inside the static `SELECT` (`SELECT 1 AS n`)
was the only workaround.
## What changes are included in this PR?
Apply the column-list aliases to the static term inside
`recursive_cte()`, before the work table is created, so the working
relation and the self-reference carry the declared names. The caller now
applies only the relation-name alias on the recursive path (the columns
are already applied), avoiding a redundant projection on top of the
`RecursiveQuery` node. The non-UNION fallback applies the aliases
directly; non-recursive CTEs are unchanged. A column/alias-count
mismatch is now reported at the static term — a clearer error than the
previous "No field named …".
## Are these changes tested?
Yes, added `cte.slt` cases for single- and multi-column column-list
recursive CTEs (asserting the recursion produces the expected rows),
`UNION (DISTINCT)`, the arity-mismatch error, and an `EXPLAIN` locking
the plan shape (no extra projection over `RecursiveQuery`).
## Are there any user-facing changes?
`WITH RECURSIVE t(n) AS (...)` and multi-column column lists now plan
and execute correctly, matching PostgreSQL/DuckDB. No API changes.
*Note: this pull request was created together with AI tools (claude
code), the full diff was reviewed by myself in full prior to submission*1 parent 6ef3a3b commit 4dadbbd
3 files changed
Lines changed: 140 additions & 18 deletions
File tree
- datafusion
- optimizer/tests
- sqllogictest/test_files
- sql/src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
| 77 | + | |
78 | 78 | | |
79 | | - | |
80 | | - | |
| 79 | + | |
| 80 | + | |
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
| 50 | + | |
50 | 51 | | |
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
54 | | - | |
55 | | - | |
56 | | - | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
57 | 67 | | |
58 | 68 | | |
59 | 69 | | |
| |||
71 | 81 | | |
72 | 82 | | |
73 | 83 | | |
| 84 | + | |
74 | 85 | | |
75 | 86 | | |
76 | 87 | | |
| |||
91 | 102 | | |
92 | 103 | | |
93 | 104 | | |
94 | | - | |
| 105 | + | |
| 106 | + | |
95 | 107 | | |
96 | | - | |
| 108 | + | |
| 109 | + | |
97 | 110 | | |
98 | 111 | | |
99 | 112 | | |
| |||
111 | 124 | | |
112 | 125 | | |
113 | 126 | | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
114 | 131 | | |
115 | 132 | | |
116 | 133 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
179 | 179 | | |
180 | 180 | | |
181 | 181 | | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
182 | 287 | | |
183 | 288 | | |
184 | 289 | | |
| |||
0 commit comments