Skip to content

Commit 61c4500

Browse files
KYankee6bednar
andauthored
fix: Issue/604 (#717)
* fix: Issue/604 * docs: update CHANGELOG.md * chore: revert line * fix: code style * fix: code style * docs: Update CHANGELOG.md --------- Co-authored-by: Jakub Bednář <[email protected]>
1 parent 5effaa4 commit 61c4500

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
1. [#684](https://github.com/influxdata/influxdb-client-java/issues/684): Fix checking for CSV end of table marker when parsing CSV stream to InfluxQLQueryResult, needed for example when parsing the results of a query like "SHOW SERIES".
66
2. [#662](https://github.com/influxdata/influxdb-client-java/issues/662): Adds to FluxDsl support for the `|> elapsed(unit)` function.
77
3. [#623](https://github.com/influxdata/influxdb-client-java/issues/623): Enables the use of IPv6 addresses.
8+
4. [#604](https://github.com/influxdata/influxdb-client-java/issues/604): Custom FluxDSL restrictions for regular expressions
89

910
### Dependencies
1011

flux-dsl/src/main/java/com/influxdb/query/dsl/functions/restriction/ColumnRestriction.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,11 @@ public String toString() {
192192

193193
String value;
194194
if (fieldValue instanceof String) {
195-
value = "\"" + escapeDoubleQuotes((String) fieldValue) + "\"";
195+
if (operator.contains("~")) {
196+
value = escapeDoubleQuotes((String) fieldValue);
197+
} else {
198+
value = "\"" + escapeDoubleQuotes((String) fieldValue) + "\"";
199+
}
196200
} else {
197201
value = FunctionsParameters.serializeValue(fieldValue, false);
198202
}

flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ void contains() {
7474
Assertions.assertThat(restrictions.toString()).isEqualTo("contains(value: r[\"_value\"], set:[\"value1\", \"value2\"])");
7575
}
7676

77+
@Test
78+
void custom (){
79+
Restrictions restrictions = Restrictions.value().custom("/.*target.*/", "=~");
80+
81+
Assertions.assertThat(restrictions.toString()).isEqualTo("r[\"_value\"] =~ /.*target.*/");
82+
83+
restrictions = Restrictions.value().custom("1", "==");
84+
85+
Assertions.assertThat(restrictions.toString()).isEqualTo("r[\"_value\"] == \"1\"");
86+
}
87+
7788
@Test
7889
void not() {
7990

0 commit comments

Comments
 (0)