Apparently CASE..END is supported in all dialects

nene · nene · commit ccd634248dee · 2022-05-16T13:47:14.000+03:00
So make it non-optional.

Also enabled CASE tests for N1QL where these had been forgotten
(had to tweak one test a little, as it contained a function name
that's known to N1QL).
diff --git a/src/core/Tokenizer.ts b/src/core/Tokenizer.ts
@@ -16,7 +16,6 @@ interface TokenizerOptions {
   stringTypes: regexFactory.StringPatternType[];
   blockStart: string[];
   blockEnd: string[];
-  supportsCase?: boolean;
   indexedPlaceholderTypes?: string[];
   namedPlaceholderTypes: string[];
   lineCommentTypes: string[];
@@ -46,7 +45,6 @@ export default class Tokenizer {
    *  @param {string[]} cfg.stringTypes - string types to enable - "", '', ``, [], N''
    *  @param {string[]} cfg.blockStart - Opening parentheses to enable, like (, [
    *  @param {string[]} cfg.blockEnd - Closing parentheses to enable, like ), ]
-   *  @param {boolean} cfg.supportsCase - True when the dialect supports CASE..END expressions
    *  @param {string[]} cfg.indexedPlaceholderTypes - Prefixes for indexed placeholders, like ?
    *  @param {string[]} cfg.namedPlaceholderTypes - Prefixes for named placeholders, like @ and :
    *  @param {string[]} cfg.lineCommentTypes - Line comments to enable, like # and --
@@ -96,8 +94,8 @@ export default class Tokenizer {
       ]),
       [TokenType.BLOCK_START]: regexFactory.createParenRegex(cfg.blockStart),
       [TokenType.BLOCK_END]: regexFactory.createParenRegex(cfg.blockEnd),
-      [TokenType.RESERVED_CASE_START]: cfg.supportsCase ? /^(CASE)\b/iu : NULL_REGEX,
-      [TokenType.RESERVED_CASE_END]: cfg.supportsCase ? /^(END)\b/iu : NULL_REGEX,
+      [TokenType.RESERVED_CASE_START]: /^(CASE)\b/iu,
+      [TokenType.RESERVED_CASE_END]: /^(END)\b/iu,
       [TokenType.LINE_COMMENT]: regexFactory.createLineCommentRegex(cfg.lineCommentTypes),
       [TokenType.BLOCK_COMMENT]: /^(\/\*[^]*?(?:\*\/|$))/u,
       [TokenType.NUMBER]:
diff --git a/src/languages/bigquery.formatter.ts b/src/languages/bigquery.formatter.ts
@@ -856,7 +856,6 @@ export default class BigQueryFormatter extends Formatter {
       stringTypes: BigQueryFormatter.stringTypes,
       blockStart: BigQueryFormatter.blockStart,
       blockEnd: BigQueryFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: BigQueryFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: BigQueryFormatter.namedPlaceholderTypes,
       lineCommentTypes: BigQueryFormatter.lineCommentTypes,
diff --git a/src/languages/db2.formatter.ts b/src/languages/db2.formatter.ts
@@ -889,7 +889,6 @@ export default class Db2Formatter extends Formatter {
       stringTypes: Db2Formatter.stringTypes,
       blockStart: Db2Formatter.blockStart,
       blockEnd: Db2Formatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: Db2Formatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: Db2Formatter.namedPlaceholderTypes,
       lineCommentTypes: Db2Formatter.lineCommentTypes,
diff --git a/src/languages/hive.formatter.ts b/src/languages/hive.formatter.ts
@@ -644,7 +644,6 @@ export default class HiveFormatter extends Formatter {
       stringTypes: HiveFormatter.stringTypes,
       blockStart: HiveFormatter.blockStart,
       blockEnd: HiveFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: HiveFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: HiveFormatter.namedPlaceholderTypes,
       lineCommentTypes: HiveFormatter.lineCommentTypes,
diff --git a/src/languages/mariadb.formatter.ts b/src/languages/mariadb.formatter.ts
@@ -1182,7 +1182,6 @@ export default class MariaDbFormatter extends Formatter {
       stringTypes: MariaDbFormatter.stringTypes,
       blockStart: MariaDbFormatter.blockStart,
       blockEnd: MariaDbFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: MariaDbFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: MariaDbFormatter.namedPlaceholderTypes,
       lineCommentTypes: MariaDbFormatter.lineCommentTypes,
diff --git a/src/languages/mysql.formatter.ts b/src/languages/mysql.formatter.ts
@@ -1345,7 +1345,6 @@ export default class MySqlFormatter extends Formatter {
       stringTypes: MySqlFormatter.stringTypes,
       blockStart: MySqlFormatter.blockStart,
       blockEnd: MySqlFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: MySqlFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: MySqlFormatter.namedPlaceholderTypes,
       lineCommentTypes: MySqlFormatter.lineCommentTypes,
diff --git a/src/languages/n1ql.formatter.ts b/src/languages/n1ql.formatter.ts
@@ -536,7 +536,6 @@ export default class N1qlFormatter extends Formatter {
       stringTypes: N1qlFormatter.stringTypes,
       blockStart: N1qlFormatter.blockStart,
       blockEnd: N1qlFormatter.blockEnd,
-      supportsCase: true,
       namedPlaceholderTypes: N1qlFormatter.namedPlaceholderTypes,
       lineCommentTypes: N1qlFormatter.lineCommentTypes,
       operators: N1qlFormatter.operators,
diff --git a/src/languages/plsql.formatter.ts b/src/languages/plsql.formatter.ts
@@ -479,7 +479,6 @@ export default class PlSqlFormatter extends Formatter {
       stringTypes: PlSqlFormatter.stringTypes,
       blockStart: PlSqlFormatter.blockStart,
       blockEnd: PlSqlFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: PlSqlFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: PlSqlFormatter.namedPlaceholderTypes,
       lineCommentTypes: PlSqlFormatter.lineCommentTypes,
diff --git a/src/languages/postgresql.formatter.ts b/src/languages/postgresql.formatter.ts
@@ -1697,7 +1697,6 @@ export default class PostgreSqlFormatter extends Formatter {
       stringTypes: PostgreSqlFormatter.stringTypes,
       blockStart: PostgreSqlFormatter.blockStart,
       blockEnd: PostgreSqlFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: PostgreSqlFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: PostgreSqlFormatter.namedPlaceholderTypes,
       lineCommentTypes: PostgreSqlFormatter.lineCommentTypes,
diff --git a/src/languages/redshift.formatter.ts b/src/languages/redshift.formatter.ts
@@ -744,7 +744,6 @@ export default class RedshiftFormatter extends Formatter {
       stringTypes: RedshiftFormatter.stringTypes,
       blockStart: RedshiftFormatter.blockStart,
       blockEnd: RedshiftFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: RedshiftFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: RedshiftFormatter.namedPlaceholderTypes,
       lineCommentTypes: RedshiftFormatter.lineCommentTypes,
diff --git a/src/languages/sparksql.formatter.ts b/src/languages/sparksql.formatter.ts
@@ -806,7 +806,6 @@ export default class SparkSqlFormatter extends Formatter {
       stringTypes: SparkSqlFormatter.stringTypes,
       blockStart: SparkSqlFormatter.blockStart,
       blockEnd: SparkSqlFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: SparkSqlFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: SparkSqlFormatter.namedPlaceholderTypes,
       lineCommentTypes: SparkSqlFormatter.lineCommentTypes,
diff --git a/src/languages/sqlite.formatter.ts b/src/languages/sqlite.formatter.ts
@@ -449,7 +449,6 @@ export default class SqliteFormatter extends Formatter {
       stringTypes: SqliteFormatter.stringTypes,
       blockStart: SqliteFormatter.blockStart,
       blockEnd: SqliteFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: SqliteFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: SqliteFormatter.namedPlaceholderTypes,
       lineCommentTypes: SqliteFormatter.lineCommentTypes,
diff --git a/src/languages/standardsql.formatter.ts b/src/languages/standardsql.formatter.ts
@@ -395,7 +395,6 @@ export default class StandardSqlFormatter extends Formatter {
       stringTypes: StandardSqlFormatter.stringTypes,
       blockStart: StandardSqlFormatter.blockStart,
       blockEnd: StandardSqlFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: StandardSqlFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: StandardSqlFormatter.namedPlaceholderTypes,
       lineCommentTypes: StandardSqlFormatter.lineCommentTypes,
diff --git a/src/languages/tsql.formatter.ts b/src/languages/tsql.formatter.ts
@@ -1261,7 +1261,6 @@ export default class TSqlFormatter extends Formatter {
       stringTypes: TSqlFormatter.stringTypes,
       blockStart: TSqlFormatter.blockStart,
       blockEnd: TSqlFormatter.blockEnd,
-      supportsCase: true,
       indexedPlaceholderTypes: TSqlFormatter.indexedPlaceholderTypes,
       namedPlaceholderTypes: TSqlFormatter.namedPlaceholderTypes,
       lineCommentTypes: TSqlFormatter.lineCommentTypes,
diff --git a/test/behavesLikeMariaDbFormatter.ts b/test/behavesLikeMariaDbFormatter.ts
@@ -2,7 +2,6 @@ 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';
@@ -15,7 +14,6 @@ import supportsDeleteFrom from './features/deleteFrom';
  */
 export default function behavesLikeMariaDbFormatter(language: SqlLanguage, format: FormatFn) {
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
diff --git a/test/behavesLikeSqlFormatter.ts b/test/behavesLikeSqlFormatter.ts
@@ -2,6 +2,7 @@ import dedent from 'dedent-js';
 
 import { FormatFn, SqlLanguage } from '../src/sqlFormatter';
 import supportsComments from './features/comments';
+import supportsCase from './features/case';
 import supportsTabWidth from './options/tabWidth';
 import supportsUseTabs from './options/useTabs';
 import supportsAliasAs from './options/aliasAs';
@@ -21,6 +22,7 @@ import supportsTabulateAlias from './options/tabulateAlias';
  */
 export default function behavesLikeSqlFormatter(language: SqlLanguage, format: FormatFn) {
   supportsComments(language, format);
+  supportsCase(language, format);
 
   supportsAliasAs(language, format);
   supportsTabulateAlias(language, format);
diff --git a/test/bigquery.test.ts b/test/bigquery.test.ts
@@ -3,7 +3,6 @@ import { format as originalFormat, FormatFn } from '../src/sqlFormatter';
 import BigQueryFormatter from '../src/languages/bigquery.formatter';
 import behavesLikeSqlFormatter from './behavesLikeSqlFormatter';
 
-import supportsCase from './features/case';
 import supportsCreateTable from './features/createTable';
 import supportsSchema from './features/schema';
 import supportsStrings from './features/strings';
@@ -17,7 +16,6 @@ describe('BigQueryFormatter', () => {
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsDeleteFrom(language, format);
   supportsStrings(language, format, BigQueryFormatter.stringTypes);
diff --git a/test/db2.test.ts b/test/db2.test.ts
@@ -12,14 +12,12 @@ import supportsSchema from './features/schema';
 import supportsStrings from './features/strings';
 import supportsConstraints from './features/constraints';
 import supportsDeleteFrom from './features/deleteFrom';
-import supportsCase from './features/case';
 
 describe('Db2Formatter', () => {
   const language = 'db2';
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
diff --git a/test/features/case.ts b/test/features/case.ts
@@ -79,12 +79,12 @@ export default function supportsCase(language: SqlLanguage, format: FormatFn) {
 
   it('properly converts to uppercase in case statements', () => {
     const result = format(
-      "case toString(getNumber()) when 'one' then 1 when 'two' then 2 when 'three' then 3 else 4 end;",
+      "case stringify(getNumber()) when 'one' then 1 when 'two' then 2 when 'three' then 3 else 4 end;",
       { keywordCase: 'upper' }
     );
     expect(result).toBe(dedent`
       CASE
-        toString(getNumber())
+        stringify(getNumber())
         WHEN 'one' THEN 1
         WHEN 'two' THEN 2
         WHEN 'three' THEN 3
diff --git a/test/hive.test.ts b/test/hive.test.ts
@@ -2,7 +2,6 @@ import { format as originalFormat, FormatFn } from '../src/sqlFormatter';
 import HiveFormatter from '../src/languages/hive.formatter';
 import behavesLikeSqlFormatter from './behavesLikeSqlFormatter';
 
-import supportsCase from './features/case';
 import supportsCreateTable from './features/createTable';
 import supportsAlterTable from './features/alterTable';
 import supportsSchema from './features/schema';
@@ -17,7 +16,6 @@ describe('HiveFormatter', () => {
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsAlterTable(language, format);
   supportsStrings(language, format, HiveFormatter.stringTypes);
diff --git a/test/plsql.test.ts b/test/plsql.test.ts
@@ -6,7 +6,6 @@ import behavesLikeSqlFormatter from './behavesLikeSqlFormatter';
 import supportsAlterTable from './features/alterTable';
 import supportsAlterTableModify from './features/alterTableModify';
 import supportsBetween from './features/between';
-import supportsCase from './features/case';
 import supportsCreateTable from './features/createTable';
 import supportsJoin from './features/join';
 import supportsOperators from './features/operators';
@@ -21,7 +20,6 @@ describe('PlSqlFormatter', () => {
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
diff --git a/test/postgresql.test.ts b/test/postgresql.test.ts
@@ -5,7 +5,6 @@ import behavesLikeSqlFormatter from './behavesLikeSqlFormatter';
 
 import supportsAlterTable from './features/alterTable';
 import supportsBetween from './features/between';
-import supportsCase from './features/case';
 import supportsCreateTable from './features/createTable';
 import supportsJoin from './features/join';
 import supportsOperators from './features/operators';
@@ -20,7 +19,6 @@ describe('PostgreSqlFormatter', () => {
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
diff --git a/test/redshift.test.ts b/test/redshift.test.ts
@@ -11,14 +11,12 @@ import supportsOperators from './features/operators';
 import supportsSchema from './features/schema';
 import supportsStrings from './features/strings';
 import supportsDeleteFrom from './features/deleteFrom';
-import supportsCase from './features/case';
 
 describe('RedshiftFormatter', () => {
   const language = 'redshift';
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsAlterTable(language, format);
   supportsAlterTableModify(language, format);
diff --git a/test/sparksql.test.ts b/test/sparksql.test.ts
@@ -5,7 +5,6 @@ import behavesLikeSqlFormatter from './behavesLikeSqlFormatter';
 
 import supportsAlterTable from './features/alterTable';
 import supportsBetween from './features/between';
-import supportsCase from './features/case';
 import supportsCreateTable from './features/createTable';
 import supportsJoin from './features/join';
 import supportsOperators from './features/operators';
@@ -18,7 +17,6 @@ describe('SparkSqlFormatter', () => {
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsAlterTable(language, format);
   supportsStrings(language, format, SparkSqlFormatter.stringTypes);
diff --git a/test/sql.test.ts b/test/sql.test.ts
@@ -3,7 +3,6 @@ import { format as originalFormat, FormatFn } from '../src/sqlFormatter';
 import StandardSqlFormatter from '../src/languages/standardsql.formatter';
 import behavesLikeSqlFormatter from './behavesLikeSqlFormatter';
 
-import supportsCase from './features/case';
 import supportsCreateTable from './features/createTable';
 import supportsAlterTable from './features/alterTable';
 import supportsSchema from './features/schema';
@@ -19,7 +18,6 @@ describe('StandardSqlFormatter', () => {
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
diff --git a/test/sqlite.test.ts b/test/sqlite.test.ts
@@ -3,7 +3,6 @@ import { format as originalFormat, FormatFn } from '../src/sqlFormatter';
 import SqliteFormatter from '../src/languages/standardsql.formatter';
 import behavesLikeSqlFormatter from './behavesLikeSqlFormatter';
 
-import supportsCase from './features/case';
 import supportsCreateTable from './features/createTable';
 import supportsAlterTable from './features/alterTable';
 import supportsSchema from './features/schema';
@@ -19,7 +18,6 @@ describe('SqliteFormatter', () => {
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
diff --git a/test/tsql.test.ts b/test/tsql.test.ts
@@ -3,7 +3,6 @@ import { format as originalFormat, FormatFn } from '../src/sqlFormatter';
 import TSqlFormatter from '../src/languages/tsql.formatter';
 import behavesLikeSqlFormatter from './behavesLikeSqlFormatter';
 
-import supportsCase from './features/case';
 import supportsCreateTable from './features/createTable';
 import supportsAlterTable from './features/alterTable';
 import supportsSchema from './features/schema';
@@ -19,7 +18,6 @@ describe('TSqlFormatter', () => {
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(language, format);
-  supportsCase(language, format);
   supportsCreateTable(language, format);
   supportsConstraints(language, format);
   supportsAlterTable(language, format);
