From 5bbc1eb01c2b5cec2034b02833d84cc79b1d11d5 Mon Sep 17 00:00:00 2001 From: Can Abacigil Date: Mon, 2 Oct 2017 17:32:21 +0300 Subject: [PATCH] redshift tests done --- src/monaco.contribution.ts | 7 + src/redshift.ts | 17 +- test/all.js | 3 +- test/redshift.test.ts | 555 +++++++++++++++++++++++++++++++++++++ 4 files changed, 569 insertions(+), 13 deletions(-) create mode 100644 test/redshift.test.ts diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts index 89ab6db2..70a37a23 100644 --- a/src/monaco.contribution.ts +++ b/src/monaco.contribution.ts @@ -286,3 +286,10 @@ registerLanguage({ aliases: ['PostgreSQL', 'postgres', 'pg', 'postgre'], module: './pgsql' }); + +registerLanguage({ + id: 'redshift', + extensions: ['.sql'], + aliases: ['Redshift', 'redshift'], + module: './redshift' +}); diff --git a/src/redshift.ts b/src/redshift.ts index fb878f8d..9fb3dc98 100644 --- a/src/redshift.ts +++ b/src/redshift.ts @@ -43,7 +43,6 @@ export const language = { { open: '[', close: ']', token: 'delimiter.square' }, { open: '(', close: ')', token: 'delimiter.parenthesis' } ], - keywords: [ "AES128", "AES256", "ALL", "ALLOWOVERWRITE", "ANALYSE", "ANALYZE", "AND", "ANY", "ARRAY", "AS", "ASC", "AUTHORIZATION", "BACKUP", "BETWEEN", "BINARY", "BLANKSASNULL", "BOTH", "BYTEDICT", "BZIP2", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN", @@ -169,7 +168,6 @@ export const language = { ], comments: [ [/--+.*/, 'comment'], - [/#+.*/, 'comment'], [/\/\*/, { token: 'comment.quote', next: '@comment' }] ], comment: [ @@ -195,24 +193,19 @@ export const language = { ], strings: [ [/'/, { token: 'string', next: '@string' }], - [/"/, { token: 'string', next: '@string' }] ], string: [ [/[^']+/, 'string'], - [/[^"]+/, 'string'], [/''/, 'string'], - [/""/, 'string'], - [/'/, { token: 'string', next: '@pop' }], - [/"/, { token: 'string', next: '@pop' }] + [/'/, { token: 'string', next: '@pop' }] ], complexIdentifiers: [ - - [/`/, { token: 'identifier.quote', next: '@quotedIdentifier' }] + [/"/, { token: 'identifier.quote', next: '@quotedIdentifier' }] ], quotedIdentifier: [ - [/[^`]+/, 'identifier'], - [/``/, 'identifier'], - [/`/, { token: 'identifier.quote', next: '@pop' }] + [/[^"]+/, 'identifier'], + [/""/, 'identifier'], + [/"/, { token: 'identifier.quote', next: '@pop' }] ], scopes: [ // NOT SUPPORTED diff --git a/test/all.js b/test/all.js index f8faa214..e53c5926 100644 --- a/test/all.js +++ b/test/all.js @@ -60,7 +60,8 @@ requirejs([ 'out/test/solidity.test', 'out/test/sb.test', 'out/test/mysql.test', - 'out/test/pgsql.test' + 'out/test/pgsql.test', + 'out/test/redshift.test' ], function() { run(); // We can launch the tests! }); diff --git a/test/redshift.test.ts b/test/redshift.test.ts new file mode 100644 index 00000000..d8958603 --- /dev/null +++ b/test/redshift.test.ts @@ -0,0 +1,555 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { testTokenization } from './testRunner'; + +testTokenization('sql', [ + // Comments + [{ + line: '-- a comment', + tokens: [ + { startIndex: 0, type: 'comment.sql' } + ] + }], + + [{ + line: '---sticky -- comment', + tokens: [ + { startIndex: 0, type: 'comment.sql' } + ] + }], + + [{ + line: '-almost a comment', + tokens: [ + { startIndex: 0, type: 'operator.sql' }, + { startIndex: 1, type: 'identifier.sql' }, + { startIndex: 7, type: 'white.sql' }, + { startIndex: 8, type: 'identifier.sql' }, + { startIndex: 9, type: 'white.sql' }, + { startIndex: 10, type: 'identifier.sql' } + ] + }], + + [{ + line: '/* a full line comment */', + tokens: [ + { startIndex: 0, type: 'comment.quote.sql' }, + { startIndex: 2, type: 'comment.sql' }, + { startIndex: 23, type: 'comment.quote.sql' } + ] + }], + + [{ + line: '/* /// *** /// */', + tokens: [ + { startIndex: 0, type: 'comment.quote.sql' }, + { startIndex: 2, type: 'comment.sql' }, + { startIndex: 15, type: 'comment.quote.sql' } + ] + }], + + [{ + line: 'declare _x int = /* a simple comment */ 1;', + tokens: [ + { startIndex: 0, type: 'keyword.sql' }, + { startIndex: 7, type: 'white.sql' }, + { startIndex: 8, type: 'identifier.sql' }, + { startIndex: 10, type: 'white.sql' }, + { startIndex: 11, type: 'keyword.sql' }, + { startIndex: 14, type: 'white.sql' }, + { startIndex: 15, type: 'operator.sql' }, + { startIndex: 16, type: 'white.sql' }, + { startIndex: 17, type: 'comment.quote.sql' }, + { startIndex: 19, type: 'comment.sql' }, + { startIndex: 37, type: 'comment.quote.sql' }, + { startIndex: 39, type: 'white.sql' }, + { startIndex: 40, type: 'number.sql' }, + { startIndex: 41, type: 'delimiter.sql' } + ] + }], + + // Not supporting nested comments, as nested comments seem to not be standard? + // i.e. http://stackoverflow.com/questions/728172/are-there-multiline-comment-delimiters-in-sql-that-are-vendor-agnostic + [{ + line: '_x=/* a /* nested comment 1*/;', + tokens: [ + { startIndex: 0, type: 'identifier.sql' }, + { startIndex: 2, type: 'operator.sql' }, + { startIndex: 3, type: 'comment.quote.sql' }, + { startIndex: 5, type: 'comment.sql' }, + { startIndex: 28, type: 'comment.quote.sql' }, + { startIndex: 30, type: 'delimiter.sql' } + ] + }], + + [{ + line: '_x=/* another comment */ 1*/;', + tokens: [ + { startIndex: 0, type: 'identifier.sql' }, + { startIndex: 2, type: 'operator.sql' }, + { startIndex: 3, type: 'comment.quote.sql' }, + { startIndex: 5, type: 'comment.sql' }, + { startIndex: 22, type: 'comment.quote.sql' }, + { startIndex: 24, type: 'white.sql' }, + { startIndex: 25, type: 'number.sql' }, + { startIndex: 26, type: 'operator.sql' }, + { startIndex: 28, type: 'delimiter.sql' } + ] + }], + + [{ + line: '_x=/*/;', + tokens: [ + { startIndex: 0, type: 'identifier.sql' }, + { startIndex: 2, type: 'operator.sql' }, + { startIndex: 3, type: 'comment.quote.sql' }, + { startIndex: 5, type: 'comment.sql' } + ] + }], + + // Numbers + [{ + line: '123', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '-123', + tokens: [ + { startIndex: 0, type: 'operator.sql' }, + { startIndex: 1, type: 'number.sql' } + ] + }], + + [{ + line: '0xaBc123', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '0XaBc123', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '0x', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '0x0', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '0xAB_CD', + tokens: [ + { startIndex: 0, type: 'number.sql' }, + { startIndex: 4, type: 'identifier.sql' } + ] + }], + + [{ + line: '$', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '$-123', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '$-+-123', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '$123.5678', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '$0.99', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '$.99', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '$99.', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '$0.', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '$.0', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '.', + tokens: [ + { startIndex: 0, type: 'delimiter.sql' } + ] + }], + + [{ + line: '123', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '123.5678', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '0.99', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '.99', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '99.', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '0.', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '.0', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '1E-2', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '1E+2', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '1E2', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '0.1E2', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '1.E2', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + [{ + line: '.1E2', + tokens: [ + { startIndex: 0, type: 'number.sql' } + ] + }], + + // Identifiers + [{ + line: '_abc$01', + tokens: [ + { startIndex: 0, type: 'identifier.sql' } + ] + }], + + [{ + line: '#abc$01', + tokens: [ + { startIndex: 0, type: 'identifier.sql' } + ] + }], + + [{ + line: '##abc$01', + tokens: [ + { startIndex: 0, type: 'identifier.sql' } + ] + }], + + [{ + line: '@abc$01', + tokens: [ + { startIndex: 0, type: 'identifier.sql' } + ] + }], + + [{ + line: '@@abc$01', + tokens: [ + { startIndex: 0, type: 'identifier.sql' } + ] + }], + + [{ + line: '$abc', + tokens: [ + { startIndex: 0, type: 'identifier.sql' } + ] + }], + + [{ + line: '$nonexistent', + tokens: [ + { startIndex: 0, type: 'identifier.sql' } + ] + }], + + [{ + line: '@@nonexistent', + tokens: [ + { startIndex: 0, type: 'identifier.sql' } + ] + }], + + [{ + line: 'declare "abc 321";', + tokens: [ + { startIndex: 0, type: 'keyword.sql' }, + { startIndex: 7, type: 'white.sql' }, + { startIndex: 8, type: 'identifier.quote.sql' }, + { startIndex: 9, type: 'identifier.sql' }, + { startIndex: 16, type: 'identifier.quote.sql' }, + { startIndex: 17, type: 'delimiter.sql' } + ] + }], + + [{ + line: '"abc"" 321 "" xyz"', + tokens: [ + { startIndex: 0, type: 'identifier.quote.sql' }, + { startIndex: 1, type: 'identifier.sql' }, + { startIndex: 17, type: 'identifier.quote.sql' } + ] + }], + + [{ + line: '"abc', + tokens: [ + { startIndex: 0, type: 'identifier.quote.sql' }, + { startIndex: 1, type: 'identifier.sql' } + ] + }], + + [{ + line: 'declare "abc 321";', + tokens: [ + { startIndex: 0, type: 'keyword.sql' }, + { startIndex: 7, type: 'white.sql' }, + { startIndex: 8, type: 'identifier.quote.sql' }, + { startIndex: 9, type: 'identifier.sql' }, + { startIndex: 16, type: 'identifier.quote.sql' }, + { startIndex: 17, type: 'delimiter.sql' } + ] + }], + + [{ + line: '"abc"" 321 "" xyz"', + tokens: [ + { startIndex: 0, type: 'identifier.quote.sql' }, + { startIndex: 1, type: 'identifier.sql' }, + { startIndex: 17, type: 'identifier.quote.sql' } + ] + }], + + [{ + line: '"abc', + tokens: [ + { startIndex: 0, type: 'identifier.quote.sql' }, + { startIndex: 1, type: 'identifier.sql' } + ] + }], + + [{ + line: 'int', + tokens: [ + { startIndex: 0, type: 'keyword.sql' } + ] + }], + + [{ + line: '"int"', + tokens: [ + { startIndex: 0, type: 'identifier.quote.sql' }, + { startIndex: 1, type: 'identifier.sql' }, + { startIndex: 4, type: 'identifier.quote.sql' } + ] + }], + + // Strings + [{ + line: 'declare _x=\'a string\';', + tokens: [ + { startIndex: 0, type: 'keyword.sql' }, + { startIndex: 7, type: 'white.sql' }, + { startIndex: 8, type: 'identifier.sql' }, + { startIndex: 10, type: 'operator.sql' }, + { startIndex: 11, type: 'string.sql' }, + { startIndex: 21, type: 'delimiter.sql' } + ] + }], + + [{ + line: '\'a \'\' string with quotes\'', + tokens: [ + { startIndex: 0, type: 'string.sql' }, + ] + }], + + [{ + line: '\'a -- string with comment\'', + tokens: [ + { startIndex: 0, type: 'string.sql' }, + ] + }], + + [{ + line: '\'a endless string', + tokens: [ + { startIndex: 0, type: 'string.sql' }, + ] + }], + + // Operators + [{ + line: 'x=x+1', + tokens: [ + { startIndex: 0, type: 'identifier.sql' }, + { startIndex: 1, type: 'operator.sql' }, + { startIndex: 2, type: 'identifier.sql' }, + { startIndex: 3, type: 'operator.sql' }, + { startIndex: 4, type: 'number.sql' } + ] + }], + + [{ + line: '_x^=_x', + tokens: [ + { startIndex: 0, type: 'identifier.sql' }, + { startIndex: 2, type: 'operator.sql' }, + { startIndex: 4, type: 'identifier.sql' } + ] + }], + + [{ + line: 'WHERE x 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' } + ] + }], + + [{ + line: 'SELECT * FROM sch.MyTable WHERE MyColumn IN (1,2)', + tokens: [ + { startIndex: 0, type: 'keyword.sql' }, + { startIndex: 6, type: 'white.sql' }, + { startIndex: 7, type: 'operator.sql' }, + { startIndex: 8, type: 'white.sql' }, + { 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' } + ] + }] +]);