Merge pull request #166 from Altinity/master

Fixes and Version update
Altinity · Jan 15, 2020 · 50d46ef · 50d46ef
2 parents 0c1a51c + db107cb
commit 50d46ef
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 56,139 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.9.5 (2020-01-15)
+
+## Fixes:
+* Comments not supported by sql language parser #95 
+
 # 1.9.4 (2019-11-27)
 
 ## Fixes:

diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -24,6 +24,6 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "1.9.4"
+    "version": "1.9.5"
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vertamedia-clickhouse",
-    "version": "1.9.4",
+    "version": "1.9.5",
     "description": "ClickHouse datasource for Grafana",
     "scripts": {
         "build:prod": "webpack --config webpack.config.prod.js",

diff --git a/src/plugin.json b/src/plugin.json
@@ -24,6 +24,6 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "1.9.4"
+    "version": "1.9.5"
   }
 }
diff --git a/src/scanner.ts b/src/scanner.ts
@@ -234,6 +234,11 @@ export default class Scanner {
         }
         return this.tree;
     }
+
+    removeComments(query)
+    {
+        return query.replace(new RegExp(commentRe), '');
+    }
 }
 
 let wsRe = "\\s+",

diff --git a/src/sql_query.ts b/src/sql_query.ts
@@ -96,6 +96,7 @@ export default class SqlQuery {
             renderedAdHocCondition = '(' + adhocCondition.join(' AND ') + ')';
         }
 
+        query = scanner.removeComments(query);
         query = SqlQuery.unescape(query);
         let timeFilter = SqlQuery.getDateTimeFilter(this.options.rangeRaw.to === 'now', dateTimeType);
         if (typeof this.target.dateColDataType == "string" && this.target.dateColDataType.length > 0) {