@quereus/quereus 2.7.0 → 2.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (201) hide show
  1. package/dist/src/common/errors.d.ts +21 -0
  2. package/dist/src/common/errors.d.ts.map +1 -1
  3. package/dist/src/common/errors.js +29 -0
  4. package/dist/src/common/errors.js.map +1 -1
  5. package/dist/src/core/database.d.ts.map +1 -1
  6. package/dist/src/core/database.js +20 -7
  7. package/dist/src/core/database.js.map +1 -1
  8. package/dist/src/core/statement.d.ts.map +1 -1
  9. package/dist/src/core/statement.js +15 -5
  10. package/dist/src/core/statement.js.map +1 -1
  11. package/dist/src/emit/ast-stringify.d.ts.map +1 -1
  12. package/dist/src/emit/ast-stringify.js +0 -1
  13. package/dist/src/emit/ast-stringify.js.map +1 -1
  14. package/dist/src/func/builtins/explain.d.ts.map +1 -1
  15. package/dist/src/func/builtins/explain.js +39 -36
  16. package/dist/src/func/builtins/explain.js.map +1 -1
  17. package/dist/src/func/builtins/json-helpers.d.ts +1 -1
  18. package/dist/src/func/builtins/json-helpers.d.ts.map +1 -1
  19. package/dist/src/func/builtins/json-helpers.js.map +1 -1
  20. package/dist/src/func/builtins/json.d.ts.map +1 -1
  21. package/dist/src/func/builtins/json.js +5 -7
  22. package/dist/src/func/builtins/json.js.map +1 -1
  23. package/dist/src/func/builtins/scalar.d.ts.map +1 -1
  24. package/dist/src/func/builtins/scalar.js +17 -2
  25. package/dist/src/func/builtins/scalar.js.map +1 -1
  26. package/dist/src/func/builtins/string.d.ts.map +1 -1
  27. package/dist/src/func/builtins/string.js +4 -2
  28. package/dist/src/func/builtins/string.js.map +1 -1
  29. package/dist/src/parser/ast.d.ts +1 -1
  30. package/dist/src/parser/ast.d.ts.map +1 -1
  31. package/dist/src/parser/lexer.d.ts.map +1 -1
  32. package/dist/src/parser/lexer.js +8 -48
  33. package/dist/src/parser/lexer.js.map +1 -1
  34. package/dist/src/parser/parser.d.ts.map +1 -1
  35. package/dist/src/parser/parser.js +30 -7
  36. package/dist/src/parser/parser.js.map +1 -1
  37. package/dist/src/parser/utils.d.ts +10 -1
  38. package/dist/src/parser/utils.d.ts.map +1 -1
  39. package/dist/src/parser/utils.js +23 -0
  40. package/dist/src/parser/utils.js.map +1 -1
  41. package/dist/src/planner/analysis/constraint-extractor.d.ts.map +1 -1
  42. package/dist/src/planner/analysis/constraint-extractor.js +0 -1
  43. package/dist/src/planner/analysis/constraint-extractor.js.map +1 -1
  44. package/dist/src/planner/building/constraint-builder.d.ts +12 -1
  45. package/dist/src/planner/building/constraint-builder.d.ts.map +1 -1
  46. package/dist/src/planner/building/constraint-builder.js +60 -1
  47. package/dist/src/planner/building/constraint-builder.js.map +1 -1
  48. package/dist/src/planner/building/create-view.d.ts.map +1 -1
  49. package/dist/src/planner/building/create-view.js +16 -0
  50. package/dist/src/planner/building/create-view.js.map +1 -1
  51. package/dist/src/planner/building/delete.d.ts.map +1 -1
  52. package/dist/src/planner/building/delete.js +13 -7
  53. package/dist/src/planner/building/delete.js.map +1 -1
  54. package/dist/src/planner/building/foreign-key-builder.d.ts.map +1 -1
  55. package/dist/src/planner/building/foreign-key-builder.js +24 -15
  56. package/dist/src/planner/building/foreign-key-builder.js.map +1 -1
  57. package/dist/src/planner/building/insert.d.ts.map +1 -1
  58. package/dist/src/planner/building/insert.js +51 -43
  59. package/dist/src/planner/building/insert.js.map +1 -1
  60. package/dist/src/planner/building/select-aggregates.d.ts +4 -1
  61. package/dist/src/planner/building/select-aggregates.d.ts.map +1 -1
  62. package/dist/src/planner/building/select-aggregates.js +122 -21
  63. package/dist/src/planner/building/select-aggregates.js.map +1 -1
  64. package/dist/src/planner/building/select-modifiers.d.ts +6 -2
  65. package/dist/src/planner/building/select-modifiers.d.ts.map +1 -1
  66. package/dist/src/planner/building/select-modifiers.js +20 -5
  67. package/dist/src/planner/building/select-modifiers.js.map +1 -1
  68. package/dist/src/planner/building/select-ordinal.d.ts +20 -0
  69. package/dist/src/planner/building/select-ordinal.d.ts.map +1 -0
  70. package/dist/src/planner/building/select-ordinal.js +62 -0
  71. package/dist/src/planner/building/select-ordinal.js.map +1 -0
  72. package/dist/src/planner/building/select.d.ts.map +1 -1
  73. package/dist/src/planner/building/select.js +64 -17
  74. package/dist/src/planner/building/select.js.map +1 -1
  75. package/dist/src/planner/building/update.d.ts.map +1 -1
  76. package/dist/src/planner/building/update.js +34 -27
  77. package/dist/src/planner/building/update.js.map +1 -1
  78. package/dist/src/planner/building/with.d.ts.map +1 -1
  79. package/dist/src/planner/building/with.js +25 -2
  80. package/dist/src/planner/building/with.js.map +1 -1
  81. package/dist/src/planner/nodes/constraint-check-node.d.ts +22 -1
  82. package/dist/src/planner/nodes/constraint-check-node.d.ts.map +1 -1
  83. package/dist/src/planner/nodes/constraint-check-node.js +36 -6
  84. package/dist/src/planner/nodes/constraint-check-node.js.map +1 -1
  85. package/dist/src/planner/nodes/filter.d.ts.map +1 -1
  86. package/dist/src/planner/nodes/filter.js +6 -2
  87. package/dist/src/planner/nodes/filter.js.map +1 -1
  88. package/dist/src/planner/nodes/recursive-cte-node.d.ts +5 -3
  89. package/dist/src/planner/nodes/recursive-cte-node.d.ts.map +1 -1
  90. package/dist/src/planner/nodes/recursive-cte-node.js +24 -8
  91. package/dist/src/planner/nodes/recursive-cte-node.js.map +1 -1
  92. package/dist/src/planner/nodes/returning-node.d.ts.map +1 -1
  93. package/dist/src/planner/nodes/returning-node.js +5 -12
  94. package/dist/src/planner/nodes/returning-node.js.map +1 -1
  95. package/dist/src/planner/rules/access/rule-select-access-path.d.ts.map +1 -1
  96. package/dist/src/planner/rules/access/rule-select-access-path.js +22 -26
  97. package/dist/src/planner/rules/access/rule-select-access-path.js.map +1 -1
  98. package/dist/src/planner/rules/join/rule-join-physical-selection.d.ts.map +1 -1
  99. package/dist/src/planner/rules/join/rule-join-physical-selection.js +2 -2
  100. package/dist/src/planner/rules/join/rule-join-physical-selection.js.map +1 -1
  101. package/dist/src/planner/rules/join/rule-quickpick-enumeration.d.ts.map +1 -1
  102. package/dist/src/planner/rules/join/rule-quickpick-enumeration.js +7 -3
  103. package/dist/src/planner/rules/join/rule-quickpick-enumeration.js.map +1 -1
  104. package/dist/src/planner/rules/predicate/rule-filter-merge.js.map +1 -1
  105. package/dist/src/planner/rules/predicate/rule-predicate-pushdown.js.map +1 -1
  106. package/dist/src/planner/rules/retrieve/rule-grow-retrieve.d.ts.map +1 -1
  107. package/dist/src/planner/rules/retrieve/rule-grow-retrieve.js +161 -9
  108. package/dist/src/planner/rules/retrieve/rule-grow-retrieve.js.map +1 -1
  109. package/dist/src/planner/rules/subquery/rule-subquery-decorrelation.d.ts.map +1 -1
  110. package/dist/src/planner/rules/subquery/rule-subquery-decorrelation.js +2 -2
  111. package/dist/src/planner/rules/subquery/rule-subquery-decorrelation.js.map +1 -1
  112. package/dist/src/runtime/emit/alter-table.d.ts.map +1 -1
  113. package/dist/src/runtime/emit/alter-table.js +286 -7
  114. package/dist/src/runtime/emit/alter-table.js.map +1 -1
  115. package/dist/src/runtime/emit/binary.d.ts.map +1 -1
  116. package/dist/src/runtime/emit/binary.js +12 -7
  117. package/dist/src/runtime/emit/binary.js.map +1 -1
  118. package/dist/src/runtime/emit/constraint-check.d.ts.map +1 -1
  119. package/dist/src/runtime/emit/constraint-check.js +125 -62
  120. package/dist/src/runtime/emit/constraint-check.js.map +1 -1
  121. package/dist/src/runtime/emit/create-assertion.d.ts.map +1 -1
  122. package/dist/src/runtime/emit/create-assertion.js +6 -6
  123. package/dist/src/runtime/emit/create-assertion.js.map +1 -1
  124. package/dist/src/runtime/emit/dml-executor.d.ts.map +1 -1
  125. package/dist/src/runtime/emit/dml-executor.js +133 -76
  126. package/dist/src/runtime/emit/dml-executor.js.map +1 -1
  127. package/dist/src/runtime/emit/recursive-cte.d.ts.map +1 -1
  128. package/dist/src/runtime/emit/recursive-cte.js +61 -10
  129. package/dist/src/runtime/emit/recursive-cte.js.map +1 -1
  130. package/dist/src/runtime/emit/scalar-function.d.ts.map +1 -1
  131. package/dist/src/runtime/emit/scalar-function.js +2 -1
  132. package/dist/src/runtime/emit/scalar-function.js.map +1 -1
  133. package/dist/src/runtime/emit/scan.d.ts.map +1 -1
  134. package/dist/src/runtime/emit/scan.js.map +1 -1
  135. package/dist/src/runtime/emit/table-valued-function.d.ts.map +1 -1
  136. package/dist/src/runtime/emit/table-valued-function.js +4 -2
  137. package/dist/src/runtime/emit/table-valued-function.js.map +1 -1
  138. package/dist/src/runtime/emit/update.d.ts.map +1 -1
  139. package/dist/src/runtime/emit/update.js +8 -5
  140. package/dist/src/runtime/emit/update.js.map +1 -1
  141. package/dist/src/runtime/foreign-key-actions.js +2 -2
  142. package/dist/src/runtime/foreign-key-actions.js.map +1 -1
  143. package/dist/src/schema/catalog.d.ts +2 -0
  144. package/dist/src/schema/catalog.d.ts.map +1 -1
  145. package/dist/src/schema/catalog.js +18 -0
  146. package/dist/src/schema/catalog.js.map +1 -1
  147. package/dist/src/schema/column.d.ts +7 -0
  148. package/dist/src/schema/column.d.ts.map +1 -1
  149. package/dist/src/schema/column.js.map +1 -1
  150. package/dist/src/schema/function.d.ts +4 -3
  151. package/dist/src/schema/function.d.ts.map +1 -1
  152. package/dist/src/schema/function.js.map +1 -1
  153. package/dist/src/schema/manager.d.ts +32 -6
  154. package/dist/src/schema/manager.d.ts.map +1 -1
  155. package/dist/src/schema/manager.js +165 -23
  156. package/dist/src/schema/manager.js.map +1 -1
  157. package/dist/src/schema/rename-rewriter.d.ts +4 -0
  158. package/dist/src/schema/rename-rewriter.d.ts.map +1 -0
  159. package/dist/src/schema/rename-rewriter.js +506 -0
  160. package/dist/src/schema/rename-rewriter.js.map +1 -0
  161. package/dist/src/schema/schema-differ.d.ts.map +1 -1
  162. package/dist/src/schema/schema-differ.js +41 -4
  163. package/dist/src/schema/schema-differ.js.map +1 -1
  164. package/dist/src/schema/table.d.ts +65 -2
  165. package/dist/src/schema/table.d.ts.map +1 -1
  166. package/dist/src/schema/table.js +144 -0
  167. package/dist/src/schema/table.js.map +1 -1
  168. package/dist/src/util/async-iterator.d.ts +2 -1
  169. package/dist/src/util/async-iterator.d.ts.map +1 -1
  170. package/dist/src/util/async-iterator.js +4 -4
  171. package/dist/src/util/async-iterator.js.map +1 -1
  172. package/dist/src/util/patterns.d.ts.map +1 -1
  173. package/dist/src/util/patterns.js +58 -10
  174. package/dist/src/util/patterns.js.map +1 -1
  175. package/dist/src/vtab/best-access-plan.d.ts +7 -0
  176. package/dist/src/vtab/best-access-plan.d.ts.map +1 -1
  177. package/dist/src/vtab/best-access-plan.js.map +1 -1
  178. package/dist/src/vtab/memory/index.d.ts +8 -0
  179. package/dist/src/vtab/memory/index.d.ts.map +1 -1
  180. package/dist/src/vtab/memory/index.js +11 -0
  181. package/dist/src/vtab/memory/index.js.map +1 -1
  182. package/dist/src/vtab/memory/layer/base.d.ts +8 -1
  183. package/dist/src/vtab/memory/layer/base.d.ts.map +1 -1
  184. package/dist/src/vtab/memory/layer/base.js +36 -2
  185. package/dist/src/vtab/memory/layer/base.js.map +1 -1
  186. package/dist/src/vtab/memory/layer/manager.d.ts +5 -1
  187. package/dist/src/vtab/memory/layer/manager.d.ts.map +1 -1
  188. package/dist/src/vtab/memory/layer/manager.js +63 -13
  189. package/dist/src/vtab/memory/layer/manager.js.map +1 -1
  190. package/dist/src/vtab/memory/layer/transaction.d.ts.map +1 -1
  191. package/dist/src/vtab/memory/layer/transaction.js +21 -2
  192. package/dist/src/vtab/memory/layer/transaction.js.map +1 -1
  193. package/dist/src/vtab/memory/module.d.ts +6 -1
  194. package/dist/src/vtab/memory/module.d.ts.map +1 -1
  195. package/dist/src/vtab/memory/module.js +93 -14
  196. package/dist/src/vtab/memory/module.js.map +1 -1
  197. package/dist/src/vtab/memory/utils/predicate.d.ts +27 -0
  198. package/dist/src/vtab/memory/utils/predicate.d.ts.map +1 -0
  199. package/dist/src/vtab/memory/utils/predicate.js +182 -0
  200. package/dist/src/vtab/memory/utils/predicate.js.map +1 -0
  201. package/package.json +3 -3
