Merge branch 'separate-data-types' of github.com:karlhorky/sql-formatter into add-datatypeformat-option

Author: karlhorky

src/languages/bigquery/bigquery.keywords.ts

@@ -45,13 +45,11 @@ export const keywords: string[] = [
   'IN',
   'INNER',
   'INTERSECT',
-  'INTERVAL',
   'INTO',
   'IS',
   'JOIN',
   'LATERAL',
   'LEFT',
-  'LIKE',
   'LIMIT',
   'LOOKUP',
   'MERGE',
@@ -94,6 +92,22 @@ export const keywords: string[] = [
   'WINDOW',
   'WITH',
   'WITHIN',
+
+  // misc
+  'SAFE',
+
+  // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
+  'LIKE', // CREATE TABLE LIKE
+  'COPY', // CREATE TABLE COPY
+  'CLONE', // CREATE TABLE CLONE
+  'IN',
+  'OUT',
+  'INOUT',
+  'RETURNS',
+  'LANGUAGE',
+  'CASCADE',
+  'RESTRICT',
+  'DETERMINISTIC',
 ];
 
 export const dataTypes: string[] = [
@@ -128,20 +142,4 @@ export const dataTypes: string[] = [
   'ASCII',
   'UTF-8',
   'UTF8',
-
-  // misc
-  'SAFE',
-
-  // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
-  'LIKE', // CREATE TABLE LIKE
-  'COPY', // CREATE TABLE COPY
-  'CLONE', // CREATE TABLE CLONE
-  'IN',
-  'OUT',
-  'INOUT',
-  'RETURNS',
-  'LANGUAGE',
-  'CASCADE',
-  'RESTRICT',
-  'DETERMINISTIC',
 ];

src/languages/db2/db2.formatter.ts

@@ -1,7 +1,7 @@
 import { DialectOptions } from '../../dialect.js';
 import { expandPhrases } from '../../expandPhrases.js';
 import { functions } from './db2.functions.js';
-import { keywords } from './db2.keywords.js';
+import { dataTypes, keywords } from './db2.keywords.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT]']);
 
