honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: Polish parsing of CAST expression (#40428) 

(cherry picked from commit 9d291aa300bbb827eeae606e7d3e55eeef7cce00)
This commit is contained in:
Costin Leau 2019-03-26 13:38:58 +02:00 committed by Costin Leau
parent fe05a4d511
commit 33737b6b21
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java
View File

@ -387,11 +387,7 @@ abstract class ExpressionBuilder extends IdentifierBuilder {
@Override @Override
public DataType visitPrimitiveDataType(PrimitiveDataTypeContext ctx) { public DataType visitPrimitiveDataType(PrimitiveDataTypeContext ctx) {
String type = visitIdentifier(ctx.identifier()); return dataType(source(ctx), visitIdentifier(ctx.identifier()));
DataType dataType = DataType.fromSqlOrEsType(type);
if (dataType == null) {
throw new ParsingException(source(ctx), "Does not recognize type [{}]", type); }
return dataType;
} }
// //
@ -404,24 +400,20 @@ abstract class ExpressionBuilder extends IdentifierBuilder {
return new Cast(source(castTc), expression(castTc.expression()), typedParsing(castTc.dataType(), DataType.class)); return new Cast(source(castTc), expression(castTc.expression()), typedParsing(castTc.dataType(), DataType.class));
} else { } else {
ConvertTemplateContext convertTc = ctx.convertTemplate(); ConvertTemplateContext convertTc = ctx.convertTemplate();
String convertDataType = convertTc.dataType().getText().toUpperCase(Locale.ROOT); DataType dataType = dataType(source(convertTc.dataType()), convertTc.dataType().getText());
DataType dataType;
if (convertDataType.startsWith("SQL_")) {
dataType = DataType.fromOdbcType(convertDataType);
if (dataType == null) {
throw new ParsingException(source(convertTc.dataType()), "Invalid data type [{}] provided", convertDataType);
}
} else {
try {
dataType = DataType.valueOf(convertDataType);
} catch (IllegalArgumentException e) {
throw new ParsingException(source(convertTc.dataType()), "Invalid data type [{}] provided", convertDataType);
}
}
return new Cast(source(convertTc), expression(convertTc.expression()), dataType); return new Cast(source(convertTc), expression(convertTc.expression()), dataType);
} }
} }
private static DataType dataType(Source ctx, String string) {
String type = string.toUpperCase(Locale.ROOT);
DataType dataType = type.startsWith("SQL_") ? DataType.fromOdbcType(type) : DataType.fromSqlOrEsType(type);
if (dataType == null) {
throw new ParsingException(ctx, "Does not recognize type [{}]", string);
}
return dataType;
}
@Override @Override
public Object visitCastOperatorExpression(SqlBaseParser.CastOperatorExpressionContext ctx) { public Object visitCastOperatorExpression(SqlBaseParser.CastOperatorExpressionContext ctx) {
return new Cast(source(ctx), expression(ctx.valueExpression()), typedParsing(ctx.dataType(), DataType.class)); return new Cast(source(ctx), expression(ctx.valueExpression()), typedParsing(ctx.dataType(), DataType.class));

4
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/parser/ExpressionTests.java
View File

@ -361,12 +361,12 @@ public class ExpressionTests extends ESTestCase {
public void testConvertWithInvalidODBCDataType() { public void testConvertWithInvalidODBCDataType() {
ParsingException ex = expectThrows(ParsingException.class, () -> parser.createExpression("CONVERT(1, SQL_INVALID)")); ParsingException ex = expectThrows(ParsingException.class, () -> parser.createExpression("CONVERT(1, SQL_INVALID)"));
assertEquals("line 1:13: Invalid data type [SQL_INVALID] provided", ex.getMessage()); assertEquals("line 1:13: Does not recognize type [SQL_INVALID]", ex.getMessage());
} }
public void testConvertWithInvalidESDataType() { public void testConvertWithInvalidESDataType() {
ParsingException ex = expectThrows(ParsingException.class, () -> parser.createExpression("CONVERT(1, INVALID)")); ParsingException ex = expectThrows(ParsingException.class, () -> parser.createExpression("CONVERT(1, INVALID)"));
assertEquals("line 1:13: Invalid data type [INVALID] provided", ex.getMessage()); assertEquals("line 1:13: Does not recognize type [INVALID]", ex.getMessage());
} }
public void testCurrentDate() { public void testCurrentDate() {