Skip to content

Commit 5b51bdb

Browse files
authored
Merge pull request #137 from bonitoo-io/fix/query_errors
fix: Skipping unexpected annonations (#136)
2 parents 33571d0 + 7500944 commit 5b51bdb

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
# Changelog
2-
## 3.x.x [in progress]
2+
## 3.7.1 [in progress]
33
### Documentation
44
- [#134](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/134):
55
- Added untrusted connection (skipping certificate validation) info to Readme
66
- `SecureWrite` and `SecureBatchWrite` demos enhanced with example about using untrusted connection
77
- Various fixes of typos
88

9+
### Fixes
10+
- [#137](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/137) - Fixed parsing Flux response with unexpected annotations
11+
912
## 3.7.0 [2020-12-24]
1013
### Features
1114
- [#125](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/124) - Added credentials to the InfluxDB 1.x validation endpoint (/ping). To leverage this, [enable ping authentication](https://docs.influxdata.com/influxdb/v1.8/administration/config/#ping-auth-enabled-false)

src/query/FluxParser.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ bool FluxQueryResult::next() {
196196
}
197197
parsingState = ParsingStateNameRow;
198198
goto readRow;
199-
}
199+
} else {
200+
goto readRow;
201+
}
200202
return true;
201203
}
202204

test/server/server.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ app.post(prefix + '/api/v2/delete', (req,res) => {
230230

231231
var queryRes = {
232232
"singleTable":`#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
233+
#group,false,false,true,true,false,false,true,true,true,true
234+
#default,_result,,,,,,,,,
233235
,result,table,_start,_stop,_time,_value,_field,_measurement,a,b
234236
,,0,2020-02-17T22:19:49.747562847Z,2020-02-18T22:19:49.747562847Z,2020-02-18T10:34:08.135814545Z,1.4,f,test,1,adsfasdf
235237
,,1,2020-02-17T22:19:49.747562847Z,2020-02-18T22:19:49.747562847Z,2020-02-18T22:08:44.850214724Z,6.6,f,test,3,adsfasdf

0 commit comments

Comments
 (0)