more test casse

Author: avivl

dist/module.js

@@ -33620,11 +33620,11 @@ function () {
     this.interpolateQueryStr = this.interpolateQueryStr.bind(this);
   }
 
-  BigQueryQuery.prototype.quoteLiteral = function (value) {
+  BigQueryQuery.quoteLiteral = function (value) {
     return "'" + String(value).replace(/'/g, "''") + "'";
   };
 
-  BigQueryQuery.prototype.escapeLiteral = function (value) {
+  BigQueryQuery.escapeLiteral = function (value) {
     return String(value).replace(/'/g, "''");
   };
 
@@ -33641,14 +33641,14 @@ function () {
   BigQueryQuery.prototype.interpolateQueryStr = function (value, variable, defaultFormatFn) {
     // if no multi or include all do not regexEscape
     if (!variable.multi && !variable.includeAll) {
-      return this.escapeLiteral(value);
+      return BigQueryQuery.escapeLiteral(value);
     }
 
     if (typeof value === 'string') {
-      return this.quoteLiteral(value);
+      return BigQueryQuery.quoteLiteral(value);
     }
 
-    var escapedValues = _lodash2.default.map(value, this.quoteLiteral);
+    var escapedValues = _lodash2.default.map(value, BigQueryQuery.quoteLiteral);
 
     return escapedValues.join(',');
   };
@@ -34153,8 +34153,6 @@ var BigQueryDatasource =
 function () {
   /** @ngInject */
   function BigQueryDatasource(instanceSettings, backendSrv, $q, templateSrv, timeSrv) {
-    var _this = this;
-
     this.backendSrv = backendSrv;
     this.$q = $q;
     this.templateSrv = templateSrv;
@@ -34163,7 +34161,7 @@ function () {
     this.interpolateVariable = function (value, variable) {
       if (typeof value === 'string') {
         if (variable.multi || variable.includeAll) {
-          return _this.queryModel.quoteLiteral(value);
+          return _bigquery_query2.default.quoteLiteral(value);
         } else {
           return value;
         }
@@ -34174,7 +34172,7 @@ function () {
       }
 
       var quotedValues = _lodash2.default.map(value, function (v) {
-        return _this.queryModel.quoteLiteral(v);
+        return _bigquery_query2.default.quoteLiteral(v);
       });
 
       return quotedValues.join(',');
@@ -34503,6 +34501,8 @@ function () {
       return tslib_1.__generator(this, function (_a) {
         switch (_a.label) {
           case 0:
+            status = 'error';
+            message = 'BigQuery: ';
             defaultErrorMessage = 'Cannot connect to BigQuery API';
             _a.label = 1;
 
@@ -34525,9 +34525,8 @@ function () {
 
             if (response.status === 200) {
               status = 'success';
-              message = 'Successfully queried the BigQuery API.';
+              message += 'Successfully queried the BigQuery API.';
             } else {
-              status = 'error';
               message = response.statusText ? response.statusText : defaultErrorMessage;
             }
 
@@ -34537,8 +34536,6 @@ function () {
 
           case 4:
             error_2 = _a.sent();
-            status = 'error';
-            message = 'BigQuery: ';
             message += error_2.statusText ? error_2.statusText : defaultErrorMessage;
 
             if (error_2.data && error_2.data.error && error_2.data.error.code) {

dist/module.js.map

@@ -35,11 +35,11 @@ export default class BigQueryQuery {
         this.interpolateQueryStr = this.interpolateQueryStr.bind(this);
     }
 
-    quoteLiteral(value) {
+    static quoteLiteral(value) {
         return "'" + String(value).replace(/'/g, "''") + "'";
     }
 
-    escapeLiteral(value) {
+    static escapeLiteral(value) {
         return String(value).replace(/'/g, "''");
     }
 
@@ -54,14 +54,14 @@ export default class BigQueryQuery {
     interpolateQueryStr(value, variable, defaultFormatFn) {
         // if no multi or include all do not regexEscape
         if (!variable.multi && !variable.includeAll) {
-            return this.escapeLiteral(value);
+            return BigQueryQuery.escapeLiteral(value);
         }
 
         if (typeof value === 'string') {
-            return this.quoteLiteral(value);
+            return BigQueryQuery.quoteLiteral(value);
         }
 
-        const escapedValues = _.map(value, this.quoteLiteral);
+        const escapedValues = _.map(value, BigQueryQuery.quoteLiteral);
         return escapedValues.join(',');
     }
 

src/bigquery_query.ts

@@ -112,7 +112,7 @@ export class BigQueryDatasource {
     interpolateVariable = (value, variable) => {
         if (typeof value === 'string') {
             if (variable.multi || variable.includeAll) {
-                return this.queryModel.quoteLiteral(value);
+                return BigQueryQuery.quoteLiteral(value);
             } else {
                 return value;
             }
@@ -123,7 +123,7 @@ export class BigQueryDatasource {
         }
 
         const quotedValues = _.map(value, v => {
-            return this.queryModel.quoteLiteral(v);
+            return BigQueryQuery.quoteLiteral(v);
         });
         return quotedValues.join(',');
     }
@@ -223,21 +223,20 @@ export class BigQueryDatasource {
 
     async testDatasource() {
         let status, message;
+        status = 'error';
+        message = 'BigQuery: ';
         const defaultErrorMessage = 'Cannot connect to BigQuery API';
         try {
             const projectName = await this.getDefaultProject();
             const path = `v2/projects/${projectName}/datasets`;
             const response = await this.doRequest(`${this.baseUrl}${path}`);
             if (response.status === 200) {
                 status = 'success';
-                message = 'Successfully queried the BigQuery API.';
+                message += 'Successfully queried the BigQuery API.';
             } else {
-                status = 'error';
                 message = response.statusText ? response.statusText : defaultErrorMessage;
             }
         } catch (error) {
-            status = 'error';
-                message = 'BigQuery: ';
                 message += error.statusText ? error.statusText : defaultErrorMessage;
                 if (error.data && error.data.error && error.data.error.code) {
                     message += ': ' + error.data.error.code + '. ' + error.data.error.message;