From 30f92d1ce6cfd048d96f7387157a7a0d921d60e0 Mon Sep 17 00:00:00 2001 From: Can Abacigil Date: Mon, 2 Oct 2017 17:18:22 +0300 Subject: [PATCH] mysql sql language support --- src/mysql.ts | 20 ++++---------------- test/mysql.test.ts | 43 ++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 39 deletions(-) diff --git a/src/mysql.ts b/src/mysql.ts index 94f87bad..c1485d24 100644 --- a/src/mysql.ts +++ b/src/mysql.ts @@ -62,9 +62,9 @@ export const language = { "FLOAT8", "FLUSH", "FOLLOWS", "FOR", "FORCE", "FOREIGN", "FORMAT", "FOUND", "FROM", "FULL", "FULLTEXT", "FUNCTION", "GENERAL", "GENERATED", "GEOMETRY", "GEOMETRYCOLLECTION", "GET", "GET_FORMAT", "GLOBAL", "GRANT", "GRANTS", "GROUP", "GROUP_REPLICATION", "HANDLER", "HASH", "HAVING", "HELP", "HIGH_PRIORITY", "HOST", "HOSTS", "HOUR", "HOUR_MICROSECOND", "HOUR_MINUTE", "HOUR_SECOND", "IDENTIFIED", "IF", "IGNORE", "IGNORE_SERVER_IDS", - "IMPORT", "IN", "INDEX", "INDEXES", "INFILE", "INITIAL_SIZE", "INNER", "INOUT", "INSENSITIVE", "INSERT", "INSERT_METHOD", "INSTALL", "INSTANCE", + "IMPORT", "INDEX", "INDEXES", "INFILE", "INITIAL_SIZE", "INNER", "INOUT", "INSENSITIVE", "INSERT", "INSERT_METHOD", "INSTALL", "INSTANCE", "INT", "INT1", "INT2", "INT3", "INT4", "INT8", "INTEGER", "INTERVAL", "INTO", "INVOKER", "IO", "IO_AFTER_GTIDS", "IO_BEFORE_GTIDS", "IO_THREAD", - "IPC", "IS", "ISOLATION", "ISSUER", "ITERATE", "JOIN", "JSON", "KEY", "KEYS", "KEY_BLOCK_SIZE", "KILL", "LANGUAGE", "LAST", "LEADING", "LEAVE", + "IPC", "ISOLATION", "ISSUER", "ITERATE", "JOIN", "JSON", "KEY", "KEYS", "KEY_BLOCK_SIZE", "KILL", "LANGUAGE", "LAST", "LEADING", "LEAVE", "LEAVES", "LEFT", "LESS", "LEVEL", "LIKE", "LIMIT", "LINEAR", "LINES", "LINESTRING", "LIST", "LOAD", "LOCAL", "LOCALTIME", "LOCALTIMESTAMP", "LOCK", "LOCKS", "LOGFILE", "LOGS", "LONG", "LONGBLOB", "LONGTEXT", "LOOP", "LOW_PRIORITY", "MASTER", "MASTER_AUTO_POSITION", "MASTER_BIND", "MASTER_CONNECT_RETRY", "MASTER_DELAY", "MASTER_HEARTBEAT_PERIOD", "MASTER_HOST", "MASTER_LOG_FILE", "MASTER_LOG_POS", "MASTER_PASSWORD", "MASTER_PORT", "MASTER_RETRY_COUNT", @@ -73,7 +73,7 @@ export const language = { "MAX_ROWS", "MAX_SIZE", "MAX_STATEMENT_TIME", "MAX_UPDATES_PER_HOUR", "MAX_USER_CONNECTIONS", "MEDIUM", "MEDIUMBLOB", "MEDIUMINT", "MEDIUMTEXT", "MEMORY", "MERGE", "MESSAGE_TEXT", "MICROSECOND", "MIDDLEINT", "MIGRATE", "MINUTE", "MINUTE_MICROSECOND", "MINUTE_SECOND", "MIN_ROWS", "MOD", "MODE", "MODIFIES", "MODIFY", "MONTH", "MULTILINESTRING", "MULTIPOINT", "MULTIPOLYGON", "MUTEX", "MYSQL_ERRNO", "NAME", "NAMES", "NATIONAL", "NATURAL", "NCHAR", "NDB", - "NDBCLUSTER", "NEVER", "NEW", "NEXT", "NO", "NODEGROUP", "NONBLOCKING", "NONE", "NOT", "NO_WAIT", "NO_WRITE_TO_BINLOG", "NULL", "NUMBER", "NUMERIC", + "NDBCLUSTER", "NEVER", "NEW", "NEXT", "NO", "NODEGROUP", "NONBLOCKING", "NONE", "NO_WAIT", "NO_WRITE_TO_BINLOG", "NUMBER", "NUMERIC", "NVARCHAR", "OFFSET", "OLD_PASSWORD", "ON", "ONE", "ONLY", "OPEN", "OPTIMIZE", "OPTIMIZER_COSTS", "OPTION", "OPTIONALLY", "OPTIONS", "OR", "ORDER", "OUT", "OUTER", "OUTFILE", "OWNER", "PACK_KEYS", "PAGE", "PARSER", "PARSE_GCOL_EXPR", "PARTIAL", "PARTITION", "PARTITIONING", "PARTITIONS", "PASSWORD", "PHASE", "PLUGIN", "PLUGINS", "PLUGIN_DIR", "POINT", "POLYGON", "PORT", "PRECEDES", "PRECISION", "PREPARE", "PRESERVE", "PREV", "PRIMARY", "PRIVILEGES", @@ -112,7 +112,7 @@ export const language = { "EXP", "EXPORT_SET", "ExteriorRing", "EXTRACT", "ExtractValue", "FIELD", "FIND_IN_SET", "FLOOR", "FORMAT", "FOUND_ROWS", "FROM_BASE64", "FROM_DAYS", "FROM_UNIXTIME", "GeomCollFromText", "GeometryCollectionFromText", "GeomCollFromWKB", "GeometryCollectionFromWKB", "GeometryCollection", "GeometryN", "GeometryType", "GeomFromText", "GeometryFromText", "GeomFromWKB", "GeometryFromWKB", "GET_FORMAT", - "GET_LOCK", "GLength", "GREATEST", "GROUP_CONCAT", "GTID_SUBSET", "GTID_SUBTRACT", "HEX", "HOUR", "IF", "IFNULL", "IN", "INET_ATON", + "GET_LOCK", "GLength", "GREATEST", "GROUP_CONCAT", "GTID_SUBSET", "GTID_SUBTRACT", "HEX", "HOUR", "IF", "IFNULL", "INET_ATON", "INET_NTOA", "INET6_ATON", "INET6_NTOA", "INSERT", "INSTR", "InteriorRingN", "Intersects", "INTERVAL", "IS_FREE_LOCK", "IS_IPV4", "IS_IPV4_COMPAT", "IS_IPV4_MAPPED", "IS_IPV6", "IS_USED_LOCK", "IsClosed", "IsEmpty", "ISNULL", "IsSimple", "JSON_APPEND", "JSON_ARRAY", "JSON_ARRAY_APPEND", "JSON_ARRAY_INSERT", "JSON_CONTAINS", "JSON_CONTAINS_PATH", "JSON_DEPTH", "JSON_EXTRACT", "JSON_INSERT", "JSON_KEYS", @@ -150,14 +150,10 @@ export const language = { builtinVariables: [ // NOT SUPPORTED ], - pseudoColumns: [ - // NOT SUPPORTED - ], tokenizer: { root: [ { include: '@comments' }, { include: '@whitespace' }, - { include: '@pseudoColumns' }, { include: '@numbers' }, { include: '@strings' }, { include: '@complexIdentifiers' }, @@ -191,14 +187,6 @@ export const language = { [/\*\//, { token: 'comment.quote', next: '@pop' }], [/./, 'comment'] ], - pseudoColumns: [ - [/[$][A-Za-z_][\w@#$]*/, { - cases: { - '@pseudoColumns': 'predefined', - '@default': 'identifier' - } - }], - ], numbers: [ [/0[xX][0-9a-fA-F]*/, 'number'], [/[$][+-]*\d*(\.\d*)?/, 'number'], diff --git a/test/mysql.test.ts b/test/mysql.test.ts index b832ff18..0faf6c30 100644 --- a/test/mysql.test.ts +++ b/test/mysql.test.ts @@ -513,22 +513,22 @@ testTokenization('mysql', [ }], [{ - line: 'WHERE x IS NOT NULL', + line: 'WHERE myfield IS NOT NULL', tokens: [ { startIndex: 0, type: 'keyword.sql' }, { startIndex: 5, type: 'white.sql' }, { startIndex: 6, type: 'identifier.sql' }, - { startIndex: 7, type: 'white.sql' }, - { startIndex: 8, type: 'operator.sql' }, - { startIndex: 10, type: 'white.sql' }, - { startIndex: 11, type: 'operator.sql' }, - { startIndex: 14, type: 'white.sql' }, - { startIndex: 15, type: 'operator.sql' } + { startIndex: 13, type: 'white.sql' }, + { startIndex: 14, type: 'operator.sql' }, + { startIndex: 16, type: 'white.sql' }, + { startIndex: 17, type: 'operator.sql' }, + { startIndex: 20, type: 'white.sql' }, + { startIndex: 21, type: 'operator.sql' } ] }], [{ - line: 'SELECT * FROM MyTable WHERE MyColumn IN (1,2)', + line: 'SELECT * FROM tbl WHERE MyColumn IN (1,2)', tokens: [ { startIndex: 0, type: 'keyword.sql' }, { startIndex: 6, type: 'white.sql' }, @@ -537,21 +537,18 @@ testTokenization('mysql', [ { startIndex: 9, type: 'keyword.sql' }, { startIndex: 13, type: 'white.sql' }, { startIndex: 14, type: 'identifier.sql' }, - { startIndex: 17, type: 'delimiter.sql' }, - { startIndex: 18, type: 'identifier.sql' }, - { startIndex: 25, type: 'white.sql' }, - { startIndex: 26, type: 'keyword.sql' }, - { startIndex: 31, type: 'white.sql' }, - { startIndex: 32, type: 'identifier.sql' }, - { startIndex: 40, type: 'white.sql' }, - { startIndex: 41, type: 'operator.sql' }, - { startIndex: 43, type: 'white.sql' }, - { startIndex: 44, type: 'delimiter.parenthesis.sql' }, - { startIndex: 45, type: 'number.sql' }, - { startIndex: 46, type: 'delimiter.sql' }, - { startIndex: 47, type: 'number.sql' }, - { startIndex: 48, type: 'delimiter.parenthesis.sql' } + { startIndex: 17, type: 'white.sql' }, + { startIndex: 18, type: 'keyword.sql' }, + { startIndex: 23, type: 'white.sql' }, + { startIndex: 24, type: 'identifier.sql' }, + { startIndex: 32, type: 'white.sql' }, + { startIndex: 33, type: 'operator.sql' }, + { startIndex: 35, type: 'white.sql' }, + { startIndex: 36, type: 'delimiter.parenthesis.sql' }, + { startIndex: 37, type: 'number.sql' }, + { startIndex: 38, type: 'delimiter.sql' }, + { startIndex: 39, type: 'number.sql' }, + { startIndex: 40, type: 'delimiter.parenthesis.sql' } ] }] - ]);