@@ -7,7 +7,7 @@ import { RegisteredScope } from '../scopes/registered.js';
7
7
  /**
8
8
  * Creates final output projections and applies result column aliases
9
9
  */
10
- export declare function buildFinalProjections(input: RelationalPlanNode, projections: Projection[], selectScope: Scope, stmt: AST.SelectStmt, selectContext: PlanningContext, preserveInputColumns?: boolean): {
10
+ export declare function buildFinalProjections(input: RelationalPlanNode, projections: Projection[], selectScope: Scope, stmt: AST.SelectStmt, selectContext: PlanningContext, preserveInputColumns?: boolean, selectListAsts?: AST.Expression[]): {
11
11
  output: RelationalPlanNode;
12
12
  finalContext: PlanningContext;
13
13
  projectionScope?: RegisteredScope;
@@ -20,9 +20,13 @@ export declare function applyDistinct(input: RelationalPlanNode, stmt: AST.Selec
20
20
  /**
21
21
  * Applies ORDER BY clause if not already applied
22
22
  */
23
- export declare function applyOrderBy(input: RelationalPlanNode, stmt: AST.SelectStmt, selectContext: PlanningContext, preAggregateSort: boolean, projectionScope?: RegisteredScope): RelationalPlanNode;
23
+ export declare function applyOrderBy(input: RelationalPlanNode, stmt: AST.SelectStmt, selectContext: PlanningContext, preAggregateSort: boolean, projectionScope?: RegisteredScope, allowAggregates?: boolean, selectListAsts?: AST.Expression[]): RelationalPlanNode;
24
24
  /**
25
25
  * Applies LIMIT and OFFSET clauses
26
26
  */
27
27
  export declare function applyLimitOffset(input: RelationalPlanNode, stmt: AST.SelectStmt, selectContext: PlanningContext, projectionScope?: RegisteredScope): RelationalPlanNode;
28
+ /**
29
+ * Creates a scope for projection output columns
30
+ */
31
+ export declare function createProjectionOutputScope(projectionNode: RelationalPlanNode): RegisteredScope;
28
32
  //# sourceMappingURL=select-modifiers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"select-modifiers.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-modifiers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAMxE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK1D;;GAEG;AACH,wBAAgB,qBAAqB,CACpC,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,UAAU,EAAE,EACzB,WAAW,EAAE,KAAK,EAClB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,oBAAoB,GAAE,OAAc,GAClC;IACF,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,eAAe,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,gBAAgB,EAAE,OAAO,CAAC;CAC1B,CA4CA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC5B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,WAAW,EAAE,KAAK,GAChB,kBAAkB,CAKpB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC3B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,gBAAgB,EAAE,OAAO,EACzB,eAAe,CAAC,EAAE,eAAe,GAC/B,kBAAkB,CAqBpB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,eAAe,CAAC,EAAE,eAAe,GAC/B,kBAAkB,CAepB"}
1
+ {"version":3,"file":"select-modifiers.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-modifiers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAMxE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAM1D;;GAEG;AACH,wBAAgB,qBAAqB,CACpC,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,UAAU,EAAE,EACzB,WAAW,EAAE,KAAK,EAClB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,oBAAoB,GAAE,OAAc,EACpC,cAAc,GAAE,GAAG,CAAC,UAAU,EAAO,GACnC;IACF,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,eAAe,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,gBAAgB,EAAE,OAAO,CAAC;CAC1B,CA6CA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC5B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,WAAW,EAAE,KAAK,GAChB,kBAAkB,CAKpB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC3B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,gBAAgB,EAAE,OAAO,EACzB,eAAe,CAAC,EAAE,eAAe,EACjC,eAAe,GAAE,OAAe,EAChC,cAAc,GAAE,GAAG,CAAC,UAAU,EAAO,GACnC,kBAAkB,CAsBpB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,eAAe,CAAC,EAAE,eAAe,GAC/B,kBAAkB,CAepB;AA+BD;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,cAAc,EAAE,kBAAkB,GAAG,eAAe,CAW/F"}
@@ -8,10 +8,11 @@ import { RegisteredScope } from '../scopes/registered.js';
8
8
  import { ColumnReferenceNode } from '../nodes/reference.js';
9
9
  import { buildExpression } from './expression.js';
10
10
  import { CapabilityDetectors } from '../framework/characteristics.js';
11
+ import { resolveOrdinalReference } from './select-ordinal.js';
11
12
  /**
12
13
  * Creates final output projections and applies result column aliases
13
14
  */
14
- export function buildFinalProjections(input, projections, selectScope, stmt, selectContext, preserveInputColumns = true) {
15
+ export function buildFinalProjections(input, projections, selectScope, stmt, selectContext, preserveInputColumns = true, selectListAsts = []) {
15
16
  if (projections.length === 0) {
16
17
  return { output: input, finalContext: selectContext, preAggregateSort: false };
17
18
  }
@@ -27,7 +28,8 @@ export function buildFinalProjections(input, projections, selectScope, stmt, sel
27
28
  // Apply ORDER BY before projection if needed (compile expressions against input scope)
28
29
  if (needsPreProjectionSort && stmt.orderBy && stmt.orderBy.length > 0) {
29
30
  const sortKeys = stmt.orderBy.map(orderByClause => {
30
- const expression = buildExpression(selectContext, orderByClause.expr);
31
+ const resolved = resolveOrdinalReference(orderByClause.expr, selectListAsts, 'ORDER BY');
32
+ const expression = buildExpression(selectContext, resolved ?? orderByClause.expr);
31
33
  return {
32
34
  expression,
33
35
  direction: orderByClause.direction,
@@ -61,7 +63,7 @@ export function applyDistinct(input, stmt, selectScope) {
61
63
  /**
62
64
  * Applies ORDER BY clause if not already applied
63
65
  */
64
- export function applyOrderBy(input, stmt, selectContext, preAggregateSort, projectionScope) {
66
+ export function applyOrderBy(input, stmt, selectContext, preAggregateSort, projectionScope, allowAggregates = false, selectListAsts = []) {
65
67
  if (stmt.orderBy && stmt.orderBy.length > 0 && !preAggregateSort) {
66
68
  // Merge projection scope if available so ORDER BY can reference output column aliases
67
69
  let orderByContext = selectContext;
@@ -70,7 +72,8 @@ export function applyOrderBy(input, stmt, selectContext, preAggregateSort, proje
70
72
  orderByContext = { ...selectContext, scope: combinedScope };
71
73
  }
72
74
  const sortKeys = stmt.orderBy.map(orderByClause => {
73
- const expression = buildExpression(orderByContext, orderByClause.expr);
75
+ const resolved = resolveOrdinalReference(orderByClause.expr, selectListAsts, 'ORDER BY');
76
+ const expression = buildExpression(orderByContext, resolved ?? orderByClause.expr, allowAggregates);
74
77
  return {
75
78
  expression,
76
79
  direction: orderByClause.direction,
@@ -123,7 +126,7 @@ function shouldApplyOrderByBeforeProjection(stmt, projections) {
123
126
  /**
124
127
  * Creates a scope for projection output columns
125
128
  */
126
- function createProjectionOutputScope(projectionNode) {
129
+ export function createProjectionOutputScope(projectionNode) {
127
130
  const projectionOutputScope = new RegisteredScope();
128
131
  const projectionAttributes = projectionNode.getAttributes();
129
132
  projectionNode.getType().columns.forEach((col, index) => {
@@ -144,6 +147,18 @@ function isIdentityProjection(projections, source) {
144
147
  if (projections.length !== sourceAttrs.length) {
145
148
  return false;
146
149
  }
150
+ // If the source exposes duplicate column names (e.g., a JOIN with same-named
151
+ // columns on each side), a ProjectNode is required to disambiguate via
152
+ // `name:N` suffixes — otherwise downstream row→object conversion would
153
+ // collapse duplicate keys and silently drop columns.
154
+ const seenNames = new Set();
155
+ for (const attr of sourceAttrs) {
156
+ const lower = attr.name.toLowerCase();
157
+ if (seenNames.has(lower)) {
158
+ return false;
159
+ }
160
+ seenNames.add(lower);
161
+ }
147
162
  for (let i = 0; i < projections.length; i++) {
148
163
  const proj = projections[i];
149
164
  const sourceAttr = sourceAttrs[i];
@@ -1 +1 @@
1
- {"version":3,"file":"select-modifiers.js","sourceRoot":"","sources":["../../../../src/planner/building/select-modifiers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select-modifiers.js","sourceRoot":"","sources":["../../../../src/planner/building/select-modifiers.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,20 @@
1
+ import type * as AST from '../../parser/ast.js';
2
+ import type { RelationalPlanNode } from '../nodes/plan-node.js';
3
+ /**
4
+ * Builds the source-order list of AST expressions for a SELECT list, with
5
+ * SELECT * / table.* expanded against the input relation's attributes.
6
+ * Each entry corresponds to one output column, in source order. Used so that
7
+ * GROUP BY / ORDER BY ordinal references (1-based) can resolve back to the
8
+ * AST expression that produced the Nth output column.
9
+ */
10
+ export declare function buildSelectListAsts(columns: AST.ResultColumn[], input: RelationalPlanNode): AST.Expression[];
11
+ /**
12
+ * If `expr` is a bare integer literal (or a unary `-` applied to one), treats it
13
+ * as a 1-based positional reference into `selectListAsts` and returns the
14
+ * corresponding AST expression. Out-of-range / zero / negative ordinals raise
15
+ * an error. Any other expression shape returns null so the caller can fall
16
+ * through to normal expression building (e.g., `group by 1 + 0` keeps its
17
+ * constant-expression semantics).
18
+ */
19
+ export declare function resolveOrdinalReference(expr: AST.Expression, selectListAsts: AST.Expression[], clauseName: 'GROUP BY' | 'ORDER BY'): AST.Expression | null;
20
+ //# sourceMappingURL=select-ordinal.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"select-ordinal.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-ordinal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAClC,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,EAC3B,KAAK,EAAE,kBAAkB,GACvB,GAAG,CAAC,UAAU,EAAE,CAiBlB;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACtC,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,cAAc,EAAE,GAAG,CAAC,UAAU,EAAE,EAChC,UAAU,EAAE,UAAU,GAAG,UAAU,GACjC,GAAG,CAAC,UAAU,GAAG,IAAI,CAavB"}
@@ -0,0 +1,62 @@
1
+ import { QuereusError } from '../../common/errors.js';
2
+ import { StatusCode } from '../../common/types.js';
3
+ /**
4
+ * Builds the source-order list of AST expressions for a SELECT list, with
5
+ * SELECT * / table.* expanded against the input relation's attributes.
6
+ * Each entry corresponds to one output column, in source order. Used so that
7
+ * GROUP BY / ORDER BY ordinal references (1-based) can resolve back to the
8
+ * AST expression that produced the Nth output column.
9
+ */
10
+ export function buildSelectListAsts(columns, input) {
11
+ const result = [];
12
+ for (const column of columns) {
13
+ if (column.type === 'all') {
14
+ const allAttrs = input.getAttributes();
15
+ const matching = column.table
16
+ ? allAttrs.filter(attr => attr.relationName?.toLowerCase() === column.table.toLowerCase())
17
+ : allAttrs;
18
+ for (const attr of matching) {
19
+ const colExpr = { type: 'column', name: attr.name };
20
+ result.push(colExpr);
21
+ }
22
+ }
23
+ else if (column.type === 'column') {
24
+ result.push(column.expr);
25
+ }
26
+ }
27
+ return result;
28
+ }
29
+ /**
30
+ * If `expr` is a bare integer literal (or a unary `-` applied to one), treats it
31
+ * as a 1-based positional reference into `selectListAsts` and returns the
32
+ * corresponding AST expression. Out-of-range / zero / negative ordinals raise
33
+ * an error. Any other expression shape returns null so the caller can fall
34
+ * through to normal expression building (e.g., `group by 1 + 0` keeps its
35
+ * constant-expression semantics).
36
+ */
37
+ export function resolveOrdinalReference(expr, selectListAsts, clauseName) {
38
+ const value = extractOrdinalValue(expr);
39
+ if (value === null)
40
+ return null;
41
+ if (value < 1 || value > selectListAsts.length) {
42
+ throw new QuereusError(`${clauseName} position ${value} is not in the SELECT list (1..${selectListAsts.length})`, StatusCode.ERROR, undefined, expr.loc?.start.line, expr.loc?.start.column);
43
+ }
44
+ return selectListAsts[value - 1];
45
+ }
46
+ function extractOrdinalValue(expr) {
47
+ if (expr.type === 'literal') {
48
+ const v = expr.value;
49
+ if (typeof v === 'number' && Number.isInteger(v))
50
+ return v;
51
+ return null;
52
+ }
53
+ // Unary `-N` parses as UnaryExpr(-, Literal(N)). Likewise `+N`.
54
+ if (expr.type === 'unary' && (expr.operator === '-' || expr.operator === '+') && expr.expr.type === 'literal') {
55
+ const v = expr.expr.value;
56
+ if (typeof v === 'number' && Number.isInteger(v)) {
57
+ return expr.operator === '-' ? -v : v;
58
+ }
59
+ }
60
+ return null;
61
+ }
62
+ //# sourceMappingURL=select-ordinal.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"select-ordinal.js","sourceRoot":"","sources":["../../../../src/planner/building/select-ordinal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGnD;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAClC,OAA2B,EAC3B,KAAyB;IAEzB,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC3B,MAAM,QAAQ,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;YACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK;gBAC5B,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,MAAM,CAAC,KAAM,CAAC,WAAW,EAAE,CAAC;gBAC3F,CAAC,CAAC,QAAQ,CAAC;YACZ,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;gBAC7B,MAAM,OAAO,GAAmB,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACpE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtB,CAAC;QACF,CAAC;aAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;IACF,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CACtC,IAAoB,EACpB,cAAgC,EAChC,UAAmC;IAEnC,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;QAChD,MAAM,IAAI,YAAY,CACrB,GAAG,UAAU,aAAa,KAAK,kCAAkC,cAAc,CAAC,MAAM,GAAG,EACzF,UAAU,CAAC,KAAK,EAChB,SAAS,EACT,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EACpB,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CACtB,CAAC;IACH,CAAC;IACD,OAAO,cAAc,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAoB;IAChD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACrB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACb,CAAC;IACD,gEAAgE;IAChE,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC/G,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC1B,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;YAClD,OAAO,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAuB,MAAM,uBAAuB,CAAC;AAG/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAc9D,OAAO,KAAK,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAItE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAoBrD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAa;AACjD;;;;;GAKG;AACH,oBAAoB,GAAE,OAAc,GACnC,QAAQ,CAwKV;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC9B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,GAClB,UAAU,CAQZ;AAsBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAa,GAAG,kBAAkB,CAqNzJ"}
1
+ {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAuB,MAAM,uBAAuB,CAAC;AAG/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAc9D,OAAO,KAAK,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAItE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAqBrD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAa;AACjD;;;;;GAKG;AACH,oBAAoB,GAAE,OAAc,GACnC,QAAQ,CA4NV;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC9B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,GAClB,UAAU,CAQZ;AAsBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAa,GAAG,kBAAkB,CAqNzJ"}
@@ -23,8 +23,9 @@ import { buildCompoundSelect } from './select-compound.js';
23
23
  import { analyzeSelectColumns, buildStarProjections } from './select-projections.js';
24
24
  import { buildAggregatePhase, buildFinalAggregateProjections } from './select-aggregates.js';
25
25
  import { buildWindowPhase } from './select-window.js';
26
- import { buildFinalProjections, applyDistinct, applyOrderBy, applyLimitOffset } from './select-modifiers.js';
26
+ import { buildFinalProjections, applyDistinct, applyOrderBy, applyLimitOffset, createProjectionOutputScope } from './select-modifiers.js';
27
27
  import { SortNode } from '../nodes/sort.js';
28
+ import { buildSelectListAsts, resolveOrdinalReference } from './select-ordinal.js';
28
29
  import { buildInsertStmt } from './insert.js';
29
30
  import { buildUpdateStmt } from './update.js';
30
31
  import { buildDeleteStmt } from './delete.js';
@@ -78,7 +79,11 @@ preserveInputColumns = true) {
78
79
  // Build projections based on the SELECT list
79
80
  const projections = [];
80
81
  // Analyze SELECT columns
81
- const { projections: columnProjections, aggregates, windowFunctions, hasAggregates, hasWindowFunctions, hasWrappedAggregates } = analyzeSelectColumns(stmt.columns, selectContext);
82
+ const { projections: columnProjections, aggregates, windowFunctions, hasAggregates: hasAggregatesInSelect, hasWindowFunctions, hasWrappedAggregates } = analyzeSelectColumns(stmt.columns, selectContext);
83
+ // `hasAggregates` may grow as buildAggregatePhase collects HAVING-only or
84
+ // ORDER-BY-only aggregates; track it locally so the post-aggregate branch
85
+ // is taken when those promote a non-aggregate query into an aggregate one.
86
+ let hasAggregates = hasAggregatesInSelect;
82
87
  // Handle SELECT * separately
83
88
  for (const column of stmt.columns) {
84
89
  if (column.type === 'all') {
@@ -88,20 +93,52 @@ preserveInputColumns = true) {
88
93
  }
89
94
  // Add non-star projections
90
95
  projections.push(...columnProjections);
96
+ // Build the source-order AST list of SELECT-list output columns (with stars expanded)
97
+ // for resolving GROUP BY / ORDER BY positional ordinals.
98
+ const selectListAsts = buildSelectListAsts(stmt.columns, input);
91
99
  // Process aggregates if present
92
- const aggregateResult = buildAggregatePhase(input, stmt, selectContext, aggregates, hasAggregates, projections, hasWrappedAggregates);
100
+ const aggregateResult = buildAggregatePhase(input, stmt, selectContext, aggregates, hasAggregates, projections, hasWrappedAggregates, selectListAsts);
93
101
  input = aggregateResult.output;
94
102
  let preAggregateSort = aggregateResult.preAggregateSort;
103
+ let orderByAppliedEarly = false;
104
+ let aggregateProjectionScope;
95
105
  // Update context if we have aggregates
96
106
  if (aggregateResult.aggregateScope) {
97
- selectContext = { ...selectContext, scope: aggregateResult.aggregateScope };
107
+ // HAVING-only or ORDER-BY-only aggregates may have promoted this into an
108
+ // aggregate query even if SELECT had none — reflect that locally.
109
+ if (aggregateResult.hasHavingOnlyAggregates || aggregateResult.hasOrderByOnlyAggregates) {
110
+ hasAggregates = true;
111
+ }
112
+ selectContext = {
113
+ ...selectContext,
114
+ scope: aggregateResult.aggregateScope,
115
+ aggregates: aggregateResult.aggregatesContext,
116
+ };
117
+ // When ORDER BY references aggregate functions, apply it now — *before*
118
+ // any stripping final projection — so it can resolve against the full
119
+ // AggregateNode output (which still includes ORDER-BY-only aggregates).
120
+ // Skipped when window functions are present (window output isn't
121
+ // available yet) or when pre-aggregate sort already handled ordering.
122
+ if (aggregateResult.orderByHasAggregates &&
123
+ !preAggregateSort &&
124
+ !hasWindowFunctions &&
125
+ stmt.orderBy && stmt.orderBy.length > 0) {
126
+ input = applyOrderBy(input, stmt, selectContext, preAggregateSort, undefined, true, selectListAsts);
127
+ orderByAppliedEarly = true;
128
+ }
98
129
  // Build final projections if needed
99
130
  if (aggregateResult.needsFinalProjection && aggregateResult.aggregateNode && aggregateResult.groupByExpressions) {
100
131
  const finalProjections = buildFinalAggregateProjections(stmt, selectContext, aggregateResult.aggregateScope, aggregateResult.aggregateNode, aggregates, aggregateResult.groupByExpressions);
101
- // When HAVING-only aggregates were added, don't preserve input columns
102
- // so they are stripped from the output (they exist only for the filter).
103
- const preserveForAggregate = preserveInputColumns && !aggregateResult.hasHavingOnlyAggregates;
132
+ // When HAVING-only or ORDER-BY-only aggregates were added, don't preserve
133
+ // input columns so they are stripped from the output (they exist only for
134
+ // those clauses).
135
+ const preserveForAggregate = preserveInputColumns &&
136
+ !aggregateResult.hasHavingOnlyAggregates &&
137
+ !aggregateResult.hasOrderByOnlyAggregates;
104
138
  input = new ProjectNode(selectScope, input, finalProjections, undefined, undefined, preserveForAggregate);
139
+ // Expose final-projection output column names (including SELECT-list aliases)
140
+ // so subsequent ORDER BY can reference aliases like the non-aggregate path.
141
+ aggregateProjectionScope = createProjectionOutputScope(input);
105
142
  }
106
143
  }
107
144
  // Handle window functions if present
@@ -124,11 +161,14 @@ preserveInputColumns = true) {
124
161
  const orderColumn = orderByClause.expr.name.toLowerCase();
125
162
  if (!selectedColumns.has(orderColumn)) {
126
163
  // Apply ORDER BY before window projections
127
- const sortKeys = stmt.orderBy.map(orderBy => ({
128
- expression: buildExpression(selectContext, orderBy.expr),
129
- direction: orderBy.direction,
130
- nulls: orderBy.nulls
131
- }));
164
+ const sortKeys = stmt.orderBy.map(orderBy => {
165
+ const resolved = resolveOrdinalReference(orderBy.expr, selectListAsts, 'ORDER BY');
166
+ return {
167
+ expression: buildExpression(selectContext, resolved ?? orderBy.expr),
168
+ direction: orderBy.direction,
169
+ nulls: orderBy.nulls
170
+ };
171
+ });
132
172
  input = new SortNode(selectContext.scope, input, sortKeys);
133
173
  preWindowSort = true;
134
174
  break;
@@ -154,20 +194,27 @@ preserveInputColumns = true) {
154
194
  }
155
195
  // Handle final projections for non-aggregate, non-window cases
156
196
  if (!hasAggregates && !hasWindowFunctions) {
157
- const finalResult = buildFinalProjections(input, projections, selectScope, stmt, selectContext, preserveInputColumns);
197
+ const finalResult = buildFinalProjections(input, projections, selectScope, stmt, selectContext, preserveInputColumns, selectListAsts);
158
198
  input = finalResult.output;
159
199
  selectContext = finalResult.finalContext;
160
200
  preAggregateSort = finalResult.preAggregateSort;
161
201
  // Apply final modifiers with projection scope for column alias resolution
162
202
  input = applyDistinct(input, stmt, selectScope);
163
- input = applyOrderBy(input, stmt, selectContext, preAggregateSort, finalResult.projectionScope);
203
+ input = applyOrderBy(input, stmt, selectContext, preAggregateSort, finalResult.projectionScope, false, selectListAsts);
164
204
  input = applyLimitOffset(input, stmt, selectContext, finalResult.projectionScope);
165
205
  }
166
206
  else {
167
- // Apply final modifiers without projection scope for aggregate/window cases
207
+ // Apply final modifiers. For the aggregate path, expose the final-projection
208
+ // output scope so ORDER BY can resolve SELECT-list aliases (the non-aggregate
209
+ // path already does this via finalResult.projectionScope). The window path
210
+ // keeps its existing scope handling.
168
211
  input = applyDistinct(input, stmt, selectScope);
169
- input = applyOrderBy(input, stmt, selectContext, preAggregateSort);
170
- input = applyLimitOffset(input, stmt, selectContext);
212
+ if (!orderByAppliedEarly) {
213
+ // In the aggregate path, ORDER BY may legally reference aggregates; in the
214
+ // window path it may reference window outputs. Both are now in selectContext.
215
+ input = applyOrderBy(input, stmt, selectContext, preAggregateSort, aggregateProjectionScope, hasAggregates, selectListAsts);
216
+ }
217
+ input = applyLimitOffset(input, stmt, selectContext, aggregateProjectionScope);
171
218
  }
172
219
  return input;
173
220
  }
@@ -1 +1 @@
1
- {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../../src/planner/building/select.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../../src/planner/building/select.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,EAAE,QAAQ,EAAoF,MAAM,uBAAuB,CAAC;AAgBnI,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,GACnB,QAAQ,CA2VV"}
1
+ {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,EAAE,QAAQ,EAAoF,MAAM,uBAAuB,CAAC;AAiBnI,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,GACnB,QAAQ,CA0WV"}
@@ -7,13 +7,14 @@ import { FilterNode } from '../nodes/filter.js';
7
7
  import { QuereusError } from '../../common/errors.js';
8
8
  import { StatusCode } from '../../common/types.js';
9
9
  import { RegisteredScope } from '../scopes/registered.js';
10
+ import { AliasedScope } from '../scopes/aliased.js';
10
11
  import { ColumnReferenceNode } from '../nodes/reference.js';
11
12
  import { SinkNode } from '../nodes/sink-node.js';
12
13
  import { ConstraintCheckNode } from '../nodes/constraint-check-node.js';
13
14
  import { RowOpFlag } from '../../schema/table.js';
14
15
  import { ReturningNode } from '../nodes/returning-node.js';
15
16
  import { buildOldNewRowDescriptors } from '../../util/row-descriptor.js';
16
- import { buildConstraintChecks } from './constraint-builder.js';
17
+ import { buildConstraintChecks, buildNotNullDefaults } from './constraint-builder.js';
17
18
  import { buildChildSideFKChecks, buildParentSideFKChecks } from './foreign-key-builder.js';
18
19
  import { isCommittedSchemaRef } from './schema-resolution.js';
19
20
  import { validateDeterministicGenerated } from '../validation/determinism-validator.js';
@@ -54,13 +55,17 @@ export function buildUpdateStmt(ctx, stmt) {
54
55
  }
55
56
  // Plan the source of rows to update. This is typically the table itself, potentially filtered.
56
57
  let sourceNode = buildTableReference({ type: 'table', table: stmt.table }, contextWithSchemaPath);
57
- // Create a new scope with the table columns registered for column resolution
58
- const tableScope = new RegisteredScope(ctx.scope);
58
+ // Create a new scope with the table columns registered for column resolution.
59
+ // Wrap with AliasedScope so correlated subqueries inside SET / WHERE / RETURNING
60
+ // can reference the outer DML target via qualified `table.column` form.
61
+ const tableColumnScope = new RegisteredScope(ctx.scope);
59
62
  const sourceAttributes = sourceNode.getAttributes();
60
63
  sourceNode.getType().columns.forEach((c, i) => {
61
64
  const attr = sourceAttributes[i];
62
- tableScope.registerSymbol(c.name.toLowerCase(), (exp, s) => new ColumnReferenceNode(s, exp, c.type, attr.id, i));
65
+ tableColumnScope.registerSymbol(c.name.toLowerCase(), (exp, s) => new ColumnReferenceNode(s, exp, c.type, attr.id, i));
63
66
  });
67
+ const tableName = tableReference.tableSchema.name.toLowerCase();
68
+ const tableScope = new AliasedScope(tableColumnScope, tableName, tableName);
64
69
  // Create a new planning context with the updated scope for WHERE clause resolution
65
70
  const updateCtx = { ...contextWithSchemaPath, scope: tableScope };
66
71
  // IMPORTANT: Build assignments FIRST to ensure parameter indices match SQL text order.
@@ -78,15 +83,19 @@ export function buildUpdateStmt(ctx, stmt) {
78
83
  value: buildExpression(updateCtx, assign.value),
79
84
  };
80
85
  });
81
- // Add implicit assignments for generated STORED columns (recompute after user assignments)
82
- for (const col of tableReference.tableSchema.columns) {
83
- if (col.generated && col.generatedExpr) {
84
- // Build generated expression in the table scope so it can reference columns
85
- const genNode = buildExpression(updateCtx, col.generatedExpr);
86
- validateDeterministicGenerated(genNode, col.name, tableReference.tableSchema.name);
87
- const targetColumn = { type: 'column', name: col.name, table: stmt.table.name, schema: stmt.table.schema };
88
- assignments.push({ targetColumn, value: genNode, isGenerated: true });
89
- }
86
+ // Add implicit assignments for generated columns in topological order so
87
+ // that a generated column referencing another generated column sees the
88
+ // freshly-computed value when the runtime evaluates each in turn against
89
+ // the in-place updated row.
90
+ const genTopoOrder = tableReference.tableSchema.generatedColumnTopoOrder ?? [];
91
+ for (const colIdx of genTopoOrder) {
92
+ const col = tableReference.tableSchema.columns[colIdx];
93
+ if (!col.generated || !col.generatedExpr)
94
+ continue;
95
+ const genNode = buildExpression(updateCtx, col.generatedExpr);
96
+ validateDeterministicGenerated(genNode, col.name, tableReference.tableSchema.name);
97
+ const targetColumn = { type: 'column', name: col.name, table: stmt.table.name, schema: stmt.table.schema };
98
+ assignments.push({ targetColumn, value: genNode, isGenerated: true });
90
99
  }
91
100
  // Now build the WHERE filter (parameters here get indices after SET clause parameters)
92
101
  if (stmt.where) {
@@ -134,6 +143,8 @@ export function buildUpdateStmt(ctx, stmt) {
134
143
  const parentFKChecks = buildParentSideFKChecks(ctx, tableReference.tableSchema, RowOpFlag.UPDATE, oldAttributes, newAttributes, contextAttributes);
135
144
  constraintChecks.push(...childFKChecks, ...parentFKChecks);
136
145
  }
146
+ // Pre-build DEFAULT evaluators for NOT NULL columns (used by REPLACE substitution).
147
+ const notNullDefaults = buildNotNullDefaults(updateCtx, tableReference.tableSchema, newAttributes, contextAttributes);
137
148
  if (stmt.returning && stmt.returning.length > 0) {
138
149
  // For RETURNING, create coordinated attribute IDs like we do for INSERT
139
150
  const returningScope = new RegisteredScope(updateCtx.scope);
@@ -181,16 +192,14 @@ export function buildUpdateStmt(ctx, stmt) {
181
192
  // TODO: Support RETURNING *
182
193
  if (rc.type === 'all')
183
194
  throw new QuereusError('RETURNING * not yet supported', StatusCode.UNSUPPORTED);
184
- // Infer alias from column name if not explicitly provided
195
+ // Infer alias from column name if not explicitly provided.
196
+ // Preserve the spelling the user wrote so quoted identifiers like
197
+ // [Name] / "Name" round-trip to the result column name unchanged.
185
198
  let alias = rc.alias;
186
199
  if (!alias && rc.expr.type === 'column') {
187
- // For qualified column references like NEW.id or OLD.id, normalize to lowercase
188
- if (rc.expr.table) {
189
- alias = `${rc.expr.table.toLowerCase()}.${rc.expr.name.toLowerCase()}`;
190
- }
191
- else {
192
- alias = rc.expr.name.toLowerCase();
193
- }
200
+ alias = rc.expr.table
201
+ ? `${rc.expr.table}.${rc.expr.name}`
202
+ : rc.expr.name;
194
203
  }
195
204
  const columnIndex = tableReference.tableSchema.columns.findIndex(col => col.name.toLowerCase() === (rc.expr.type === 'column' ? rc.expr.name.toLowerCase() : ''));
196
205
  const projAttributeId = rc.expr.type === 'column' && columnIndex !== -1 ? newColumnAttributeIds[columnIndex] : undefined;
@@ -204,9 +213,8 @@ export function buildUpdateStmt(ctx, stmt) {
204
213
  const updateNodeWithDescriptor = new UpdateNode(updateCtx.scope, tableReference, assignments, sourceNode, stmt.onConflict, oldRowDescriptor, newRowDescriptor, flatRowDescriptor, mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor);
205
214
  // For returning, we still need to execute the update before projecting
206
215
  // Always inject ConstraintCheckNode for UPDATE operations (provides required metadata)
207
- const constraintCheckNode = new ConstraintCheckNode(updateCtx.scope, updateNodeWithDescriptor, tableReference, RowOpFlag.UPDATE, oldRowDescriptor, newRowDescriptor, flatRowDescriptor, constraintChecks, mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor);
208
- const updateExecutorNode = new DmlExecutorNode(updateCtx.scope, constraintCheckNode, tableReference, 'update', undefined, // onConflict not used for UPDATE
209
- mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor);
216
+ const constraintCheckNode = new ConstraintCheckNode(updateCtx.scope, updateNodeWithDescriptor, tableReference, RowOpFlag.UPDATE, oldRowDescriptor, newRowDescriptor, flatRowDescriptor, constraintChecks, mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor, stmt.onConflict, notNullDefaults.length > 0 ? notNullDefaults : undefined);
217
+ const updateExecutorNode = new DmlExecutorNode(updateCtx.scope, constraintCheckNode, tableReference, 'update', stmt.onConflict, mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor);
210
218
  // Return the RETURNING results from the executed update
211
219
  return new ReturningNode(updateCtx.scope, updateExecutorNode, returningProjections);
212
220
  }
@@ -214,9 +222,8 @@ export function buildUpdateStmt(ctx, stmt) {
214
222
  // Create newRowDescriptor and oldRowDescriptor for constraint checking with NEW/OLD references
215
223
  const updateNode = new UpdateNode(updateCtx.scope, tableReference, assignments, sourceNode, stmt.onConflict, oldRowDescriptor, newRowDescriptor, flatRowDescriptor, mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor);
216
224
  // Step 2: inject constraint checking AFTER update row generation
217
- const constraintCheckNode = new ConstraintCheckNode(updateCtx.scope, updateNode, tableReference, RowOpFlag.UPDATE, oldRowDescriptor, newRowDescriptor, flatRowDescriptor, constraintChecks, mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor);
218
- const updateExecutorNode = new DmlExecutorNode(updateCtx.scope, constraintCheckNode, tableReference, 'update', undefined, // onConflict not used for UPDATE
219
- mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor);
225
+ const constraintCheckNode = new ConstraintCheckNode(updateCtx.scope, updateNode, tableReference, RowOpFlag.UPDATE, oldRowDescriptor, newRowDescriptor, flatRowDescriptor, constraintChecks, mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor, stmt.onConflict, notNullDefaults.length > 0 ? notNullDefaults : undefined);
226
+ const updateExecutorNode = new DmlExecutorNode(updateCtx.scope, constraintCheckNode, tableReference, 'update', stmt.onConflict, mutationContextValues.size > 0 ? mutationContextValues : undefined, contextAttributes.length > 0 ? contextAttributes : undefined, contextDescriptor);
220
227
  return new SinkNode(updateCtx.scope, updateExecutorNode, 'update');
221
228
  }
222
229
  //# sourceMappingURL=update.js.map