Merge branch 'parser-0.42.0'

Author: nene

README.md

@@ -211,17 +211,6 @@ There are also several SQL-specific options:
 
   _Since 0.13.0_
 
-- **`sqlAcceptUnsupportedGrammar`**: `boolean` (default `false`)
-
-  Normally when the plugin encounters SQL syntax it doesn't support
-  it will throw an error and won't format anything at all.
-  With this option enabled, it will skip over SQL statements it doesn't recognize, leaving them as-is.
-
-  **Deprecated:** Use conditional comments `/* sql-parser-cst-disable */` and
-  `/* sql-parser-cst-enable */` instead.
-
-  _Since 0.12.0_
-
 - **`sqlExperimentalPlpgsql`**: `boolean` (default `false`)
 
   When enabled, the plugin will attempt to format PL/pgSQL function bodies.

package.json

@@ -39,7 +39,7 @@
   ],
   "dependencies": {
     "prettier": "^3.0.3",
-    "sql-parser-cst": "^0.41.2"
+    "sql-parser-cst": "^0.42.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",

src/index.ts

@@ -52,8 +52,6 @@ const createParser = (dialect: DialectName): Parser<Node> => ({
         includeComments: true,
         filename: options.filepath,
         paramTypes: (options as AllPrettierOptions<Node>).sqlParamTypes,
-        acceptUnsupportedGrammar: (options as AllPrettierOptions<Node>)
-          .sqlAcceptUnsupportedGrammar,
       }),
       text,
       options as AllPrettierOptions<Node>,

src/options.ts

@@ -10,7 +10,6 @@ export interface SqlPluginOptions {
   sqlParamTypes: NonNullable<CstParserOptions["paramTypes"]>;
   sqlCanonicalSyntax: boolean;
   sqlFinalSemicolon: boolean;
-  sqlAcceptUnsupportedGrammar: boolean;
   sqlExperimentalPlpgsql: boolean;
 }
 
@@ -158,14 +157,6 @@ export const options: SupportOptions = {
     description: "Enforces a semicolon at the end of last SQL statement",
     // Since 0.13.0
   },
-  sqlAcceptUnsupportedGrammar: {
-    type: "boolean",
-    category: "SQL",
-    default: false,
-    description:
-      "Skips formatting unsupported SQL statements instead of exiting with an error",
-    // Since 0.12.0
-  },
   sqlExperimentalPlpgsql: {
     type: "boolean",
     category: "SQL",

src/syntax/other_clauses.ts

@@ -12,6 +12,13 @@ export const otherClausesMap: CstToDocMap<AllOtherClauses> = {
   returning_clause: (print) =>
     group([print("returningKw"), indent([line, print("columns")])]),
 
+  // INTO clause
+  into_variables_clause: (print) =>
+    group([
+      print.spaced(["intoKw", "strictKw"]),
+      indent([line, print("variables")]),
+    ]),
+
   as_clause: (print, node) => {
     if (isStringLiteral(node.expr) || isDynamicallyLoadedFunction(node.expr)) {
       return group(print.spaced(["asKw", "expr"]));

src/syntax/prepared_statements.ts

@@ -26,7 +26,6 @@ export const preparedStatementsMap: CstToDocMap<AllPreparedStatementNodes> = {
       print("executeKw"),
       indent([line, print.separated(line, ["expr", "using"])]),
     ]),
-  execute_into_clause: (print) => print.spaced(["intoKw", "variables"]),
   execute_using_clause: (print) =>
     group([print("usingKw"), indent([line, print("values")])]),
 

src/syntax/procedural_language.ts

@@ -22,11 +22,8 @@ export const proceduralLanguageMap: CstToDocMap<AllProceduralNodes> = {
   // BEGIN .. END
   block_stmt: (print, node) =>
     group([
-      stripTrailingHardline(print("declareClause")),
-      [
-        node.declareClause ? hardline : [],
-        print.spaced(["beginKw", "atomicKw"]),
-      ],
+      stripTrailingHardline(print("declare")),
+      [node.declare ? hardline : [], print.spaced(["beginKw", "atomicKw"])],
       node.program.statements.length > 0
         ? indent([hardline, stripTrailingHardline(print("program"))])
         : print("program"),
@@ -47,6 +44,8 @@ export const proceduralLanguageMap: CstToDocMap<AllProceduralNodes> = {
       ]),
     ),
   declare_init: (print) => print.spaced(["operator", "expr"]),
+  declare_alias_stmt: (print) =>
+    group(print.spaced(["newName", "aliasForKw", "oldName"])),
 
   // EXCEPTION
   exception_clause: (print, node) => {

src/syntax/select.ts

@@ -252,8 +252,6 @@ export const selectMap: CstToDocMap<AllSelectNodes> = {
   // INTO clause
   into_table_clause: (print) =>
     print.spaced(["intoKw", "kind", "tableKw", "name"]),
-  into_variables_clause: (print) =>
-    group([print("intoKw"), indent([line, print("variables")])]),
   into_dumpfile_clause: (print) => print.spaced(["intoDumpfileKw", "filename"]),
   into_outfile_clause: (print, node) => {
     const hasOptions = node.charset || node.fields || node.lines;

src/syntax/transformMap.ts

@@ -42,7 +42,6 @@ import { transactionMap } from "./transaction";
 import { triggerMap } from "./trigger";
 import { truncateMap } from "./truncate";
 import { typeMap } from "./type";
-import { unsupportedGrammarMap } from "./unsupported_grammar";
 import { updateMap } from "./update";
 import { viewMap } from "./view";
 
@@ -94,7 +93,6 @@ export const transformMap: CstToDocMap<Node> = {
   ...triggerMap,
   ...truncateMap,
   ...typeMap,
-  ...unsupportedGrammarMap,
   ...updateMap,
   ...viewMap,