Change formatting of CREATE TABLE (#688)

sql-formatter-org · Dec 6, 2023 · b64a3e9 · b64a3e9
2 parents d9db4ca + a6cf455
commit b64a3e9
Show file tree

Hide file tree

Showing 24 changed files with 83 additions and 82 deletions.
diff --git a/src/languages/bigquery/bigquery.formatter.ts b/src/languages/bigquery/bigquery.formatter.ts
@@ -32,7 +32,6 @@ const reservedClauses = expandPhrases([
   'UPDATE SET',
   // Data definition, https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   'CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]',
-  'CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]',
 
   'CLUSTER BY',
   'FOR SYSTEM_TIME AS OF', // CREATE SNAPSHOT TABLE
@@ -42,6 +41,8 @@ const reservedClauses = expandPhrases([
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE',
   // - delete:

diff --git a/src/languages/db2/db2.formatter.ts b/src/languages/db2/db2.formatter.ts
@@ -36,10 +36,11 @@ const reservedClauses = expandPhrases([
   'INSERT',
   // Data definition
   'CREATE [OR REPLACE] VIEW',
-  'CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE',
   'WHERE CURRENT OF',

diff --git a/src/languages/db2i/db2i.formatter.ts b/src/languages/db2i/db2i.formatter.ts
@@ -34,13 +34,14 @@ const reservedClauses = expandPhrases([
   'DELETE',
   'INSERT',
   // Data definition - table
-  'CREATE [OR REPLACE] TABLE',
   'FOR SYSTEM NAME',
   // Data definition - view
   'CREATE [OR REPLACE] [RECURSIVE] VIEW',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [OR REPLACE] TABLE',
   // - update:
   'UPDATE',
   'WHERE CURRENT OF',

diff --git a/src/languages/hive/hive.formatter.ts b/src/languages/hive/hive.formatter.ts
@@ -41,10 +41,11 @@ const reservedClauses = expandPhrases([
   '[OVERWRITE] INTO TABLE',
   // Data definition
   'CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]',
-  'CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE',
   // - delete:

diff --git a/src/languages/mariadb/mariadb.formatter.ts b/src/languages/mariadb/mariadb.formatter.ts
@@ -28,12 +28,13 @@ const reservedClauses = expandPhrases([
   'SET',
   // Data definition
   'CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]',
-  'CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]',
   // other
   'RETURNING',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE [LOW_PRIORITY] [IGNORE]',
   // - delete:

diff --git a/src/languages/mysql/mysql.formatter.ts b/src/languages/mysql/mysql.formatter.ts
@@ -28,10 +28,11 @@ const reservedClauses = expandPhrases([
   'SET',
   // Data definition
   'CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]',
-  'CREATE [TEMPORARY] TABLE [IF NOT EXISTS]',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [TEMPORARY] TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE [LOW_PRIORITY] [IGNORE]',
   // - delete:

diff --git a/src/languages/plsql/plsql.formatter.ts b/src/languages/plsql/plsql.formatter.ts
@@ -31,12 +31,13 @@ const reservedClauses = expandPhrases([
   // Data definition
   'CREATE [OR REPLACE] [NO FORCE | FORCE] [EDITIONING | EDITIONABLE | EDITIONABLE EDITIONING | NONEDITIONABLE] VIEW',
   'CREATE MATERIALIZED VIEW',
-  'CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE',
   // other
   'RETURNING',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE',
   // - update:
   'UPDATE [ONLY]',
   // - delete:

diff --git a/src/languages/postgresql/postgresql.formatter.ts b/src/languages/postgresql/postgresql.formatter.ts
@@ -28,12 +28,13 @@ const reservedClauses = expandPhrases([
   // Data definition
   'CREATE [OR REPLACE] [TEMP | TEMPORARY] [RECURSIVE] VIEW',
   'CREATE MATERIALIZED VIEW [IF NOT EXISTS]',
-  'CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]',
   // other
   'RETURNING',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create
+  'CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE [ONLY]',
   'WHERE CURRENT OF',

diff --git a/src/languages/redshift/redshift.formatter.ts b/src/languages/redshift/redshift.formatter.ts
@@ -24,10 +24,11 @@ const reservedClauses = expandPhrases([
   'SET',
   // Data definition
   'CREATE [OR REPLACE | MATERIALIZED] VIEW',
-  'CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE',
   // - delete:

diff --git a/src/languages/singlestoredb/singlestoredb.formatter.ts b/src/languages/singlestoredb/singlestoredb.formatter.ts
@@ -27,12 +27,13 @@ const reservedClauses = expandPhrases([
   'SET',
   // Data definition
   'CREATE VIEW',
-  'CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]',
   'CREATE [OR REPLACE] [TEMPORARY] PROCEDURE [IF NOT EXISTS]',
   'CREATE [OR REPLACE] [EXTERNAL] FUNCTION',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE',
   // - delete:

diff --git a/src/languages/snowflake/snowflake.formatter.ts b/src/languages/snowflake/snowflake.formatter.ts
@@ -29,8 +29,6 @@ const reservedClauses = expandPhrases([
   // - view
   'CREATE [OR REPLACE] [SECURE] [RECURSIVE] VIEW [IF NOT EXISTS]',
   // - create/drop/merge table
-  'CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]',
-  'CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]',
   'CLUSTER BY',
   '[WITH] {MASKING POLICY | TAG | ROW ACCESS POLICY}',
   'COPY GRANTS',
@@ -42,6 +40,9 @@ const reservedClauses = expandPhrases([
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]',
+  'CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE',
   // - delete:

diff --git a/src/languages/spark/spark.formatter.ts b/src/languages/spark/spark.formatter.ts
@@ -34,10 +34,11 @@ const reservedClauses = expandPhrases([
   '[OVERWRITE] INTO TABLE',
   // Data definition
   'CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]',
-  'CREATE [EXTERNAL] TABLE [IF NOT EXISTS]',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [EXTERNAL] TABLE [IF NOT EXISTS]',
   // - drop table:
   'DROP TABLE [IF EXISTS]',
   // - alter table:

diff --git a/src/languages/sql/sql.formatter.ts b/src/languages/sql/sql.formatter.ts
@@ -26,10 +26,11 @@ const reservedClauses = expandPhrases([
   'SET',
   // Data definition
   'CREATE [RECURSIVE] VIEW',
-  'CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE',
   // - update:
   'UPDATE',
   'WHERE CURRENT OF',

diff --git a/src/languages/sqlite/sqlite.formatter.ts b/src/languages/sqlite/sqlite.formatter.ts
@@ -26,10 +26,11 @@ const reservedClauses = expandPhrases([
   'SET',
   // Data definition
   'CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]',
-  'CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE [OR ABORT | OR FAIL | OR IGNORE | OR REPLACE | OR ROLLBACK]',
   // - insert:

diff --git a/src/languages/transactsql/transactsql.formatter.ts b/src/languages/transactsql/transactsql.formatter.ts
@@ -30,11 +30,12 @@ const reservedClauses = expandPhrases([
   'UPDATE SET',
   // Data definition
   'CREATE [OR ALTER] [MATERIALIZED] VIEW',
-  'CREATE TABLE',
   'CREATE [OR ALTER] {PROC | PROCEDURE}',
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE TABLE',
   // - update:
   'UPDATE',
   'WHERE CURRENT OF',

diff --git a/src/languages/trino/trino.formatter.ts b/src/languages/trino/trino.formatter.ts
@@ -27,7 +27,6 @@ const reservedClauses = expandPhrases([
   'SET',
   // Data definition
   'CREATE [OR REPLACE] [MATERIALIZED] VIEW',
-  'CREATE TABLE [IF NOT EXISTS]',
   // MATCH_RECOGNIZE
   'MATCH_RECOGNIZE',
   'MEASURES',
@@ -40,6 +39,8 @@ const reservedClauses = expandPhrases([
 ]);
 
 const onelineClauses = expandPhrases([
+  // - create:
+  'CREATE TABLE [IF NOT EXISTS]',
   // - update:
   'UPDATE',
   // - delete:

diff --git a/test/behavesLikeMariaDbFormatter.ts b/test/behavesLikeMariaDbFormatter.ts
@@ -166,8 +166,7 @@ export default function behavesLikeMariaDbFormatter(format: FormatFn) {
         { keywordCase: 'upper' }
       )
     ).toBe(dedent`
-      CREATE TABLE
-        account (id INT comment 'the most important column');
+      CREATE TABLE account (id INT comment 'the most important column');
 
       SELECT
         *

diff --git a/test/bigquery.test.ts b/test/bigquery.test.ts
@@ -339,8 +339,7 @@ describe('BigQueryFormatter', () => {
           uris = ['gs://bucket/path1.csv']
         )`;
       const expected = dedent`
-        CREATE EXTERNAL TABLE
-          dataset.CsvTable
+        CREATE EXTERNAL TABLE dataset.CsvTable
         WITH PARTITION COLUMNS
           (field_1 STRING, field_2 INT64) OPTIONS(format = 'CSV', uris = ['gs://bucket/path1.csv'])`;
       expect(format(input)).toBe(expected);

diff --git a/test/features/constraints.ts b/test/features/constraints.ts
@@ -13,11 +13,10 @@ export default function supportsConstraints(format: FormatFn, actions: string[])
         );
       `)
       ).toBe(dedent`
-        CREATE TABLE
-          foo (
-            update_time datetime ON UPDATE ${action},
-            delete_time datetime ON DELETE ${action},
-          );
+        CREATE TABLE foo (
+          update_time datetime ON UPDATE ${action},
+          delete_time datetime ON DELETE ${action},
+        );
       `);
     });
   });

diff --git a/test/features/createTable.ts b/test/features/createTable.ts
@@ -15,8 +15,7 @@ export default function supportsCreateTable(
 ) {
   it('formats short CREATE TABLE', () => {
     expect(format('CREATE TABLE tbl (a INT PRIMARY KEY, b TEXT);')).toBe(dedent`
-      CREATE TABLE
-        tbl (a INT PRIMARY KEY, b TEXT);
+      CREATE TABLE tbl (a INT PRIMARY KEY, b TEXT);
     `);
   });
 
@@ -26,30 +25,27 @@ export default function supportsCreateTable(
     expect(
       format('CREATE TABLE tbl (a INT PRIMARY KEY, b TEXT, c INT NOT NULL, doggie INT NOT NULL);')
     ).toBe(dedent`
-      CREATE TABLE
-        tbl (
-          a INT PRIMARY KEY,
-          b TEXT,
-          c INT NOT NULL,
-          doggie INT NOT NULL
-        );
+      CREATE TABLE tbl (
+        a INT PRIMARY KEY,
+        b TEXT,
+        c INT NOT NULL,
+        doggie INT NOT NULL
+      );
     `);
   });
 
   if (orReplace) {
     it('formats short CREATE OR REPLACE TABLE', () => {
       expect(format('CREATE OR REPLACE TABLE tbl (a INT PRIMARY KEY, b TEXT);')).toBe(dedent`
-        CREATE OR REPLACE TABLE
-          tbl (a INT PRIMARY KEY, b TEXT);
+        CREATE OR REPLACE TABLE tbl (a INT PRIMARY KEY, b TEXT);
       `);
     });
   }
 
   if (ifNotExists) {
     it('formats short CREATE TABLE IF NOT EXISTS', () => {
       expect(format('CREATE TABLE IF NOT EXISTS tbl (a INT PRIMARY KEY, b TEXT);')).toBe(dedent`
-        CREATE TABLE IF NOT EXISTS
-          tbl (a INT PRIMARY KEY, b TEXT);
+        CREATE TABLE IF NOT EXISTS tbl (a INT PRIMARY KEY, b TEXT);
       `);
     });
   }
@@ -59,20 +55,18 @@ export default function supportsCreateTable(
       expect(
         format(`CREATE TABLE tbl (a INT COMMENT 'Hello world!', b TEXT COMMENT 'Here we are!');`)
       ).toBe(dedent`
-        CREATE TABLE
-          tbl (
-            a INT COMMENT 'Hello world!',
-            b TEXT COMMENT 'Here we are!'
-          );
+        CREATE TABLE tbl (
+          a INT COMMENT 'Hello world!',
+          b TEXT COMMENT 'Here we are!'
+        );
       `);
     });
   }
 
   if (tableComment) {
     it('formats short CREATE TABLE with comment', () => {
       expect(format(`CREATE TABLE tbl (a INT, b TEXT) COMMENT = 'Hello, world!';`)).toBe(dedent`
-        CREATE TABLE
-          tbl (a INT, b TEXT) COMMENT = 'Hello, world!';
+        CREATE TABLE tbl (a INT, b TEXT) COMMENT = 'Hello, world!';
       `);
     });
   }

diff --git a/test/features/createView.ts b/test/features/createView.ts
@@ -61,8 +61,7 @@ export default function supportsCreateView(
   if (ifNotExists) {
     it('formats short CREATE TABLE IF NOT EXISTS', () => {
       expect(format('CREATE TABLE IF NOT EXISTS tbl (a INT PRIMARY KEY, b TEXT);')).toBe(dedent`
-        CREATE TABLE IF NOT EXISTS
-          tbl (a INT PRIMARY KEY, b TEXT);
+        CREATE TABLE IF NOT EXISTS tbl (a INT PRIMARY KEY, b TEXT);
       `);
     });
   }

diff --git a/test/postgresql.test.ts b/test/postgresql.test.ts
@@ -222,13 +222,12 @@ describe('PostgreSqlFormatter', () => {
           deleted_at TIME WITH TIME ZONE,
           modified_at TIMESTAMP(0) WITH TIME ZONE);`)
     ).toBe(dedent`
-      CREATE TABLE
-        time_table (
-          id INT,
-          created_at TIMESTAMP WITH TIME ZONE,
-          deleted_at TIME WITH TIME ZONE,
-          modified_at TIMESTAMP(0) WITH TIME ZONE
-        );
+      CREATE TABLE time_table (
+        id INT,
+        created_at TIMESTAMP WITH TIME ZONE,
+        deleted_at TIME WITH TIME ZONE,
+        modified_at TIMESTAMP(0) WITH TIME ZONE
+      );
     `);
   });