Skip to content
This repository was archived by the owner on Dec 11, 2022. It is now read-only.

Commit 1eb3a11

Browse files
avivlavivl
committed
more code climet fixes
1 parent 19bc05d commit 1eb3a11

File tree

5 files changed

+18
-64
lines changed

5 files changed

+18
-64
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# !!!!! Project is Work in Progress. Not ready for production yet !!!!!
99
# BigQuery datasource for Grafana 4.6+
1010

11-
ClickHouse datasource plugin provides a support for [BigQuery](https://cloud.google.com/bigquery/) as a backend database.
11+
BigQuery datasource plugin provides a support for [BigQuery](https://cloud.google.com/bigquery/) as a backend database.
1212

1313
### Quick start
1414
Install from [grafana.net](https://grafana.net/plugins/doitintl-bigquery-datasource)
@@ -96,4 +96,4 @@ Tests can be run with Jest:
9696

9797
```
9898
yarn run test
99-
```
99+
```

‎dist/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# !!!!! Project is Work in Progress. Not ready for production yet !!!!!
99
# BigQuery datasource for Grafana 4.6+
1010

11-
ClickHouse datasource plugin provides a support for [BigQuery](https://cloud.google.com/bigquery/) as a backend database.
11+
BigQuery datasource plugin provides a support for [BigQuery](https://cloud.google.com/bigquery/) as a backend database.
1212

1313
### Quick start
1414
Install from [grafana.net](https://grafana.net/plugins/doitintl-bigquery-datasource)
@@ -96,4 +96,4 @@ Tests can be run with Jest:
9696

9797
```
9898
yarn run test
99-
```
99+
```

‎dist/module.js‎

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33613,31 +33613,12 @@ function () {
3361333613
}]]; // handle pre query gui panels gracefully
3361433614

3361533615
if (!('rawQuery' in this.target)) {
33616-
if ('rawSql' in target) {
33617-
// pre query gui panel
33618-
target.rawQuery = true;
33619-
} else {
33620-
// new panel
33621-
target.rawQuery = false;
33622-
}
33616+
target.rawQuery = 'rawSql' in target;
3362333617
} // give interpolateQueryStr access to this
3362433618

3362533619

3362633620
this.interpolateQueryStr = this.interpolateQueryStr.bind(this);
33627-
} // remove identifier quoting from identifier to use in metadata queries
33628-
33629-
33630-
BigQueryQuery.prototype.unquoteIdentifier = function (value) {
33631-
if (value[0] === '"' && value[value.length - 1] === '"') {
33632-
return value.substring(1, value.length - 1).replace(/""/g, '"');
33633-
} else {
33634-
return value;
33635-
}
33636-
};
33637-
33638-
BigQueryQuery.prototype.quoteIdentifier = function (value) {
33639-
return '"' + String(value).replace(/"/g, '""') + '"';
33640-
};
33621+
}
3364133622

3364233623
BigQueryQuery.prototype.quoteLiteral = function (value) {
3364333624
return "'" + String(value).replace(/'/g, "''") + "'";
@@ -33690,10 +33671,6 @@ function () {
3369033671
}
3369133672
};
3369233673

33693-
BigQueryQuery.prototype.hasUnixEpochTimecolumn = function () {
33694-
return ['int4', 'int8', 'float4', 'float8', 'numeric'].indexOf(this.target.timeColumnType) > -1;
33695-
};
33696-
3369733674
BigQueryQuery.prototype.buildTimeColumn = function (alias) {
3369833675
if (alias === void 0) {
3369933676
alias = true;
@@ -33979,30 +33956,30 @@ function () {
3397933956
return q;
3398033957
}
3398133958

33982-
var intervalStr = '';
33959+
var intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS(" + this.target.timeColumn + "), ";
3398333960

3398433961
switch (interval[0]) {
3398533962
case '1s':
3398633963
{
33987-
intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS(" + this.target.timeColumn + "), 1) * 1)";
33964+
intervalStr += "1) * 1)";
3398833965
break;
3398933966
}
3399033967

3399133968
case '1m':
3399233969
{
33993-
intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS(" + this.target.timeColumn + "), 60) * 60)";
33970+
intervalStr += "60) * 60)";
3399433971
break;
3399533972
}
3399633973

3399733974
case '1h':
3399833975
{
33999-
intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS(" + this.target.timeColumn + "), 3600) * 3600)";
33976+
intervalStr += "3600) * 3600)";
3400033977
break;
3400133978
}
3400233979

3400333980
case '1d':
3400433981
{
34005-
intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS(" + this.target.timeColumn + "), 86400) * 86400)";
33982+
intervalStr += "86400) * 86400)";
3400633983
break;
3400733984
}
3400833985
}

‎dist/module.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/bigquery_query.ts‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,13 @@ export default class BigQueryQuery {
2828

2929
// handle pre query gui panels gracefully
3030
if (!('rawQuery' in this.target)) {
31-
if ('rawSql' in target) {
32-
// pre query gui panel
33-
target.rawQuery = true;
34-
} else {
35-
// new panel
36-
target.rawQuery = false;
37-
}
31+
target.rawQuery = 'rawSql' in target;
3832
}
3933

4034
// give interpolateQueryStr access to this
4135
this.interpolateQueryStr = this.interpolateQueryStr.bind(this);
4236
}
4337

44-
// remove identifier quoting from identifier to use in metadata queries
45-
unquoteIdentifier(value) {
46-
if (value[0] === '"' && value[value.length - 1] === '"') {
47-
return value.substring(1, value.length - 1).replace(/""/g, '"');
48-
} else {
49-
return value;
50-
}
51-
}
52-
53-
quoteIdentifier(value) {
54-
return '"' + String(value).replace(/"/g, '""') + '"';
55-
}
56-
5738
quoteLiteral(value) {
5839
return "'" + String(value).replace(/'/g, "''") + "'";
5940
}
@@ -102,10 +83,6 @@ export default class BigQueryQuery {
10283
}
10384
}
10485

105-
hasUnixEpochTimecolumn() {
106-
return ['int4', 'int8', 'float4', 'float8', 'numeric'].indexOf(this.target.timeColumnType) > -1;
107-
}
108-
10986
buildTimeColumn(alias = true) {
11087
const timeGroup = this.hasTimeGroup();
11188
let query;
@@ -337,22 +314,22 @@ export default class BigQueryQuery {
337314
if (!interval) {
338315
return q;
339316
}
340-
let intervalStr = '';
317+
let intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS("+ this.target.timeColumn + "), ";
341318
switch (interval[0]) {
342319
case '1s': {
343-
intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS("+ this.target.timeColumn + "), 1) * 1)";
320+
intervalStr += "1) * 1)";
344321
break;
345322
}
346323
case '1m': {
347-
intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS("+ this.target.timeColumn + "), 60) * 60)";
324+
intervalStr += "60) * 60)";
348325
break;
349326
}
350327
case '1h': {
351-
intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS("+ this.target.timeColumn + "), 3600) * 3600)";
328+
intervalStr += "3600) * 3600)";
352329
break;
353330
}
354331
case '1d': {
355-
intervalStr = "TIMESTAMP_SECONDS(DIV(UNIX_SECONDS("+ this.target.timeColumn + "), 86400) * 86400)";
332+
intervalStr += "86400) * 86400)";
356333
break;
357334
}
358335
}

0 commit comments

Comments
 (0)