@@ -265,7 +265,9 @@ export const db2: DialectOptions = {
     reservedSetOperations,
     reservedJoins,
     reservedPhrases,
-    reservedKeywords: keywords,
+    reservedKeywords:
+      // Temporary, will be replaced by reservedDataTypes
+      [...new Set(keywords.concat(dataTypes))],
     reservedFunctionNames: functions,
     extraParens: ['[]'],
     stringTypes: [

src/languages/db2/db2.keywords.ts

@@ -34,9 +34,6 @@ export const keywords: string[] = [
   'CASCADED',
   'CASE',
   'CAST',
-  'CCSID',
-  'CHAR',
-  'CHARACTER',
   'CHECK',
   'CLONE',
   'CLOSE',
@@ -73,7 +70,6 @@ export const keywords: string[] = [
   'DATABASE',
   'DATAPARTITIONNAME',
   'DATAPARTITIONNUM',
-  'DATE',
   'DAY',
   'DAYS',
   'DB2GENERAL',
@@ -100,7 +96,6 @@ export const keywords: string[] = [
   'DISTINCT',
   'DO',
   'DOCUMENT',
-  'DOUBLE',
   'DROP',
   'DSSIZE',
   'DYNAMIC',
@@ -208,7 +203,6 @@ export const keywords: string[] = [
   'LOCK',
   'LOCKMAX',
   'LOCKSIZE',
-  'LONG',
   'LOOP',
   'MAINTAINED',
   'MATERIALIZED',
@@ -368,8 +362,6 @@ export const keywords: string[] = [
   'TABLE',
   'TABLESPACE',
   'THEN',
-  'TIME',
-  'TIMESTAMP',
   'TO',
   'TRANSACTION',
   'TRIGGER',
@@ -408,3 +400,15 @@ export const keywords: string[] = [
   'YEAR',
   'YEARS',
 ];
+
+export const dataTypes: string[] = [
+  // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
+  'CCSID',
+  'CHAR',
+  'CHARACTER',
+  'DATE',
+  'DOUBLE',
+  'LONG',
+  'TIME',
+  'TIMESTAMP',
+];

src/languages/postgresql/postgresql.keywords.ts

@@ -1,4 +1,4 @@
-export const keywords = [
+export const keywords: string[] = [
   // https://www.postgresql.org/docs/14/sql-keywords-appendix.html
   'ABORT',
   'ABSOLUTE',

src/languages/singlestoredb/singlestoredb.formatter.ts

@@ -1,7 +1,7 @@
 import { DialectOptions } from '../../dialect.js';
 import { expandPhrases } from '../../expandPhrases.js';
 import { postProcess } from '../mariadb/likeMariaDb.js';
-import { keywords } from './singlestoredb.keywords.js';
+import { dataTypes, keywords } from './singlestoredb.keywords.js';
 import { functions } from './singlestoredb.functions.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT | DISTINCTROW]']);
@@ -240,7 +240,9 @@ export const singlestoredb: DialectOptions = {
     reservedSetOperations,
     reservedJoins,
     reservedPhrases,
-    reservedKeywords: keywords,
+    reservedKeywords:
+      // Temporary, will be replaced by reservedDataTypes
+      [...new Set(keywords.concat(dataTypes))],
     reservedFunctionNames: functions,
     // TODO: support _binary"some string" prefix
     stringTypes: [

src/languages/singlestoredb/singlestoredb.keywords.ts

@@ -14,18 +14,13 @@ export const keywords: string[] = [
   'ASENSITIVE',
   'BEFORE',
   'BETWEEN',
-  'BIGINT',
-  'BINARY',
   '_BINARY',
-  'BLOB',
   'BOTH',
   'BY',
   'CALL',
   'CASCADE',
   'CASE',
   'CHANGE',
-  'CHAR',
-  'CHARACTER',
   'CHECK',
   'COLLATE',
   'COLUMN',
@@ -46,8 +41,6 @@ export const keywords: string[] = [
   'DAY_MICROSECOND',
   'DAY_MINUTE',
   'DAY_SECOND',
-  'DEC',
-  'DECIMAL',
   'DECLARE',
   'DEFAULT',
   'DELAYED',
@@ -58,7 +51,6 @@ export const keywords: string[] = [
   'DISTINCT',
   'DISTINCTROW',
   'DIV',
-  'DOUBLE',
   'DROP',
   'DUAL',
   'EACH',
@@ -73,9 +65,6 @@ export const keywords: string[] = [
   'EXTRA_JOIN',
   'FALSE',
   'FETCH',
-  'FLOAT',
-  'FLOAT4',
-  'FLOAT8',
   'FOR',
   'FORCE',
   'FORCE_COMPILED_MODE',
@@ -102,13 +91,6 @@ export const keywords: string[] = [
   'INSENSITIVE',
   'INSERT',
   'IN',
-  'INT',
-  'INT1',
-  'INT2',
-  'INT3',
-  'INT4',
-  'INT8',
-  'INTEGER',
   '_INTERNAL_DYNAMIC_TYPECAST',
   'INTERSECT',
   'INTERVAL',
@@ -128,17 +110,10 @@ export const keywords: string[] = [
   'LOCALTIME',
   'LOCALTIMESTAMP',
   'LOCK',
-  'LONG',
-  'LONGBLOB',
-  'LONGTEXT',
   'LOOP',
   'LOW_PRIORITY',
   'MATCH',
   'MAXVALUE',
-  'MEDIUMBLOB',
-  'MEDIUMINT',
-  'MEDIUMTEXT',
-  'MIDDLEINT',
   'MINUS',
   'MINUTE_MICROSECOND',
   'MINUTE_SECOND',
@@ -150,7 +125,6 @@ export const keywords: string[] = [
   'NO_WRITE_TO_BINLOG',
   'NO_QUERY_REWRITE',
   'NULL',
-  'NUMERIC',
   'ON',
   'OPTIMIZE',
   'OPTION',
@@ -161,14 +135,12 @@ export const keywords: string[] = [
   'OUTER',
   'OUTFILE',
   'OVER',
-  'PRECISION',
   'PRIMARY',
   'PROCEDURE',
   'PURGE',
   'RANGE',
   'READ',
   'READS',
-  'REAL',
   'REFERENCES',
   'REGEXP',
   'RELEASE',
@@ -194,7 +166,6 @@ export const keywords: string[] = [
   'SET',
   'SHOW',
   'SIGNAL',
-  'SMALLINT',
   'SPATIAL',
   'SPECIFIC',
   'SQL',
@@ -212,9 +183,6 @@ export const keywords: string[] = [
   'TABLE',
   'TERMINATED',
   'THEN',
-  'TINYBLOB',
-  'TINYINT',
-  'TINYTEXT',
   'TO',
   'TRAILING',
   'TRIGGER',
@@ -224,7 +192,6 @@ export const keywords: string[] = [
   'UNION',
   'UNIQUE',
   'UNLOCK',
-  'UNSIGNED',
   'UPDATE',
   'USAGE',
   'USE',
@@ -234,10 +201,6 @@ export const keywords: string[] = [
   'UTC_TIMESTAMP',
   '_UTF8',
   'VALUES',
-  'VARBINARY',
-  'VARCHAR',
-  'VARCHARACTER',
-  'VARYING',
   'WHEN',
   'WHERE',
   'WHILE',
@@ -249,3 +212,44 @@ export const keywords: string[] = [
   'YEAR_MONTH',
   'ZEROFILL',
 ];
+
+export const dataTypes: string[] = [
+  // https://docs.singlestore.com/cloud/reference/sql-reference/data-types/
+  'BIGINT',
+  'BINARY',
+  'BLOB',
+  'CHAR',
+  'CHARACTER',
+  'DEC',
+  'DECIMAL',
+  'DOUBLE',
+  'FLOAT',
+  'FLOAT4',
+  'FLOAT8',
+  'INT',
+  'INT1',
+  'INT2',
+  'INT3',
+  'INT4',
+  'INT8',
+  'INTEGER',
+  'LONG',
+  'LONGBLOB',
+  'LONGTEXT',
+  'MEDIUMBLOB',
+  'MEDIUMINT',
+  'MEDIUMTEXT',
+  'MIDDLEINT',
+  'NUMERIC',
+  'PRECISION',
+  'REAL',
+  'SMALLINT',
+  'TINYBLOB',
+  'TINYINT',
+  'TINYTEXT',
+  'UNSIGNED',
+  'VARBINARY',
+  'VARCHAR',
+  'VARCHARACTER',
+  'VARYING',
+];

src/languages/spark/spark.keywords.ts

@@ -50,6 +50,7 @@ export const keywords: string[] = [
   'DATA',
   'DATABASE',
   'DATABASES',
+  'DAY',
   'DBPROPERTIES',
   'DEFINED',
   'DELETE',
@@ -91,6 +92,7 @@ export const keywords: string[] = [
   'GRANT',
   'GROUP',
   'GROUPING',
+  'HOUR',
   'IF',
   'IGNORE',
   'IMPORT',
@@ -122,6 +124,8 @@ export const keywords: string[] = [
   'MACRO',
   'MATCHED',
   'MERGE',
+  'MINUTE',
+  'MONTH',
   'MSCK',
   'NAMESPACE',
   'NAMESPACES',
@@ -177,6 +181,7 @@ export const keywords: string[] = [
   'ROW',
   'ROWS',
   'SCHEMA',
+  'SECOND',
   'SELECT',
   'SEMI',
   'SEPARATED',
@@ -221,6 +226,7 @@ export const keywords: string[] = [
   'USING',
   'VIEW',
   'WINDOW',
+  'YEAR',
   // other
   'ANALYSE',
   'ARRAY_ZIP',
@@ -285,12 +291,6 @@ export const dataTypes: string[] = [
   'DEC',
   'NUMERIC',
   'INTERVAL',
-  'YEAR',
-  'MONTH',
-  'DAY',
-  'HOUR',
-  'MINUTE',
-  'SECOND',
   'ARRAY',
   'STRUCT',
   'MAP',