Merge branch 'parser-0.41.0'

Author: nene

package.json

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

src/syntax/dialects/bigquery.ts

@@ -103,9 +103,6 @@ export const bigqueryMap: CstToDocMap<AllBigqueryNodes> = {
       ]),
     ),
 
-  // ASSERT
-  assert_stmt: (print) => group(print.spaced(["assertKw", "expr", "as"])),
-
   // EXPORT
   export_data_stmt: (print) =>
     group(

src/syntax/other_clauses.ts

@@ -1,6 +1,7 @@
 import { AllOtherClauses } from "sql-parser-cst";
 import { CstToDocMap } from "../CstToDocMap";
-import { line, indent, group } from "../print_utils";
+import { line, indent, group, hardline } from "../print_utils";
+import { isDynamicallyLoadedFunction, isStringLiteral } from "../node_utils";
 
 export const otherClausesMap: CstToDocMap<AllOtherClauses> = {
   // CLUSTER BY clause
@@ -11,6 +12,15 @@ export const otherClausesMap: CstToDocMap<AllOtherClauses> = {
   returning_clause: (print) =>
     group([print("returningKw"), indent([line, print("columns")])]),
 
+  as_clause: (print, node) => {
+    if (isStringLiteral(node.expr) || isDynamicallyLoadedFunction(node.expr)) {
+      return print.spaced(["asKw", "expr"]);
+    }
+    return [print("asKw"), indent([hardline, print("expr")])];
+  },
+
+  comma_clause: (print) => [",", print("expr")],
+
   // WHERE CURRENT OF clause
   where_current_of_clause: (print) =>
     print.spaced(["whereCurrentOfKw", "cursor"]),

src/syntax/prepared_statements.ts

@@ -2,7 +2,9 @@ import { AllPreparedStatementNodes } from "sql-parser-cst";
 import { group, hardline, indent, join, line } from "../print_utils";
 import { CstToDocMap } from "../CstToDocMap";
 
-export const preparedStatementsMap: CstToDocMap<AllPreparedStatementNodes> = {
+export const preparedStatementsMap: Partial<
+  CstToDocMap<AllPreparedStatementNodes>
+> = {
   // EXECUTE
   execute_stmt: (print, node) => {
     if (node.args?.type === "execute_using_clause") {

src/syntax/proc_clause.ts

@@ -7,12 +7,6 @@ export const procClauseMap: CstToDocMap<AllProcClauseNodes> = {
   returns_clause: (print) => print.spaced(["returnsKw", "dataType"]),
   determinism_clause: (print) => print.spaced("deterministicKw"),
   language_clause: (print) => print.spaced(["languageKw", "name"]),
-  as_clause: (print, node) => {
-    if (isStringLiteral(node.expr) || isDynamicallyLoadedFunction(node.expr)) {
-      return print.spaced(["asKw", "expr"]);
-    }
-    return [print("asKw"), indent([hardline, print("expr")])];
-  },
   with_connection_clause: (print) =>
     print.spaced(["withConnectionKw", "connection"]),
 };

src/syntax/procedural_language.ts

@@ -9,7 +9,7 @@ import {
 } from "../print_utils";
 import { CstToDocMap } from "../CstToDocMap";
 
-export const proceduralLanguageMap: CstToDocMap<AllProceduralNodes> = {
+export const proceduralLanguageMap: Partial<CstToDocMap<AllProceduralNodes>> = {
   // BEGIN .. END
   block_stmt: (print, node) =>
     group([
@@ -19,23 +19,32 @@ export const proceduralLanguageMap: CstToDocMap<AllProceduralNodes> = {
       hardline,
       print("endKw"),
     ]),
-  exception_clause: (print) =>
+  exception_clause: (print, node) => {
+    if (node.clauses.length === 1) {
+      // Keep single exception clause on the same line as EXCEPTION keyword
+      return group(print.spaced(["exceptionKw", "clauses"]));
+    } else {
+      return group([print("exceptionKw"), indent([line, print("clauses")])]);
+    }
+  },
+  exception_when_clause: (print) =>
     group([
-      print.spaced(["exceptionKw", "whenKw", "condition", "thenKw"]),
+      print.spaced(["whenKw", "condition", "thenKw"]),
       indent([hardline, stripTrailingHardline(print("program"))]),
     ]),
-  error_category: (print) => print("errorKw"),
+
+  error_bigquery: (print) => print("errorKw"),
 
   // DECLARE
   declare_stmt: (print) =>
     group(
       join(" ", [
         print("declareKw"),
         group(print("names")),
-        ...print.spaced(["dataType", "default"]),
+        ...print.spaced(["dataType", "init"]),
       ]),
     ),
-  declare_default: (print) => print.spaced(["defaultKw", "expr"]),
+  declare_init: (print) => print.spaced(["operator", "expr"]),
 
   // SET
   set_stmt: (print) => group(print.spaced(["setKw", "assignments"])),
@@ -110,22 +119,23 @@ export const proceduralLanguageMap: CstToDocMap<AllProceduralNodes> = {
   // BREAK/CONTINUE
   break_stmt: (print) => group(print.spaced(["breakKw", "label"])),
   continue_stmt: (print) => group(print.spaced(["continueKw", "label"])),
+  // labels
   labeled_stmt: (print, node) =>
     group([
-      print("beginLabel"),
-      ": ",
-      print("statement"),
+      print.spaced(["beginLabel", "statement"]),
       node.endLabel ? [" ", print(["endLabel"])] : [],
     ]),
+  colon_label: (print) => [print("label"), ":"],
+
   // CALL
   call_stmt: (print) => group(print.spaced(["callKw", "func"])),
   // RETURN
   return_stmt: (print) => group(print.spaced(["returnKw", "expr"])),
   // RAISE
-  raise_stmt: (print) => group(print.spaced(["raiseKw", "message"])),
-  raise_message: (print) => [
-    print.spaced("usingMessageKw"),
-    " = ",
-    print("string"),
-  ],
+  raise_stmt: (print) => group(print.spaced(["raiseKw", "using"])),
+  raise_using_clause: (print) => group(print.spaced(["usingKw", "options"])),
+  raise_option_element: (print) => [print("nameKw"), " = ", print("value")],
+  // ASSERT
+  assert_stmt: (print) =>
+    group(print.spaced(["assertKw", "condition", "message"])),
 };

src/syntax/transformMap.ts

@@ -51,7 +51,7 @@ import { mysqlMap } from "./dialects/mysql";
 import { sqliteMap } from "./dialects/sqlite";
 import { postgresqlMap } from "./dialects/postgresql";
 
-export const transformMap: CstToDocMap<Node> = {
+export const transformMap: Partial<CstToDocMap<Node>> = {
   ...aliasMap,
   ...alterActionMap,
   ...alterTableMap,

yarn.lock

@@ -2778,10 +2778,10 @@ sprintf-js@~1.0.2:
   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sql-parser-cst@^0.40.0:
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/sql-parser-cst/-/sql-parser-cst-0.40.0.tgz#1abe3d6bf4c98ee02a48d86898779dac609fd820"
-  integrity sha512-hPC71LUTyJjRbfwDBorqlNBTM2l1hurtIZhSB7/lNn7yXWT8HCjWIgKeqetq8FQ3jo33F7fuYyoRUJBShJdwzA==
+sql-parser-cst@^0.41.0:
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/sql-parser-cst/-/sql-parser-cst-0.41.0.tgz#f3812569310539038a4d0d97dce3af3eb2fed760"
+  integrity sha512-zUmYzeqZEaL93G+N3BQ3V7uZ/nbsFrHV6YOYNu8vzXAHzkG5y3ZoNMoD8hNR12uKsXDzECMkauQ/w4gwD49Naw==
 
 stack-utils@^2.0.6:
   version "2.0.6"