Move intervals back to keywords

Author: karlhorky

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',

src/languages/sql/sql.keywords.ts

@@ -43,6 +43,7 @@ export const keywords: string[] = [
   'CURSOR',
   'CYCLE',
   'DEALLOCATE',
+  'DAY',
   'DECLARE',
   'DEFAULT',
   'DELETE',
@@ -78,6 +79,7 @@ export const keywords: string[] = [
   'GROUP',
   'HAVING',
   'HOLD',
+  'HOUR',
   'IDENTITY',
   'IN',
   'INDICATOR',
@@ -100,8 +102,10 @@ export const keywords: string[] = [
   'MEMBER',
   'MERGE',
   'METHOD',
+  'MINUTE',
   'MODIFIES',
   'MODULE',
+  'MONTH',
   'NATURAL',
   'NEW',
   'NO',
@@ -189,6 +193,7 @@ export const keywords: string[] = [
   'WINDOW',
   'WITHIN',
   'WITHOUT',
+  'YEAR',
 ];
 
 export const dataTypes: string[] = [
@@ -202,17 +207,13 @@ export const dataTypes: string[] = [
   'CHARACTER',
   'CLOB',
   'DATE',
-  'DAY',
   'DEC',
   'DECIMAL',
   'DOUBLE',
   'FLOAT',
-  'HOUR',
   'INT',
   'INTEGER',
   'INTERVAL',
-  'MINUTE',
-  'MONTH',
   'MULTISET',
   'NATIONAL',
   'NCHAR',
@@ -224,5 +225,4 @@ export const dataTypes: string[] = [
   'VARBINARY',
   'VARCHAR',
   'VARYING',
-  'YEAR',
 ];