BREAKING! Eliminate separate reset_all_parameters_clause & _stmt

Instead there's now all_parameters node to represent the ALL keyword.

Author: nene

src/cst/Function.ts

@@ -14,7 +14,6 @@ import { SubSelect } from "./Select";
 import { BlockStmt } from "./ProceduralLanguage";
 import { AlterFunctionAction } from "./AlterAction";
 import {
-  ResetAllParametersClause,
   ResetParameterClause,
   SetParameterClause,
   SetParameterFromCurrentClause,
@@ -211,7 +210,6 @@ type AlterFunctionClause =
   | SetParameterClause
   | SetParameterFromCurrentClause
   | ResetParameterClause
-  | ResetAllParametersClause
   | FunctionBehaviorClause
   | FunctionSecurityClause
   | FunctionCostClause

src/cst/Parameter.ts

@@ -8,15 +8,13 @@ export type AllParameterNodes =
   | SetParameterClause
   | SetParameterFromCurrentClause
   | ResetParameterClause
-  | ResetAllParametersClause;
+  | AllParameters;
 
 export type AllParameterStatements =
   | SetParameterStmt
   | SetTimeZoneParameterStmt
   | ResetParameterStmt
-  | ResetAllParametersStmt
-  | ShowParameterStmt
-  | ShowAllParametersStmt;
+  | ShowParameterStmt;
 
 // These are all PostgreSQL specific
 export interface SetParameterStmt extends BaseNode {
@@ -39,23 +37,13 @@ export interface SetTimeZoneParameterStmt extends BaseNode {
 export interface ResetParameterStmt extends BaseNode {
   type: "reset_parameter_stmt";
   resetKw: Keyword<"RESET">;
-  name: Identifier;
-}
-
-export interface ResetAllParametersStmt extends BaseNode {
-  type: "reset_all_parameters_stmt";
-  resetAllKw: [Keyword<"RESET">, Keyword<"ALL">];
+  name: Identifier | AllParameters;
 }
 
 export interface ShowParameterStmt extends BaseNode {
   type: "show_parameter_stmt";
   showKw: Keyword<"SHOW">;
-  name: Identifier;
-}
-
-export interface ShowAllParametersStmt extends BaseNode {
-  type: "show_all_parameters_stmt";
-  showAllKw: [Keyword<"SHOW">, Keyword<"ALL">];
+  name: Identifier | AllParameters;
 }
 
 export interface SetParameterClause extends BaseNode {
@@ -76,10 +64,10 @@ export interface SetParameterFromCurrentClause extends BaseNode {
 export interface ResetParameterClause extends BaseNode {
   type: "reset_parameter_clause";
   resetKw: Keyword<"RESET">;
-  name: Identifier;
+  name: Identifier | AllParameters;
 }
 
-export interface ResetAllParametersClause extends BaseNode {
-  type: "reset_all_parameters_clause";
-  resetAllKw: [Keyword<"RESET">, Keyword<"ALL">];
+export interface AllParameters extends BaseNode {
+  type: "all_parameters";
+  allKw: Keyword<"ALL">;
 }

src/cst/Procedure.ts

@@ -12,7 +12,6 @@ import {
 } from "./Function";
 import { AlterFunctionAction } from "./AlterAction";
 import {
-  ResetAllParametersClause,
   ResetParameterClause,
   SetParameterClause,
   SetParameterFromCurrentClause,
@@ -74,5 +73,4 @@ type AlterProcedureClause =
   | SetParameterClause
   | SetParameterFromCurrentClause
   | ResetParameterClause
-  | ResetAllParametersClause
   | FunctionSecurityClause;

src/parser.pegjs

@@ -109,9 +109,7 @@ statement_postgres
   / set_parameter_stmt
   / set_time_zone_parameter_stmt
   / reset_parameter_stmt
-  / reset_all_parameters_stmt
   / show_parameter_stmt
-  / show_all_parameters_stmt
 
 ddl_statement
   = create_view_stmt
@@ -3983,7 +3981,6 @@ alter_function_action
   / alter_action_no_depends_on_extension
   / set_parameter_clause
   / set_parameter_from_current_clause
-  / reset_all_parameters_clause
   / reset_parameter_clause
   / function_behavior_clause
   / function_security_clause
@@ -4115,7 +4112,6 @@ alter_procedure_action
   / alter_action_no_depends_on_extension
   / set_parameter_clause
   / set_parameter_from_current_clause
-  / reset_all_parameters_clause
   / reset_parameter_clause
   / function_security_clause
 
@@ -5969,54 +5965,35 @@ set_parameter_from_current_clause
   }
 
 reset_parameter_stmt
-  = kw:(RESET __) name:ident {
+  = kw:(RESET __) name:(all_parameters / ident) {
     return loc({
       type: "reset_parameter_stmt",
       resetKw: read(kw),
       name,
     });
   }
 
-reset_all_parameters_stmt
-  = kw:(RESET __ ALL) {
-    return loc({
-      type: "reset_all_parameters_stmt",
-      resetAllKw: read(kw),
-    });
-  }
-
 reset_parameter_clause
-  = kw:(RESET __) name:ident {
+  = kw:(RESET __) name:(all_parameters / ident) {
     return loc({
       type: "reset_parameter_clause",
       resetKw: read(kw),
       name,
     });
   }
 
-reset_all_parameters_clause
-  = kw:(RESET __ ALL) {
-    return loc({
-      type: "reset_all_parameters_clause",
-      resetAllKw: read(kw),
-    });
-  }
-
 show_parameter_stmt
-  = kw:(SHOW __) name:ident {
+  = kw:(SHOW __) name:(all_parameters / ident) {
     return loc({
       type: "show_parameter_stmt",
       showKw: read(kw),
       name,
     });
   }
 
-show_all_parameters_stmt
-  = kw:(SHOW __ ALL) {
-    return loc({
-      type: "show_all_parameters_stmt",
-      showAllKw: read(kw),
-    });
+all_parameters
+  = allKw:ALL {
+    return loc({ type: "all_parameters", allKw });
   }
 
 postgresql_with_options

src/showNode/parameter.ts

@@ -8,13 +8,11 @@ export const parameterMap: FullTransformMap<string, AllParameterNodes> = {
   set_time_zone_parameter_stmt: (node) =>
     show([node.setKw, node.modifierKw, node.timeZoneKw, node.value]),
   reset_parameter_stmt: (node) => show([node.resetKw, node.name]),
-  reset_all_parameters_stmt: (node) => show(node.resetAllKw),
   show_parameter_stmt: (node) => show([node.showKw, node.name]),
-  show_all_parameters_stmt: (node) => show(node.showAllKw),
   set_parameter_clause: (node) =>
     show([node.setKw, node.name, node.operator, node.value]),
   set_parameter_from_current_clause: (node) =>
     show([node.setKw, node.name, node.fromCurrentKw]),
   reset_parameter_clause: (node) => show([node.resetKw, node.name]),
-  reset_all_parameters_clause: (node) => show([node.resetAllKw]),
+  all_parameters: (node) => show([node.allKw]),
 };