fix: add a few more A_Expr fields

pg-nano · Nov 6, 2024 · 89ed72b · 89ed72b
1 parent af71884
commit 89ed72b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/scripts/typeMappings.ts b/scripts/typeMappings.ts
@@ -34,9 +34,11 @@ export const expressionFields = new Set([
   'A_Indirection.arg',
   'AlterTableCmd.def',
   'BoolExpr.args',
+  'CollateClause.arg',
   'CreatePolicyStmt.qual',
   'DeleteStmt.whereClause',
   'FuncCall.args',
+  'FuncCall.agg_filter',
   'GroupingSet.content',
   'IndexStmt.whereClause',
   'JoinExpr.quals',

diff --git a/src/lib/ast.ts b/src/lib/ast.ts
@@ -1552,12 +1552,7 @@ export type TypeCast = {
  */
 export type CollateClause = {
   /** input expression */
-  arg:
-    | { A_Const: A_Const }
-    | { A_Expr: A_Expr }
-    | { CaseExpr: CaseExpr }
-    | { ColumnRef: ColumnRef }
-    | { TypeCast: TypeCast }
+  arg: Expr
   /** possibly-qualified collation name */
   collname: QualifiedName
   /** token location, or -1 if unknown */
@@ -1595,12 +1590,7 @@ export type FuncCall = {
   /** ORDER BY (list of SortBy) */
   agg_order?: { SortBy: SortBy }[]
   /** FILTER clause, if any */
-  agg_filter?:
-    | { A_Const: A_Const }
-    | { A_Expr: A_Expr }
-    | { ColumnRef: ColumnRef }
-    | { NullTest: NullTest }
-    | { SubLink: SubLink }
+  agg_filter?: Expr
   /** OVER clause, if any */
   over?: WindowDef
   /** ORDER BY appeared in WITHIN GROUP */