More dynamic formatting of CREATE INDEX

nene · Jan 20, 2024 · b86c1d4 · b86c1d4
1 parent ba811ee
commit b86c1d4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/src/syntax/index.ts b/src/syntax/index.ts
@@ -1,22 +1,24 @@
 import { AllIndexNodes } from "sql-parser-cst";
-import { hardline, join } from "../print_utils";
+import { group, join } from "../print_utils";
 import { CstToDocMap } from "../CstToDocMap";
 
 export const indexMap: CstToDocMap<AllIndexNodes> = {
-  create_index_stmt: (print, node) =>
-    join(hardline, [
-      print.spaced([
-        "createKw",
-        "indexTypeKw",
-        "indexKw",
-        "ifNotExistsKw",
-        "name",
-        "onKw",
-        "table",
-        "columns",
+  create_index_stmt: (print) =>
+    group(
+      join(print.dynamicLine(), [
+        print.spaced([
+          "createKw",
+          "indexTypeKw",
+          "indexKw",
+          "ifNotExistsKw",
+          "name",
+          "onKw",
+          "table",
+          "columns",
+        ]),
+        ...print("clauses"),
       ]),
-      ...(node.clauses.length > 0 ? [join(hardline, print("clauses"))] : []),
-    ]),
+    ),
   drop_index_stmt: (print) =>
     print.spaced([
       "dropKw",

diff --git a/test/ddl/index.test.ts b/test/ddl/index.test.ts
@@ -31,7 +31,13 @@ describe("index", () => {
       `);
     });
 
-    it(`formats WHERE clause on separate line`, async () => {
+    it(`formats WHERE clause on same line (if user prefers)`, async () => {
+      await test(dedent`
+        CREATE INDEX my_index ON my_table (col) WHERE col > 10
+      `);
+    });
+
+    it(`formats WHERE clause on separate line (if user prefers)`, async () => {
       await test(dedent`
         CREATE INDEX my_index ON my_table (col)
         WHERE col > 10