Merge pull request #237 from ptomasroos/fix-232

Allow auto calculated limit to be inserted a specific place instead of just appended to the end

Author: LiorRacer

src/datasource.ts

@@ -528,7 +528,14 @@ export class BigQueryDatasource {
     }
     const limit = q.match(/[^]+(\bLIMIT\b)/gi);
     if (limit == null) {
-      q += " LIMIT " + options.maxDataPoints;
+      const limitStatement = " LIMIT " + options.maxDataPoints;
+      const limitPosition = q.match(/\$__limitPosition/g); 
+      if (limitPosition !== null)
+      { 
+        q = q.replace(/\$__limitPosition/g, limitStatement);
+      } else {
+        q += limitStatement;
+      }
     }
     return q;
   }