Make sure all (MySQL intersect MariaDB) keywords are present

Author: mvorisek

src/Tokenizer.php

@@ -41,18 +41,26 @@ final class Tokenizer
         'AND',
         'AS',
         'ASC',
+        'ASENSITIVE',
         'AUTO_INCREMENT',
         'AUTOCOMMIT',
         'BACKUP',
+        'BEFORE',
         'BEGIN',
         'BETWEEN',
+        'BIGINT',
+        'BINARY',
         'BINLOG',
+        'BLOB',
         'BOTH',
         'BY',
+        'CALL',
         'CASCADE',
         'CASE',
         'CHANGE',
         'CHANGED',
+        'CHAR',
+        'CHARACTER',
         'CHARSET',
         'CHECK',
         'CHECKSUM',
@@ -65,19 +73,29 @@ final class Tokenizer
         'COMMITTED',
         'COMPRESSED',
         'CONCURRENT',
+        'CONDITION',
         'CONSTRAINT',
         'CONTAINS',
+        'CONTINUE',
         'CONVERT',
         'CREATE',
         'CROSS',
         'CURRENT',
+        'CURRENT_DATE',
+        'CURRENT_TIME',
         'CURRENT_TIMESTAMP',
+        'CURRENT_USER',
+        'CURSOR',
         'DATABASE',
         'DATABASES',
         'DAY',
         'DAY_HOUR',
+        'DAY_MICROSECOND',
         'DAY_MINUTE',
         'DAY_SECOND',
+        'DEC',
+        'DECIMAL',
+        'DECLARE',
         'DEFAULT',
         'DEFINER',
         'DELAYED',
@@ -89,11 +107,15 @@ final class Tokenizer
         'DISTINCTROW',
         'DIV',
         'DO',
+        'DOUBLE',
         'DROP',
+        'DUAL',
         'DUMPFILE',
         'DUPLICATE',
         'DYNAMIC',
+        'EACH',
         'ELSE',
+        'ELSEIF',
         'ENCLOSED',
         'END',
         'ENGINE',
@@ -107,14 +129,20 @@ final class Tokenizer
         'EXEC',
         'EXECUTE',
         'EXISTS',
+        'EXIT',
         'EXPLAIN',
         'EXTENDED',
+        'FALSE',
         'FAST',
+        'FETCH',
         'FIELDS',
         'FILE',
         'FILTER',
         'FIRST',
         'FIXED',
+        'FLOAT',
+        'FLOAT4',
+        'FLOAT8',
         'FLUSH',
         'FOLLOWING',
         'FOR',
@@ -134,6 +162,7 @@ final class Tokenizer
         'HIGH_PRIORITY',
         'HOSTS',
         'HOUR',
+        'HOUR_MICROSECOND',
         'HOUR_MINUTE',
         'HOUR_SECOND',
         'IDENTIFIED',
@@ -145,21 +174,32 @@ final class Tokenizer
         'INDEXES',
         'INFILE',
         'INNER',
+        'INOUT',
+        'INSENSITIVE',
         'INSERT',
         'INSERT_ID',
         'INSERT_METHOD',
+        'INT',
+        'INT1',
+        'INT2',
+        'INT3',
+        'INT4',
+        'INT8',
+        'INTEGER',
         'INTERSECT',
         'INTERVAL',
         'INTO',
         'INVOKER',
         'IS',
         'ISOLATION',
+        'ITERATE',
         'JOIN',
         'KEY',
         'KEYS',
         'KILL',
         'LAST_INSERT_ID',
         'LEADING',
+        'LEAVE',
         'LEFT',
         'LEVEL',
         'LIKE',
@@ -168,9 +208,15 @@ final class Tokenizer
         'LINES',
         'LOAD',
         'LOCAL',
+        'LOCALTIME',
+        'LOCALTIMESTAMP',
         'LOCK',
         'LOCKS',
         'LOGS',
+        'LONG',
+        'LONGBLOB',
+        'LONGTEXT',
+        'LOOP',
         'LOW_PRIORITY',
         'MARIA',
         'MASTER',
@@ -183,20 +229,30 @@ final class Tokenizer
         'MAX_ROWS',
         'MAX_UPDATES_PER_HOUR',
         'MAX_USER_CONNECTIONS',
+        'MAXVALUE',
         'MEDIUM',
+        'MEDIUMBLOB',
+        'MEDIUMINT',
+        'MEDIUMTEXT',
         'MERGE',
+        'MIDDLEINT',
         'MIN_ROWS',
         'MINUTE',
