Merge pull request #129 from doitintl/issue-128

avivl · web-flow · commit 017e06696e91 · 2019-08-25T08:37:47.000+01:00
Fixes #128
diff --git a/dist/module.js b/dist/module.js
@@ -59453,7 +59453,12 @@ function () {
             q = _this._updateAlias(q, modOptions, query.refId);
           }
 
-          q += " LIMIT " + options.maxDataPoints;
+          var limit = q.match(/.(\blimit\b)/gi);
+
+          if (limit == null) {
+            q += " LIMIT " + options.maxDataPoints;
+          }
+
           console.log(q);
           _this.queryModel.target.rawSql = tmpQ;
           return _this.doQuery(q, options.panelId + query.refId).then(function (response) {
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/src/datasource.ts b/src/datasource.ts
@@ -231,7 +231,10 @@ export class BigQueryDatasource {
       if (query.refId.search(Shifted) > -1) {
         q = this._updateAlias(q, modOptions, query.refId);
       }
-      q += " LIMIT " + options.maxDataPoints;
+      const limit = q.match(/.(\blimit\b)/gi);
+      if (limit == null) {
+        q += " LIMIT " + options.maxDataPoints;
+      }
       console.log(q);
       this.queryModel.target.rawSql = tmpQ;
       return this.doQuery(q, options.panelId + query.refId).then(response => {
