Add tests for dataTypeCase and functionCase

Author: karlhorky

src/languages/db2/db2.keywords.ts

@@ -404,12 +404,16 @@ export const keywords: string[] = [
 export const dataTypes: string[] = [
   // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
   'ARRAY',
+  'BIGINT',
   'CCSID',
   'CHAR',
   'CHARACTER',
   'DATE',
   'DOUBLE',
+  'INT',
+  'INTEGER',
   'LONG',
+  'SMALLINT',
   'TIME',
   'TIMESTAMP',
 ];

src/languages/db2i/db2i.keywords.ts

@@ -517,6 +517,7 @@ export const dataTypes: string[] = [
   'DOUBLE',
   'FLOAT',
   'GRAPHIC',
+  'INT',
   'INTEGER',
   'LONG',
   'NUMERIC',

src/languages/mysql/mysql.keywords.ts

@@ -235,8 +235,12 @@ export const dataTypes: string[] = [
   'BIGINT', // (R)
   'BINARY', // (R)
   'BLOB', // (R)
+  'BOOL', // (R)
+  'BOOLEAN', // (R)
   'CHAR', // (R)
   'CHARACTER', // (R)
+  'DATE', // (R)
+  'DATETIME', // (R)
   'DEC', // (R)
   'DECIMAL', // (R)
   'DOUBLE', // (R)
@@ -260,6 +264,7 @@ export const dataTypes: string[] = [
   'PRECISION', // (R)
   'REAL', // (R)
   'SMALLINT', // (R)
+  'TIMESTAMP', // (R)
   'TINYBLOB', // (R)
   'TINYINT', // (R)
   'TINYTEXT', // (R)

src/languages/redshift/redshift.keywords.ts

@@ -201,6 +201,13 @@ export const keywords: string[] = [
 export const dataTypes: string[] = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_Character_types.html#r_Character_types-text-and-bpchar-types
   'ARRAY',
+  'BIGINT',
   'BPCHAR',
+  'INT',
+  'INT2',
+  'INT4',
+  'INT8',
+  'INTEGER',
+  'SMALLINT',
   'TEXT',
 ];

src/lexer/disambiguateTokens.ts

@@ -35,7 +35,39 @@ const funcNameToKeyword = (token: Token, i: number, tokens: Token[]): Token => {
   if (token.type === TokenType.RESERVED_FUNCTION_NAME) {
     const nextToken = nextNonCommentToken(tokens, i);
     if (!nextToken || !isOpenParen(nextToken)) {
-      return { ...token, type: TokenType.RESERVED_KEYWORD };
+      return {
+        ...token,
+        type:
+          // Function names which are also data types
+          [
+            'BIGINT',
+            'BINARY',
+            'BIT',
+            'BLOB',
+            'BOOLEAN',
+            'CHAR',
+            'DATE',
+            'DECIMAL',
+            'DOUBLE',
+            'FLOAT',
+            'INT',
+            'INTEGER',
+            'JSON',
+            'NCHAR',
+            'NUMBER',
+            'NVARCHAR',
+            'REAL',
+            'SMALLINT',
+            'TEXT',
+            'TIME',
+            'TIMESTAMP',
+            'TINYINT',
+            'VARCHAR',
+            'XML',
+          ].includes(token.text)
+            ? TokenType.RESERVED_DATA_TYPE
+            : TokenType.RESERVED_KEYWORD,
+      };
     }
   }
   return token;

test/behavesLikeMariaDbFormatter.ts

@@ -163,7 +163,10 @@ export default function behavesLikeMariaDbFormatter(format: FormatFn) {
         `create table account (id int comment 'the most important column');
         select * from mysql.user;
         insert into user (id, name) values (1, 'Blah');`,
-        { keywordCase: 'upper' }
+        {
+          keywordCase: 'upper',
+          dataTypeCase: 'upper',
+        }
       )
     ).toBe(dedent`
       CREATE TABLE

test/behavesLikeSqlFormatter.ts

@@ -16,6 +16,7 @@ import supportsNewlineBeforeSemicolon from './options/newlineBeforeSemicolon.js'
 import supportsLogicalOperatorNewline from './options/logicalOperatorNewline.js';
 import supportsParamTypes from './options/paramTypes.js';
 import supportsWindowFunctions from './features/windowFunctions.js';
+import supportsFunctionCase from './options/functionCase.js';
 
 /**
  * Core tests for all SQL formatters
@@ -29,6 +30,7 @@ export default function behavesLikeSqlFormatter(format: FormatFn) {
   supportsUseTabs(format);
   supportsKeywordCase(format);
   supportsIdentifierCase(format);
+  supportsFunctionCase(format);
   supportsIndentStyle(format);
   supportsLinesBetweenQueries(format);
   supportsExpressionWidth(format);

test/bigquery.test.ts

@@ -24,6 +24,7 @@ import supportsMergeInto from './features/mergeInto.js';
 import supportsCreateView from './features/createView.js';
 import supportsAlterTable from './features/alterTable.js';
 import supportsIsDistinctFrom from './features/isDistinctFrom.js';
+import supportsDataTypeCase from './options/dataTypeCase.js';
 
 describe('BigQueryFormatter', () => {
   const language = 'bigquery';
@@ -32,7 +33,11 @@ describe('BigQueryFormatter', () => {
   behavesLikeSqlFormatter(format);
   supportsComments(format, { hashComments: true });
   supportsCreateView(format, { orReplace: true, materialized: true, ifNotExists: true });
-  supportsCreateTable(format, { orReplace: true, ifNotExists: true });
+  supportsCreateTable(format, {
+    orReplace: true,
+    ifNotExists: true,
+    dialectDoesntHaveVarchar: true,
+  });
   supportsDropTable(format, { ifExists: true });
   supportsAlterTable(format, {
     addColumn: true,
@@ -60,6 +65,7 @@ describe('BigQueryFormatter', () => {
   supportsParams(format, { positional: true, named: ['@'], quoted: ['@``'] });
   supportsWindow(format);
   supportsLimiting(format, { limit: true, offset: true });
+  supportsDataTypeCase(format);
 
   // Note: BigQuery supports single dashes inside identifiers, so my-ident would be
   // detected as identifier, while other SQL dialects would detect it as

test/db2.test.ts

@@ -11,6 +11,7 @@ import supportsStrings from './features/strings.js';
 import supportsComments from './features/comments.js';
 import supportsOperators from './features/operators.js';
 import supportsLimiting from './features/limiting.js';
+import supportsDataTypeCase from './options/dataTypeCase.js';
 
 describe('Db2Formatter', () => {
   const language = 'db2';
@@ -49,6 +50,7 @@ describe('Db2Formatter', () => {
   ]);
   // Additional U& string type in addition to others shared by all DB2 implementations
   supportsStrings(format, ["U&''"]);
+  supportsDataTypeCase(format);
 
   it('supports non-standard FOR clause', () => {
     expect(format('SELECT * FROM tbl FOR UPDATE OF other_tbl FOR RS USE AND KEEP EXCLUSIVE LOCKS'))

test/db2i.test.ts

@@ -8,6 +8,7 @@ import supportsDropTable from './features/dropTable.js';
 import supportsJoin from './features/join.js';
 import supportsOperators from './features/operators.js';
 import supportsLimiting from './features/limiting.js';
+import supportsDataTypeCase from './options/dataTypeCase.js';
 
 describe('Db2iFormatter', () => {
   const language = 'db2i';
@@ -28,4 +29,5 @@ describe('Db2iFormatter', () => {
     additionally: ['EXCEPTION JOIN', 'LEFT EXCEPTION JOIN', 'RIGHT EXCEPTION JOIN'],
   });
   supportsOperators(format, ['**', '¬=', '¬>', '¬<', '!>', '!<', '||', '=>']);
+  supportsDataTypeCase(format);
 });

test/features/createTable.ts

@@ -7,19 +7,30 @@ interface CreateTableConfig {
   ifNotExists?: boolean;
   columnComment?: boolean;
   tableComment?: boolean;
+  dialectDoesntHaveVarchar?: boolean;
 }
 
-export default function supportsCreateTable(
-  format: FormatFn,
-  { orReplace, ifNotExists, columnComment, tableComment }: CreateTableConfig = {}
-) {
+export default function supportsCreateTable(format: FormatFn, cfg: CreateTableConfig = {}) {
   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);
     `);
   });
 
+  if (!cfg.dialectDoesntHaveVarchar) {
+    it('formats short CREATE TABLE with lowercase data types', () => {
+      expect(
+        format('CREATE TABLE tbl (a INT PRIMARY KEY, b VARCHAR);', {
+          dataTypeCase: 'lower',
+        })
+      ).toBe(dedent`
+      CREATE TABLE
+        tbl (a int PRIMARY KEY, b varchar);
+    `);
+    });
+  }
+
   // The decision to place it to multiple lines is made based on the length of text inside braces
   // ignoring the whitespace. (Which is not quite right :P)
   it('formats long CREATE TABLE', () => {
@@ -36,7 +47,7 @@ export default function supportsCreateTable(
     `);
   });
 
-  if (orReplace) {
+  if (cfg.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
@@ -45,7 +56,7 @@ export default function supportsCreateTable(
     });
   }
 
-  if (ifNotExists) {
+  if (cfg.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
@@ -54,7 +65,7 @@ export default function supportsCreateTable(
     });
   }
 
-  if (columnComment) {
+  if (cfg.columnComment) {
     it('formats short CREATE TABLE with column comments', () => {
       expect(
         format(`CREATE TABLE tbl (a INT COMMENT 'Hello world!', b TEXT COMMENT 'Here we are!');`)
@@ -68,7 +79,7 @@ export default function supportsCreateTable(
     });
   }
 
-  if (tableComment) {
+  if (cfg.tableComment) {
     it('formats short CREATE TABLE with comment', () => {
       expect(format(`CREATE TABLE tbl (a INT, b TEXT) COMMENT = 'Hello, world!';`)).toBe(dedent`
         CREATE TABLE

test/hive.test.ts

@@ -22,6 +22,7 @@ import supportsDeleteFrom from './features/deleteFrom.js';
 import supportsTruncateTable from './features/truncateTable.js';
 import supportsMergeInto from './features/mergeInto.js';
 import supportsCreateView from './features/createView.js';
+import supportsDataTypeCase from './options/dataTypeCase.js';
 
 describe('HiveFormatter', () => {
   const language = 'hive';
@@ -50,6 +51,7 @@ describe('HiveFormatter', () => {
   supportsArrayAndMapAccessors(format);
   supportsWindow(format);
   supportsLimiting(format, { limit: true });
+  supportsDataTypeCase(format);
 
   // eslint-disable-next-line no-template-curly-in-string
   it('recognizes ${hivevar:name} substitution variables', () => {

test/mariadb.test.ts

@@ -14,6 +14,7 @@ import supportsCreateView from './features/createView.js';
 import supportsAlterTable from './features/alterTable.js';
 import supportsStrings from './features/strings.js';
 import supportsConstraints from './features/constraints.js';
+import supportsDataTypeCase from './options/dataTypeCase.js';
 
 describe('MariaDbFormatter', () => {
   const language = 'mariadb';
@@ -52,6 +53,7 @@ describe('MariaDbFormatter', () => {
     renameTo: true,
     renameColumn: true,
   });
+  supportsDataTypeCase(format);
 
   it(`supports @"name" variables`, () => {
     expect(format(`SELECT @"foo fo", @"foo\\"x", @"foo""y" FROM tbl;`)).toBe(dedent`

test/mysql.test.ts

@@ -14,6 +14,7 @@ import supportsCreateView from './features/createView.js';
 import supportsAlterTable from './features/alterTable.js';
 import supportsStrings from './features/strings.js';
 import supportsConstraints from './features/constraints.js';
+import supportsDataTypeCase from './options/dataTypeCase.js';
 
 describe('MySqlFormatter', () => {
   const language = 'mysql';
@@ -54,6 +55,7 @@ describe('MySqlFormatter', () => {
     renameTo: true,
     renameColumn: true,
   });
+  supportsDataTypeCase(format);
 
   it(`supports @"name" variables`, () => {
     expect(format(`SELECT @"foo fo", @"foo\\"x", @"foo""y" FROM tbl;`)).toBe(dedent`

test/options/dataTypeCase.ts

@@ -0,0 +1,67 @@
+import dedent from 'dedent-js';
+
+import { FormatFn } from '../../src/sqlFormatter.js';
+
+export default function supportsDataTypeCase(format: FormatFn) {
+  it('preserves data type keyword case by default', () => {
+    const result = format('CREATE TABLE users ( id iNt PRIMARY KEY )');
+    expect(result).toBe(dedent`
+      CREATE TABLE
+        users (id iNt PRIMARY KEY)
+    `);
+  });
+
+  it('converts data type keyword case to uppercase', () => {
+    const result = format('CREATE TABLE users ( id iNt PRIMARY KEY )', {
+      dataTypeCase: 'upper',
+    });
+    expect(result).toBe(dedent`
+      CREATE TABLE
+        users (id INT PRIMARY KEY)
+    `);
+  });
+
+  it('converts data type keyword case to lowercase', () => {
+    const result = format('CREATE TABLE users ( id iNt PRIMARY KEY )', {
+      dataTypeCase: 'lower',
+    });
+    expect(result).toBe(dedent`
+      CREATE TABLE
+        users (id int PRIMARY KEY)
+    `);
+  });
+
+  it('preserves data type keyword case in cast by default', () => {
+    const result = format('SELECT CAST(quantity AS InT) FROM orders');
+    expect(result).toBe(dedent`
+      SELECT
+        CAST(quantity AS InT)
+      FROM
+        orders
+    `);
+  });
+
+  it('converts data type keyword case in cast to uppercase', () => {
+    const result = format('SELECT CAST(quantity AS InT) FROM orders', {
+      dataTypeCase: 'upper',
+    });
+    expect(result).toBe(dedent`
+      SELECT
+        CAST(quantity AS INT)
+      FROM
+        orders
+    `);
+  });
+
+  it('converts data type keyword case in cast to lowercase', () => {
+    const result = format('SELECT CAST(quantity AS InT) FROM orders', {
+      dataTypeCase: 'lower',
+    });
+    expect(result).toBe(dedent`
+      SELECT
+        CAST(quantity AS int)
+      FROM
+        orders
+    `);
+  });
+}