Merge pull request #5 from Shopify/allow-disable-limit

Allow disabling LIMIT clause
Shopify · Jan 26, 2021 · ff94f9a · ff94f9a
2 parents a6f4e31 + f330a95
commit ff94f9a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
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/partials/query.editor.html b/dist/partials/query.editor.html
@@ -155,9 +155,16 @@
     <gf-form-switch class="gf-form"
                     label="Convert time filters to UTC"
                     label-class="query-keyword"
-                    checked="ctrl.target.convertToUTC"
+                    checked="ctrl.target.convertToUTC">
     </gf-form-switch>
     </div>
+    <div>
+      <gf-form-switch class="gf-form"
+                      label="Disable LIMIT"
+                      label-class="query-keyword"
+                      checked="ctrl.target.disableLimit">
+      </gf-form-switch>
+    </div>
     <div class="gf-form">
       <label class="gf-form-label query-keyword">Processing Location</label>
       <div class="">

diff --git a/src/bigquery_query.ts b/src/bigquery_query.ts
@@ -116,6 +116,7 @@ export default class BigQueryQuery {
     target.timeColumn = target.timeColumn || '-- time --';
     target.timeColumnType = target.timeColumnType || 'TIMESTAMP';
     target.metricColumn = target.metricColumn || 'none';
+    target.disableLimit = target.disableLimit || false;
     target.group = target.group || [];
     target.where = target.where || [{ type: 'macro', name: '$__timeFilter', params: [] }];
     target.select = target.select || [[{ type: 'column', params: ['-- value --'] }]];

diff --git a/src/datasource.ts b/src/datasource.ts
@@ -460,7 +460,7 @@ export class BigQueryDatasource {
         q = this._updateAlias(q, modOptions, query.refId);
       }
       const limit = q.match(/[^]+(\bLIMIT\b)/gi);
-      if (limit == null) {
+      if (limit == null && !this.queryModel.target.disableLimit) {
         const limitStatement = ' LIMIT ' + options.maxDataPoints;
         const limitPosition = q.match(/\$__limitPosition/g);
         if (limitPosition !== null) {

diff --git a/src/partials/query.editor.html b/src/partials/query.editor.html
@@ -155,9 +155,16 @@
     <gf-form-switch class="gf-form"
                     label="Convert time filters to UTC"
                     label-class="query-keyword"
-                    checked="ctrl.target.convertToUTC"
+                    checked="ctrl.target.convertToUTC">
     </gf-form-switch>
     </div>
+    <div>
+      <gf-form-switch class="gf-form"
+                      label="Disable LIMIT"
+                      label-class="query-keyword"
+                      checked="ctrl.target.disableLimit">
+      </gf-form-switch>
+    </div>
     <div class="gf-form">
       <label class="gf-form-label query-keyword">Processing Location</label>
       <div class="">