Restore regression in DELETE FROM formatting

nene · nene · commit 0c37211437b9 · 2022-05-12T16:52:57.000+03:00
Now back as it was in 4.x release.
diff --git a/src/languages/bigquery.formatter.ts b/src/languages/bigquery.formatter.ts
@@ -704,7 +704,7 @@ const reservedCommands = [
   'INSERT INTO',
   'VALUES',
   'DELETE',
-  // 'DELETE FROM',
+  'DELETE FROM',
   'TRUNCATE TABLE',
   'UPDATE',
   'MERGE',
diff --git a/src/languages/db2.formatter.ts b/src/languages/db2.formatter.ts
@@ -736,6 +736,7 @@ const reservedCommands = [
   'DECLARE TABLE',
   'DECLARE VARIABLE',
   'DELETE',
+  'DELETE FROM',
   'DESCRIBE CURSOR',
   'DESCRIBE INPUT',
   'DESCRIBE OUTPUT',
diff --git a/src/languages/mariadb.formatter.ts b/src/languages/mariadb.formatter.ts
@@ -936,6 +936,7 @@ const reservedCommands = [
   'CREATE VIEW',
   'DEALLOCATE PREPARE',
   'DELETE',
+  'DELETE FROM',
   'DESC',
   'DESCRIBE',
   'DO',
diff --git a/src/languages/mysql.formatter.ts b/src/languages/mysql.formatter.ts
@@ -1131,6 +1131,7 @@ const reservedCommands = [
   'CREATE VIEW',
   'DEALLOCATE PREPARE',
   'DELETE',
+  'DELETE FROM',
   'DESCRIBE',
   'DO',
   'DROP DATABASE',
diff --git a/src/languages/n1ql.formatter.ts b/src/languages/n1ql.formatter.ts
@@ -430,6 +430,7 @@ const reservedCommands = [
   'CREATE SCOPE',
   'CREATE TABLE', // verify
   'DELETE',
+  'DELETE FROM',
   'DROP COLLECTION',
   'DROP FUNCTION',
   'DROP INDEX',
diff --git a/src/languages/plsql.formatter.ts b/src/languages/plsql.formatter.ts
@@ -373,8 +373,8 @@ const reservedCommands = [
   'CREATE TABLE', // verify
   'DROP TABLE', // verify
   'DECLARE',
-  // 'DELETE FROM', // disabled
   'DELETE',
+  'DELETE FROM',
   'END',
   'EXCEPT',
   'EXCEPTION',
diff --git a/src/languages/postgresql.formatter.ts b/src/languages/postgresql.formatter.ts
@@ -1482,6 +1482,7 @@ const reservedCommands = [
   'DEALLOCATE',
   'DECLARE',
   'DELETE',
+  'DELETE FROM',
   'DISCARD',
   'DO',
   'DROP ACCESS METHOD',
diff --git a/src/languages/redshift.formatter.ts b/src/languages/redshift.formatter.ts
@@ -619,6 +619,7 @@ const reservedCommands = [
   'DEALLOCATE',
   'DECLARE',
   'DELETE',
+  'DELETE FROM',
   'DESC DATASHARE',
   'DROP DATABASE',
   'DROP DATASHARE',
diff --git a/src/languages/sqlite.formatter.ts b/src/languages/sqlite.formatter.ts
@@ -373,6 +373,7 @@ const reservedCommands = [
   'CREATE TABLE',
   'DROP TABLE',
   'DELETE',
+  'DELETE FROM',
   'FETCH FIRST',
   'FETCH NEXT',
   'FETCH PRIOR',
diff --git a/src/languages/standardsql.formatter.ts b/src/languages/standardsql.formatter.ts
@@ -310,6 +310,7 @@ const reservedCommands = [
   'ALTER TABLE',
   'CREATE TABLE',
   'DROP TABLE',
+  'DELETE FROM',
   'END',
   'FETCH FIRST',
   'FETCH NEXT',
diff --git a/src/languages/tsql.formatter.ts b/src/languages/tsql.formatter.ts
@@ -1062,6 +1062,7 @@ const reservedCommands = [
   'DEADLOCK_PRIORITY',
   'DEFAULT',
   'DELETE',
+  'DELETE FROM',
   'DENY',
   'DENY XML',
   'DISABLE TRIGGER',
diff --git a/test/behavesLikeMariaDbFormatter.ts b/test/behavesLikeMariaDbFormatter.ts
@@ -1,13 +1,14 @@
 import dedent from 'dedent-js';
 import behavesLikeSqlFormatter from './behavesLikeSqlFormatter';
+import { FormatFn, SqlLanguage } from '../src/sqlFormatter';
 
 import supportsCase from './features/case';
 import supportsCreateTable from './features/createTable';
 import supportsAlterTable from './features/alterTable';
 import supportsBetween from './features/between';
 import supportsJoin from './features/join';
 import supportsConstraints from './features/constraints';
-import { FormatFn, SqlLanguage } from '../src/sqlFormatter';
+import supportsDeleteFrom from './features/deleteFrom';
 
 /**
  * Shared tests for MySQL and MariaDB
@@ -18,6 +19,7 @@ export default function behavesLikeMariaDbFormatter(language: SqlLanguage, forma
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
+  supportsDeleteFrom(language, format);
   supportsBetween(language, format);
   supportsJoin(language, format, {
     without: ['FULL'],
diff --git a/test/behavesLikeSqlFormatter.ts b/test/behavesLikeSqlFormatter.ts
@@ -279,18 +279,6 @@ export default function behavesLikeSqlFormatter(language: SqlLanguage, format: F
     `);
   });
 
-  it('formats simple DELETE query', () => {
-    const result = format("DELETE FROM Customers WHERE CustomerName='Alfred' AND Phone=5002132;");
-    expect(result).toBe(dedent`
-      DELETE
-      FROM
-        Customers
-      WHERE
-        CustomerName = 'Alfred'
-        AND Phone = 5002132;
-    `);
-  });
-
   it('formats simple DROP query', () => {
     const result = format('DROP TABLE IF EXISTS admin_role;');
     expect(result).toBe(dedent`
diff --git a/test/bigquery.test.ts b/test/bigquery.test.ts
@@ -10,6 +10,7 @@ import supportsStrings from './features/strings';
 import supportsBetween from './features/between';
 import supportsJoin from './features/join';
 import supportsOperators from './features/operators';
+import supportsDeleteFrom from './features/deleteFrom';
 
 describe('BigQueryFormatter', () => {
   const language = 'bigquery';
@@ -18,6 +19,7 @@ describe('BigQueryFormatter', () => {
   behavesLikeSqlFormatter(language, format);
   supportsCase(language, format);
   supportsCreateTable(language, format);
+  supportsDeleteFrom(language, format);
   supportsStrings(language, format, BigQueryFormatter.stringTypes);
   supportsBetween(language, format);
   supportsSchema(language, format);
diff --git a/test/db2.test.ts b/test/db2.test.ts
@@ -11,6 +11,7 @@ import supportsOperators from './features/operators';
 import supportsSchema from './features/schema';
 import supportsStrings from './features/strings';
 import supportsConstraints from './features/constraints';
+import supportsDeleteFrom from './features/deleteFrom';
 
 describe('Db2Formatter', () => {
   const language = 'db2';
@@ -20,6 +21,7 @@ describe('Db2Formatter', () => {
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
+  supportsDeleteFrom(language, format);
   supportsStrings(language, format, Db2Formatter.stringTypes);
   supportsBetween(language, format);
   supportsSchema(language, format);
diff --git a/test/features/deleteFrom.ts b/test/features/deleteFrom.ts
@@ -0,0 +1,15 @@
+import dedent from 'dedent-js';
+import { FormatFn, SqlLanguage } from '../../src/sqlFormatter';
+
+export default function supportsDeleteFrom(language: SqlLanguage, format: FormatFn) {
+  it('formats simple DELETE FROM statement', () => {
+    const result = format("DELETE FROM Customers WHERE CustomerName='Alfred' AND Phone=5002132;");
+    expect(result).toBe(dedent`
+      DELETE FROM
+        Customers
+      WHERE
+        CustomerName = 'Alfred'
+        AND Phone = 5002132;
+    `);
+  });
+}
diff --git a/test/n1ql.test.ts b/test/n1ql.test.ts
@@ -9,12 +9,14 @@ import supportsOperators from './features/operators';
 import supportsSchema from './features/schema';
 import supportsStrings from './features/strings';
 import supportsReturning from './features/returning';
+import supportsDeleteFrom from './features/deleteFrom';
 
 describe('N1qlFormatter', () => {
   const language = 'n1ql';
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
+  supportsDeleteFrom(language, format);
   supportsStrings(language, format, N1qlFormatter.stringTypes);
   supportsBetween(language, format);
   supportsSchema(language, format);
@@ -124,8 +126,7 @@ describe('N1qlFormatter', () => {
     const result = format("EXPLAIN DELETE FROM tutorial t USE KEYS 'baldwin'");
     expect(result).toBe(dedent`
       EXPLAIN
-      DELETE
-      FROM
+      DELETE FROM
         tutorial t
       USE KEYS
         'baldwin'
diff --git a/test/plsql.test.ts b/test/plsql.test.ts
@@ -14,6 +14,7 @@ import supportsSchema from './features/schema';
 import supportsStrings from './features/strings';
 import supportsReturning from './features/returning';
 import supportsConstraints from './features/constraints';
+import supportsDeleteFrom from './features/deleteFrom';
 
 describe('PlSqlFormatter', () => {
   const language = 'plsql';
@@ -25,6 +26,7 @@ describe('PlSqlFormatter', () => {
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
   supportsAlterTableModify(language, format);
+  supportsDeleteFrom(language, format);
   supportsStrings(language, format, PlSqlFormatter.stringTypes);
   supportsBetween(language, format);
   supportsSchema(language, format);
diff --git a/test/postgresql.test.ts b/test/postgresql.test.ts
@@ -13,6 +13,7 @@ import supportsSchema from './features/schema';
 import supportsStrings from './features/strings';
 import supportsReturning from './features/returning';
 import supportsConstraints from './features/constraints';
+import supportsDeleteFrom from './features/deleteFrom';
 
 describe('PostgreSqlFormatter', () => {
   const language = 'postgresql';
@@ -23,6 +24,7 @@ describe('PostgreSqlFormatter', () => {
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
+  supportsDeleteFrom(language, format);
   supportsStrings(language, format, PostgreSqlFormatter.stringTypes);
   supportsBetween(language, format);
   supportsSchema(language, format);
diff --git a/test/redshift.test.ts b/test/redshift.test.ts
@@ -10,6 +10,7 @@ import supportsJoin from './features/join';
 import supportsOperators from './features/operators';
 import supportsSchema from './features/schema';
 import supportsStrings from './features/strings';
+import supportsDeleteFrom from './features/deleteFrom';
 
 describe('RedshiftFormatter', () => {
   const language = 'redshift';
@@ -19,6 +20,7 @@ describe('RedshiftFormatter', () => {
   supportsCreateTable(language, format);
   supportsAlterTable(language, format);
   supportsAlterTableModify(language, format);
+  supportsDeleteFrom(language, format);
   supportsStrings(language, format, RedshiftFormatter.stringTypes);
   supportsSchema(language, format);
   supportsOperators(
diff --git a/test/sql.test.ts b/test/sql.test.ts
@@ -12,6 +12,7 @@ import supportsBetween from './features/between';
 import supportsJoin from './features/join';
 import supportsOperators from './features/operators';
 import supportsConstraints from './features/constraints';
+import supportsDeleteFrom from './features/deleteFrom';
 
 describe('StandardSqlFormatter', () => {
   const language = 'sql';
@@ -22,6 +23,7 @@ describe('StandardSqlFormatter', () => {
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
+  supportsDeleteFrom(language, format);
   supportsStrings(language, format, StandardSqlFormatter.stringTypes);
   supportsBetween(language, format);
   supportsSchema(language, format);
diff --git a/test/sqlite.test.ts b/test/sqlite.test.ts
@@ -12,6 +12,7 @@ import supportsBetween from './features/between';
 import supportsJoin from './features/join';
 import supportsOperators from './features/operators';
 import supportsConstraints from './features/constraints';
+import supportsDeleteFrom from './features/deleteFrom';
 
 describe('SqliteFormatter', () => {
   const language = 'sqlite';
@@ -22,6 +23,7 @@ describe('SqliteFormatter', () => {
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
+  supportsDeleteFrom(language, format);
   supportsStrings(language, format, SqliteFormatter.stringTypes);
   supportsBetween(language, format);
   supportsSchema(language, format);
diff --git a/test/tsql.test.ts b/test/tsql.test.ts
@@ -12,6 +12,7 @@ import supportsBetween from './features/between';
 import supportsOperators from './features/operators';
 import supportsJoin from './features/join';
 import supportsConstraints from './features/constraints';
+import supportsDeleteFrom from './features/deleteFrom';
 
 describe('TSqlFormatter', () => {
   const language = 'tsql';
@@ -22,6 +23,7 @@ describe('TSqlFormatter', () => {
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
+  supportsDeleteFrom(language, format);
   supportsStrings(language, format, TSqlFormatter.stringTypes);
   supportsBetween(language, format);
   supportsSchema(language, format);
