Skip to content

[IOTDB-4769] When modifying an alias, you need to add back quotes when the alias is a special character. #7745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neuyilan merged 10 commits into from
Nov 4, 2022
Merged

[IOTDB-4769] When modifying an alias, you need to add back quotes when the alias is a special character. #7745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2b56ae9
2022102622
23931017wu Oct 26, 2022
f17c085
LogicalPlanerTest
23931017wu Oct 27, 2022
9a5c475
20221027
23931017wu Oct 27, 2022
96bab5f
IT Test
23931017wu Oct 27, 2022
3687867
20221028
23931017wu Oct 28, 2022
fc26b1b
20221028
23931017wu Oct 28, 2022
dac2de1
Fix the problem that two backquotes of a node are parsed
23931017wu Nov 3, 2022
a748eb1
Update IT
23931017wu Nov 3, 2022
46f13bf
Restore parseNodeString function
23931017wu Nov 3, 2022
d7099ee
Update IT
23931017wu Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ation-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,11 +538,11 @@ public void testAliasInResultColumn() {
@Test
public void testAliasInAlterClause() {
String[] alias = {
"b", "test", "`test.1`", "`1``1`", "'test'", "\"test\"", "\"\\\\test\"",
"b", "test", "`test.1`", "`1``1`", "'test'", "\"test\"", "`\\\\test`",
};

String[] res = {
"b", "test", "test.1", "1`1", "test", "test", "\\\\test",
"b", "test", "`test.1`", "`1``1`", "test", "test", "`\\\\test`",
};
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
Expand Down
22 changes: 19 additions & 3 deletions server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ private void parseAlterClause(
public void parseAliasClause(
IoTDBSqlParser.AliasClauseContext ctx, AlterTimeSeriesStatement alterTimeSeriesStatement) {
if (alterTimeSeriesStatement != null && ctx.ALIAS() != null) {
alterTimeSeriesStatement.setAlias(parseAlias(ctx.alias()));
alterTimeSeriesStatement.setAlias(parseAliasNode(ctx.alias()));
}
}

Expand Down Expand Up @@ -1799,17 +1799,33 @@ private String parseIdentifier(String src) {
return src;
}

/** function for parsing Alias. */
// alias

/** function for parsing Alias of ResultColumn . */
private String parseAlias(IoTDBSqlParser.AliasContext ctx) {
String alias;
if (ctx.constant() != null) {
alias = parseStringLiteral(ctx.constant().getText());
alias = parseConstant(ctx.constant());
} else {
alias = parseIdentifier(ctx.identifier().getText());
}
return alias;
}

/** function for parsing AliasNode. */
private String parseAliasNode(IoTDBSqlParser.AliasContext ctx) {
String alias;
if (ctx.constant() != null) {
alias = parseConstant(ctx.constant());
if (PathUtils.isRealNumber(alias)
|| !TsFileConstant.IDENTIFIER_PATTERN.matcher(alias).matches()) {
throw new SQLParserException("Not support for this alias, Please enclose in back quotes.");
}
} else {
alias = parseNodeString(ctx.identifier().getText());
}
return alias;
}
/** Data Control Language (DCL) */

// Create User
Expand Down
21 changes: 18 additions & 3 deletions server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ private void parseAlterClause(
public void parseAliasClause(
IoTDBSqlParser.AliasClauseContext ctx, AlterTimeSeriesOperator alterTimeSeriesOperator) {
if (alterTimeSeriesOperator != null && ctx.ALIAS() != null) {
alterTimeSeriesOperator.setAlias(parseAlias(ctx.alias()));
alterTimeSeriesOperator.setAlias(parseAliasNode(ctx.alias()));
}
}

Expand Down Expand Up @@ -2711,17 +2711,32 @@ private void checkIdentifier(String src) {

// alias

/** function for parsing Alias. */
/** function for parsing Alias of ResultColumn . */
private String parseAlias(IoTDBSqlParser.AliasContext ctx) {
String alias;
if (ctx.constant() != null) {
alias = parseStringLiteral(ctx.constant().getText());
alias = parseConstant(ctx.constant());
} else {
alias = parseIdentifier(ctx.identifier().getText());
}
return alias;
}

/** function for parsing AliasNode. */
private String parseAliasNode(IoTDBSqlParser.AliasContext ctx) {
String alias;
if (ctx.constant() != null) {
alias = parseConstant(ctx.constant());
if (PathUtils.isRealNumber(alias)
|| !TsFileConstant.IDENTIFIER_PATTERN.matcher(alias).matches()) {
throw new SQLParserException("Not support for this alias, Please enclose in back quotes.");
}
} else {
alias = parseNodeString(ctx.identifier().getText());
}
return alias;
}

/** function for parsing datetime literal. */
public long parseDateFormat(String timestampStr) throws SQLParserException {
if (timestampStr == null || "".equals(timestampStr.trim())) {
Expand Down