Commit 6b9b66a
committed
fix(sql): evaluate sequence-backed DEFAULTs on every engine
DEFAULT expressions were honored only where an engine happened to wire
them: uuid() worked on strict, silently vanished on schemaless document,
kv, and columnar; sequence defaults (nextval) did not run anywhere — the
pure planner evaluator does not know the accessors, and every engine path
swallowed "no value" into a missing column. #294's repro: DDL accepted
`DEFAULT nextval('s')`, every insert silently committed NULL (including
primary keys). This is one defect at two layers, fixed together:
1. Storage: the catalog adapter's schemaless branch discarded the DEFAULT
clause even though `stored.fields` carries the full DDL constraint text
(parse_column_type_str_full). UUID-class defaults on the document engine
now materialize; the sql_suite "declared doc" behavior is unchanged.
2. Evaluation: one shared per-row expander (`expand_row_defaults`) now
serves INSERT and UPSERT on the document family, the columnar batch
encoder (rows.rs), and the kv converter — replacing three copies of the
pure-evaluator swallow. Sequence accessors advance the CP-side registry
through the ConvertContext; unknown sequences raise loudly naming them,
never NULL.
Mechanics:
- SequenceRegistry threaded SharedState -> QueryContext -> ConvertContext
(both planning construction sites).
- SqlPlan::KvInsert carries key_column + sequence_defaults; the kv planner
skips sequence defaults (pure evaluator cannot run them) and the converter
fills key slot + value map per row (named pk columns are mirrored into the
value map so scans read them back).
- nodedb_value_to_sql relocated into value/convert for shared use.
Verified (wire `sequence_default_all_engines`, 6 tests, plus typed suite):
strict 1,2,3; document nextval 1,2; document uuid fills; document UPSERT
1,2; kv key 1,2 (mirrored, readable); kv unknown-sequence raises. Regression
sentinels green (kv_column_defaults, dml_returning_kv/insert, not-null gate).
fmt clean; clippy -D warnings clean; nodedb-sql 864 + nodedb-types 688.
Not included here (tracked separately): SELECT/currval/setval evaluation —
accessors stay unregistered so the gate keeps raising 42883 loudly; the
registry registration ships together with the SELECT-side fold so no commit
ever leaves a registered call folding to NULL.
Partially addresses #294.1 parent bb76352 commit 6b9b66a
25 files changed
Lines changed: 589 additions & 39 deletions
File tree
- nodedb-sql/src
- planner/dml_helpers
- types/plan
- visitor/plan_visitor
- nodedb
- src/control/planner
- catalog_adapter
- context/query
- sql_plan_convert
- array_fn_convert
- dml
- update_delete
- value
- visitor
- tests
- inproc/cases/executor_tests
- wire/cases
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
111 | | - | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
112 | 115 | | |
113 | 116 | | |
114 | 117 | | |
| |||
124 | 127 | | |
125 | 128 | | |
126 | 129 | | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
127 | 139 | | |
128 | 140 | | |
129 | 141 | | |
130 | 142 | | |
131 | 143 | | |
132 | 144 | | |
| 145 | + | |
| 146 | + | |
133 | 147 | | |
134 | 148 | | |
135 | 149 | | |
| |||
162 | 176 | | |
163 | 177 | | |
164 | 178 | | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
165 | 185 | | |
166 | 186 | | |
167 | 187 | | |
| |||
211 | 231 | | |
212 | 232 | | |
213 | 233 | | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
214 | 241 | | |
215 | 242 | | |
216 | 243 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
141 | 147 | | |
142 | 148 | | |
143 | 149 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
117 | 127 | | |
118 | 128 | | |
119 | 129 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| 76 | + | |
76 | 77 | | |
77 | 78 | | |
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
81 | 82 | | |
82 | 83 | | |
| 84 | + | |
| 85 | + | |
83 | 86 | | |
84 | 87 | | |
85 | 88 | | |
| |||
Lines changed: 20 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
64 | 76 | | |
65 | 77 | | |
66 | 78 | | |
67 | 79 | | |
68 | 80 | | |
69 | | - | |
| 81 | + | |
70 | 82 | | |
71 | 83 | | |
72 | 84 | | |
| |||
81 | 93 | | |
82 | 94 | | |
83 | 95 | | |
84 | | - | |
| 96 | + | |
85 | 97 | | |
86 | 98 | | |
87 | 99 | | |
| |||
289 | 301 | | |
290 | 302 | | |
291 | 303 | | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
292 | 310 | | |
293 | 311 | | |
294 | 312 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
43 | 48 | | |
44 | 49 | | |
45 | 50 | | |
| |||
109 | 114 | | |
110 | 115 | | |
111 | 116 | | |
| 117 | + | |
112 | 118 | | |
113 | 119 | | |
114 | 120 | | |
| |||
140 | 146 | | |
141 | 147 | | |
142 | 148 | | |
| 149 | + | |
143 | 150 | | |
144 | 151 | | |
145 | 152 | | |
| |||
174 | 181 | | |
175 | 182 | | |
176 | 183 | | |
| 184 | + | |
177 | 185 | | |
178 | 186 | | |
179 | 187 | | |
| |||
215 | 223 | | |
216 | 224 | | |
217 | 225 | | |
| 226 | + | |
218 | 227 | | |
219 | 228 | | |
220 | 229 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
147 | 147 | | |
148 | 148 | | |
149 | 149 | | |
| 150 | + | |
150 | 151 | | |
151 | 152 | | |
152 | 153 | | |
| |||
412 | 413 | | |
413 | 414 | | |
414 | 415 | | |
| 416 | + | |
415 | 417 | | |
416 | 418 | | |
417 | 419 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
144 | 144 | | |
145 | 145 | | |
146 | 146 | | |
| 147 | + | |
147 | 148 | | |
148 | 149 | | |
149 | 150 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
246 | 246 | | |
247 | 247 | | |
248 | 248 | | |
| 249 | + | |
249 | 250 | | |
250 | 251 | | |
251 | 252 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
65 | 68 | | |
66 | 69 | | |
67 | 70 | | |
| |||
281 | 284 | | |
282 | 285 | | |
283 | 286 | | |
| 287 | + | |
284 | 288 | | |
285 | 289 | | |
286 | 290 | | |
| |||
0 commit comments