You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/07/21 13:00:31 UTC
[incubator-streampipes] branch STREAMPIPES-545 updated: [hotfix] Escape index name in data explorer query generator
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-545
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/STREAMPIPES-545 by this push:
new 964075c86 [hotfix] Escape index name in data explorer query generator
964075c86 is described below
commit 964075c86dfcd8ed4f279d9c70486d472e2d4e8b
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Jul 21 15:00:19 2022 +0200
[hotfix] Escape index name in data explorer query generator
---
.../v4/query/elements/SelectFromStatement.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/query/elements/SelectFromStatement.java b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/query/elements/SelectFromStatement.java
index 731d3484e..963036794 100644
--- a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/query/elements/SelectFromStatement.java
+++ b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/query/elements/SelectFromStatement.java
@@ -23,6 +23,7 @@ import org.apache.streampipes.dataexplorer.v4.params.SelectFromStatementParams;
import java.util.StringJoiner;
public class SelectFromStatement extends QueryElement<SelectFromStatementParams> {
+
public SelectFromStatement(SelectFromStatementParams selectFromStatementParams) {
super(selectFromStatementParams);
}
@@ -30,11 +31,11 @@ public class SelectFromStatement extends QueryElement<SelectFromStatementParams>
@Override
protected String buildStatement(SelectFromStatementParams params) {
if (params.isSelectWildcard()) {
- return "SELECT * FROM " + params.getIndex();
+ return "SELECT * FROM " + escapeIndex(params.getIndex());
} else {
StringJoiner joiner = new StringJoiner(",");
String queryPrefix = "SELECT ";
- String queryAppendix = " FROM " +params.getIndex();
+ String queryAppendix = " FROM " +escapeIndex(params.getIndex());
params.getSelectedColumns().forEach(column -> {
joiner.add(column.toQueryString());
@@ -42,12 +43,9 @@ public class SelectFromStatement extends QueryElement<SelectFromStatementParams>
return queryPrefix + joiner + queryAppendix;
}
-// if (selectFromStatementParams.isCountOnly()) {
-// return QueryTemplatesV4.selectCountFrom(selectFromStatementParams.getIndex(), selectFromStatementParams.getSelectedColumns());
-// } else if (selectFromStatementParams.getAggregationFunction() == null) {
-// return QueryTemplatesV4.selectFrom(selectFromStatementParams.getIndex(), selectFromStatementParams.getSelectedColumns());
-// } else {
-// return QueryTemplatesV4.selectAggregationFrom(selectFromStatementParams.getIndex(), selectFromStatementParams.getSelectedColumns(), selectFromStatementParams.getAggregationFunction());
-// }
+ }
+
+ private String escapeIndex(String index) {
+ return "\"" + index + "\"";
}
}