Merge branch 'master' into mssql_datasource

public/app/plugins/datasource/mssql/datasource.ts

@@ -1,5 +1,3 @@
-///<reference path="../../../headers/common.d.ts" />
-
 import _ from 'lodash';
 import ResponseParser from './response_parser';
 
@@ -18,7 +16,7 @@ export class MssqlDatasource {
   interpolateVariable(value, variable) {
     if (typeof value === 'string') {
       if (variable.multi || variable.includeAll) {
-        return '\'' + value + '\'';
+        return "'" + value + "'";
       } else {
         return value;
       }
@@ -33,9 +31,9 @@ export class MssqlDatasource {
         return value;
       }
 
-      return '\'' + val + '\'';
+      return "'" + val + "'";
     });
-    return  quotedValues.join(',');
+    return quotedValues.join(',');
   }
 
   query(options) {
@@ -53,23 +51,25 @@ export class MssqlDatasource {
     });
 
     if (queries.length === 0) {
-      return this.$q.when({data: []});
+      return this.$q.when({ data: [] });
     }
 
-    return this.backendSrv.datasourceRequest({
-      url: '/api/tsdb/query',
-      method: 'POST',
-      data: {
-        from: options.range.from.valueOf().toString(),
-        to: options.range.to.valueOf().toString(),
-        queries: queries,
-      }
-    }).then(this.responseParser.processQueryResult);
+    return this.backendSrv
+      .datasourceRequest({
+        url: '/api/tsdb/query',
+        method: 'POST',
+        data: {
+          from: options.range.from.valueOf().toString(),
+          to: options.range.to.valueOf().toString(),
+          queries: queries,
+        },
+      })
+      .then(this.responseParser.processQueryResult);
   }
 
   annotationQuery(options) {
     if (!options.annotation.rawQuery) {
-      return this.$q.reject({message: 'Query missing in annotation definition'});
+      return this.$q.reject({ message: 'Query missing in annotation definition' });
     }
 
     const query = {
@@ -79,15 +79,17 @@ export class MssqlDatasource {
       format: 'table',
     };
 
-    return this.backendSrv.datasourceRequest({
-      url: '/api/tsdb/query',
-      method: 'POST',
-      data: {
-        from: options.range.from.valueOf().toString(),
-        to: options.range.to.valueOf().toString(),
-        queries: [query],
-      }
-    }).then(data => this.responseParser.transformAnnotationResponse(options, data));
+    return this.backendSrv
+      .datasourceRequest({
+        url: '/api/tsdb/query',
+        method: 'POST',
+        data: {
+          from: options.range.from.valueOf().toString(),
+          to: options.range.to.valueOf().toString(),
+          queries: [query],
+        },
+      })
+      .then(data => this.responseParser.transformAnnotationResponse(options, data));
   }
 
   metricFindQuery(query, optionalOptions) {
@@ -103,42 +105,47 @@ export class MssqlDatasource {
       format: 'table',
     };
 
-    return this.backendSrv.datasourceRequest({
-      url: '/api/tsdb/query',
-      method: 'POST',
-      data: {
-        queries: [interpolatedQuery],
-      }
-    })
-    .then(data => this.responseParser.parseMetricFindQueryResult(refId, data));
+    return this.backendSrv
+      .datasourceRequest({
+        url: '/api/tsdb/query',
+        method: 'POST',
+        data: {
+          queries: [interpolatedQuery],
+        },
+      })
+      .then(data => this.responseParser.parseMetricFindQueryResult(refId, data));
   }
 
   testDatasource() {
-    return this.backendSrv.datasourceRequest({
-      url: '/api/tsdb/query',
-      method: 'POST',
-      data: {
-        from: '5m',
-        to: 'now',
-        queries: [{
-          refId: 'A',
-          intervalMs: 1,
-          maxDataPoints: 1,
-          datasourceId: this.id,
-          rawSql: "SELECT 1",
-          format: 'table',
-        }],
-      }
-    }).then(res => {
-      return { status: "success", message: "Database Connection OK"};
-    }).catch(err => {
-      console.log(err);
-      if (err.data && err.data.message) {
-        return { status: "error", message: err.data.message };
-      } else {
-        return { status: "error", message: err.status };
-      }
-    });
+    return this.backendSrv
+      .datasourceRequest({
+        url: '/api/tsdb/query',
+        method: 'POST',
+        data: {
+          from: '5m',
+          to: 'now',
+          queries: [
+            {
+              refId: 'A',
+              intervalMs: 1,
+              maxDataPoints: 1,
+              datasourceId: this.id,
+              rawSql: 'SELECT 1',
+              format: 'table',
+            },
+          ],
+        },
+      })
+      .then(res => {
+        return { status: 'success', message: 'Database Connection OK' };
+      })
+      .catch(err => {
+        console.log(err);
+        if (err.data && err.data.message) {
+          return { status: 'error', message: err.data.message };
+        } else {
+          return { status: 'error', message: err.status };
+        }
+      });
   }
 }
-