Merge pull request #153 from Altinity/master

Version 1.9.3 Update
Altinity · Oct 18, 2019 · 995b21b · 995b21b
2 parents 0d0e76f + 3aeb0ce
commit 995b21b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.9.3 (2019-10-18)
+
+## Fixes:
+* Ad Hoc Filters improvements for complex usage
+
 # 1.9.2 (2019-10-10)
 
 ## 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.2"
+    "version": "1.9.3"
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vertamedia-clickhouse",
-    "version": "1.9.0",
+    "version": "1.9.3",
     "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.2"
+    "version": "1.9.3"
   }
 }
diff --git a/src/sql_query.ts b/src/sql_query.ts
@@ -71,7 +71,8 @@ export default class SqlQuery {
                         return
                     }
                     let operator = SqlQuery.clickhouseOperator(af.operator);
-                    let cond = parts[2] + " " + operator + " " + ("'" + af.value + "'");
+                    let cond = parts[2] + " " + operator + " "
+                        + ((af.value.indexOf("'") > -1 || af.value.indexOf(", ") > -1) ? af.value : "'" + af.value + "'");
                     adhocCondition.push(cond);
                     if (ast.where.length > 0) {
                         // OR is not implemented