Merge branch 'sql-parser-cst-0.27.0'

nene · Feb 7, 2024 · 65b9dcd · 65b9dcd
2 parents d5555b5 + 063c40a
commit 65b9dcd
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "prettier": "^3.0.3",
-    "sql-parser-cst": "^0.26.0"
+    "sql-parser-cst": "^0.27.0"
   },
   "devDependencies": {
     "@types/jest": "^29.2.5",

diff --git a/src/syntax/alter_action.ts b/src/syntax/alter_action.ts
@@ -2,7 +2,7 @@ import { AllAlterActionNodes } from "sql-parser-cst";
 import { CstToDocMap } from "../CstToDocMap";
 import { group, join, line } from "../print_utils";
 
-export const alterActionMap: CstToDocMap<AllAlterActionNodes> = {
+export const alterActionMap: Partial<CstToDocMap<AllAlterActionNodes>> = {
   alter_action_rename: (print) => print.spaced(["renameKw", "newName"]),
   alter_action_rename_column: (print) =>
     print.spaced(["renameKw", "ifExistsKw", "oldName", "toKw", "newName"]),
@@ -14,7 +14,10 @@ export const alterActionMap: CstToDocMap<AllAlterActionNodes> = {
     print.spaced(["setKw", "options"]),
   alter_action_set_default_collate: (print) =>
     print.spaced(["setDefaultCollateKw", "collation"]),
-  alter_action_add_constraint: (print) => print.spaced(["addKw", "constraint"]),
+  alter_action_add_constraint: (print) =>
+    print.spaced(["addKw", "name", "constraint", "modifiers"]),
+  alter_action_add_constraint_constraint_name: (print) =>
+    print.spaced(["constraintKw", "name"]),
   alter_action_drop_constraint: (print) =>
     print.spaced([
       "dropConstraintKw",

diff --git a/src/syntax/constraint.ts b/src/syntax/constraint.ts
@@ -43,8 +43,6 @@ export const constraintMap: CstToDocMap<AllConstraintNodes> = {
       return baseDoc;
     }
   },
-  index_specification: (print) =>
-    print.spaced(["expr", "opclass", "direction", "nullHandlingKw"]),
   referential_action: (print) =>
     print.spaced(["onKw", "eventKw", "actionKw", "columns"]),
   referential_match: (print) => print.spaced(["matchKw", "typeKw"]),
@@ -81,7 +79,6 @@ export const constraintMap: CstToDocMap<AllConstraintNodes> = {
       ]),
     ]),
   exclusion_param: (print) => print.spaced(["index", "withKw", "operator"]),
-  index_include_clause: (print) => print.spaced(["includeKw", "columns"]),
   index_tablespace_clause: (print) =>
     print.spaced(["usingIndexTablespaceKw", "name"]),
 };

diff --git a/src/syntax/dialects/sqlite.ts b/src/syntax/dialects/sqlite.ts
@@ -9,7 +9,6 @@ export const sqliteMap: CstToDocMap<AllSqliteNodes> = {
     print.spaced(["detachKw", "databaseKw", "schema"]),
   vacuum_stmt: (print) =>
     print.spaced(["vacuumKw", "schema", "intoKw", "file"]),
-  reindex_stmt: (print) => print.spaced(["reindexKw", "table"]),
   pragma_stmt: (print) => print.spaced(["pragmaKw", "pragma"]),
   pragma_assignment: (print) => join(" = ", print(["name", "value"])),
   pragma_func_call: (print) => print(["name", "args"]),

diff --git a/src/syntax/index.ts b/src/syntax/index.ts
@@ -2,7 +2,7 @@ import { AllIndexNodes } from "sql-parser-cst";
 import { group, join } from "../print_utils";
 import { CstToDocMap } from "../CstToDocMap";
 
-export const indexMap: CstToDocMap<AllIndexNodes> = {
+export const indexMap: Partial<CstToDocMap<AllIndexNodes>> = {
   create_index_stmt: (print) =>
     group(
       join(print.dynamicLine(), [
@@ -19,6 +19,9 @@ export const indexMap: CstToDocMap<AllIndexNodes> = {
         ...print("clauses"),
       ]),
     ),
+  index_specification: (print) =>
+    print.spaced(["expr", "opclass", "direction", "nullHandlingKw"]),
+  index_include_clause: (print) => print.spaced(["includeKw", "columns"]),
   drop_index_stmt: (print) =>
     print.spaced([
       "dropKw",
@@ -30,4 +33,5 @@ export const indexMap: CstToDocMap<AllIndexNodes> = {
       "table",
     ]),
   verbose_all_columns: (print) => print.spaced("allColumnsKw"),
+  reindex_stmt: (print) => print.spaced(["reindexKw", "name"]),
 };
diff --git a/src/syntax/transformMap.ts b/src/syntax/transformMap.ts
@@ -39,7 +39,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,

diff --git a/src/syntax/view.ts b/src/syntax/view.ts
@@ -2,7 +2,7 @@ import { AllViewNodes } from "sql-parser-cst";
 import { group, hardline, join, line } from "../print_utils";
 import { CstToDocMap } from "../CstToDocMap";
 
-export const viewMap: CstToDocMap<AllViewNodes> = {
+export const viewMap: Partial<CstToDocMap<AllViewNodes>> = {
   create_view_stmt: (print, node) => {
     const hasOnlyAsClause = node.clauses.length === 1;
     const hasManyClauses = node.clauses.length > 1;

diff --git a/yarn.lock b/yarn.lock
@@ -2174,10 +2174,10 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sql-parser-cst@^0.26.0:
-  version "0.26.0"
-  resolved "https://registry.yarnpkg.com/sql-parser-cst/-/sql-parser-cst-0.26.0.tgz#8b439e24e56c57d7b8ab3ba00d858f48a5b0f181"
-  integrity sha512-ioMCDKo+4o2Z40wsar6Ughxxsaf1pYthZQLk9vlncSUBFQEeZz1bvqbGrUbWb/iFl0JECRyNHk92yPPLcYh5MA==
+sql-parser-cst@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/sql-parser-cst/-/sql-parser-cst-0.27.0.tgz#1785fc8939194aa526a159a1724b1f990e49a58f"
+  integrity sha512-220yHtTkweWRCCTPJJa3ViicxHuJPUELNVNYf9qT2hK7zbhRwUjOm1O3Tau+IQPXjY7MG/fuulVugTu5buW0bQ==
 
 stack-utils@^2.0.3:
   version "2.0.6"