support array indexing in AST

Altinity · Feb 12, 2018 · 6fbd2b9 · 6fbd2b9
1 parent f8fc0f6
commit 6fbd2b9
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 1.3.1 (2018-02-12)
+
+## Fixes
+
+* support array indexing int AST
+
+
 # 1.3.0 (2018-02-07)
 
 ## New Features

diff --git a/dist/CHANGELOG.md b/dist/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 1.3.1 (2018-02-12)
+
+## Fixes
+
+* support array indexing int AST
+
+
 # 1.3.0 (2018-02-07)
 
 ## New Features

diff --git a/dist/plugin.json b/dist/plugin.json
@@ -24,6 +24,6 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "1.3.0"
+    "version": "1.3.1"
   }
 }
diff --git a/dist/scanner.js b/dist/scanner.js
diff --git a/dist/scanner.js.map b/dist/scanner.js.map
diff --git a/dist/scanner.ts b/dist/scanner.ts
@@ -98,7 +98,7 @@ export default class Scanner {
         let subQuery = '',
             argument = '';
 
-        while (this.next()) {
+        while (this.next()) {debugger
             if (!this.isExpectedNext() && isStatement(this.token) && !this.tree.hasOwnProperty(_.toLower(this.token))) {
                 if (!isClosured(argument)) {
                     argument += this.token;
@@ -234,10 +234,10 @@ let wsRe = "\\s+",
     macroFuncRe = "(\\$rateColumns|\\$rate|\\$columns)",
     condRe = "\\b(or|and)\\b",
     inRe = "\\b(global in|global not in|not in|in)\\b",
-    closureRe = "[\\(\\)]",
+    closureRe = "[\\(\\)\\[\\]]",
     specCharsRe = "[,?:]",
     macroRe = "\\$[A-Za-z0-9_$]+",
-    skipSpaceRe = "[\\(\\.! ]",
+    skipSpaceRe = "[\\(\\.! \\[]",
 
     builtInFuncRe = "\\b(avg|countIf|first|last|max|min|sum|sumIf|ucase|lcase|mid|round|rank|now|" +
         "coalesce|ifnull|isnull|nvl|count|timeSlot|yesterday|today|now|toRelativeSecondNum|" +

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vertamedia-clickhouse",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "description": "ClickHouse datasource for Grafana",
     "scripts": {
         "build": "grunt",

diff --git a/specs/scanner_specs.ts b/specs/scanner_specs.ts
@@ -341,4 +341,27 @@ describe("scanner:", () => {
             expect(scanner.toAST()).to.eql(expectedAST);
         });
     });
+
+    describe("AST case 10(array)", () => {
+        let query = "SELECT count() FROM $table WHERE type[1] = 'key' AND zone['City'] = 'Kyiv'",
+            scanner = new Scanner(query);
+
+        let expectedAST = {
+            "root": [],
+            "select": [
+                "count()"
+            ],
+            "from": [
+                "$table"
+            ],
+            "where": [
+                "type[1] = 'key'",
+                "AND zone['City'] = 'Kyiv'",
+            ],
+        };
+
+        it("expects equality", () => {
+            expect(scanner.toAST()).to.eql(expectedAST);
+        });
+    });
 });
diff --git a/src/plugin.json b/src/plugin.json
@@ -24,6 +24,6 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "1.3.0"
+    "version": "1.3.1"
   }
 }
diff --git a/src/scanner.ts b/src/scanner.ts
@@ -98,7 +98,7 @@ export default class Scanner {
         let subQuery = '',
             argument = '';
 
-        while (this.next()) {
+        while (this.next()) {debugger
             if (!this.isExpectedNext() && isStatement(this.token) && !this.tree.hasOwnProperty(_.toLower(this.token))) {
                 if (!isClosured(argument)) {
                     argument += this.token;
@@ -234,10 +234,10 @@ let wsRe = "\\s+",
     macroFuncRe = "(\\$rateColumns|\\$rate|\\$columns)",
     condRe = "\\b(or|and)\\b",
     inRe = "\\b(global in|global not in|not in|in)\\b",
-    closureRe = "[\\(\\)]",
+    closureRe = "[\\(\\)\\[\\]]",
     specCharsRe = "[,?:]",
     macroRe = "\\$[A-Za-z0-9_$]+",
-    skipSpaceRe = "[\\(\\.! ]",
+    skipSpaceRe = "[\\(\\.! \\[]",
 
     builtInFuncRe = "\\b(avg|countIf|first|last|max|min|sum|sumIf|ucase|lcase|mid|round|rank|now|" +
         "coalesce|ifnull|isnull|nvl|count|timeSlot|yesterday|today|now|toRelativeSecondNum|" +