+        'MINUTE_MICROSECOND',
         'MINUTE_SECOND',
+        'MOD',
         'MODE',
+        'MODIFIES',
         'MODIFY',
         'MONTH',
         'MRG_MYISAM',
         'MYISAM',
         'NAMES',
         'NATURAL',
+        'NO_WRITE_TO_BINLOG',
         'NOT',
         'NULL',
+        'NUMERIC',
         'OFFSET',
         'ON',
         'OPEN',
@@ -205,6 +261,7 @@ final class Tokenizer
         'OPTIONALLY',
         'OR',
         'ORDER',
+        'OUT',
         'OUTER',
         'OUTFILE',
         'OVER',
@@ -215,6 +272,7 @@ final class Tokenizer
         'PARTITIONS',
         'PASSWORD',
         'PRECEDING',
+        'PRECISION',
         'PRIMARY',
         'PRIVILEGES',
         'PROCEDURE',
@@ -230,16 +288,22 @@ final class Tokenizer
         'READ',
         'READ_ONLY',
         'READ_WRITE',
+        'READS',
+        'REAL',
         'RECURSIVE',
         'REFERENCES',
         'REGEXP',
+        'RELEASE',
         'RELOAD',
         'RENAME',
         'REPAIR',
+        'REPEAT',
         'REPEATABLE',
         'REPLACE',
         'REPLICATION',
+        'REQUIRE',
         'RESET',
+        'RESIGNAL',
         'RESTORE',
         'RESTRICT',
         'RETURN',
@@ -250,20 +314,29 @@ final class Tokenizer
         'ROLLBACK',
         'ROW',
         'ROW_FORMAT',
+        'ROW_NUMBER',
         'ROWS',
+        'SCHEMA',
+        'SCHEMAS',
         'SECOND',
+        'SECOND_MICROSECOND',
         'SECURITY',
         'SELECT',
+        'SENSITIVE',
         'SEPARATOR',
         'SERIALIZABLE',
         'SESSION',
         'SET',
         'SHARE',
         'SHOW',
         'SHUTDOWN',
+        'SIGNAL',
         'SLAVE',
+        'SMALLINT',
         'SONAME',
         'SOUNDS',
+        'SPATIAL',
+        'SPECIFIC',
         'SQL',
         'SQL_AUTO_IS_NULL',
         'SQL_BIG_RESULT',
@@ -284,6 +357,10 @@ final class Tokenizer
         'SQL_SLAVE_SKIP_COUNTER',
         'SQL_SMALL_RESULT',
         'SQL_WARNINGS',
+        'SQLEXCEPTION',
+        'SQLSTATE',
+        'SQLWARNING',
+        'SSL',
         'START',
         'STARTING',
         'STATUS',
@@ -299,15 +376,20 @@ final class Tokenizer
         'TERMINATED',
         'THEN',
         'TIES',
+        'TINYBLOB',
+        'TINYINT',
+        'TINYTEXT',
         'TO',
         'TRAILING',
         'TRANSACTIONAL',
+        'TRIGGER',
         'TRUE',
         'TRUNCATE',
         'TYPE',
         'TYPES',
         'UNBOUNDED',
         'UNCOMMITTED',
+        'UNDO',
         'UNION',
         'UNIQUE',
         'UNLOCK',
@@ -316,17 +398,26 @@ final class Tokenizer
         'USAGE',
         'USE',
         'USING',
+        'UTC_DATE',
+        'UTC_TIME',
+        'UTC_TIMESTAMP',
         'VALUES',
+        'VARBINARY',
+        'VARCHAR',
+        'VARCHARACTER',
         'VARIABLES',
+        'VARYING',
         'VIEW',
         'WHEN',
         'WHERE',
+        'WHILE',
         'WINDOW',
         'WITH',
         'WORK',
         'WRITE',
         'XOR',
         'YEAR_MONTH',
+        'ZEROFILL',
     ];
 
     /**

tests/SqlFormatterTest.php

@@ -67,7 +67,7 @@ public function testHighlightBinary(): void
         $html = '<pre style="color: black; background-color: white;">' .
             '<span style="font-weight:bold;">SELECT</span> <span style="color: blue;">' .
             $binaryData .
-            '</span> <span style="font-weight:bold;">AS</span> <span style="color: #333;">BINARY</span></pre>';
+            '</span> <span style="font-weight:bold;">AS</span> <span style="font-weight:bold;">BINARY</span></pre>';
 
         $this->assertSame($html, $this->formatter->highlight($sql));
     }