[
https://issues.apache.org/jira/browse/BEAM-4533?focusedWorklogId=111948&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-111948
]
ASF GitHub Bot logged work on BEAM-4533:
----------------------------------------
Author: ASF GitHub Bot
Created on: 14/Jun/18 17:39
Start Date: 14/Jun/18 17:39
Worklog Time Spent: 10m
Work Description: XuMingmin closed pull request #5601: [BEAM-4533] [SQL]
Support unquoted table types
URL: https://github.com/apache/beam/pull/5601
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl
b/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl
index c7f1b014304..0e9894c90ba 100644
--- a/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl
+++ b/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl
@@ -151,7 +151,7 @@ SqlCreate SqlCreateTable(Span s, boolean replace) :
final boolean ifNotExists;
final SqlIdentifier id;
List<Schema.Field> fieldList = null;
- SqlNode type = null;
+ final SqlNode type;
SqlNode comment = null;
SqlNode location = null;
SqlNode tblProperties = null;
@@ -160,7 +160,12 @@ SqlCreate SqlCreateTable(Span s, boolean replace) :
<TABLE> ifNotExists = IfNotExistsOpt()
id = CompoundIdentifier()
fieldList = FieldListParens()
- <TYPE> type = StringLiteral()
+ <TYPE>
+ (
+ type = StringLiteral()
+ |
+ type = SimpleIdentifier()
+ )
[ <COMMENT> comment = StringLiteral() ]
[ <LOCATION> location = StringLiteral() ]
[ <TBLPROPERTIES> tblProperties = StringLiteral() ]
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCreateTable.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCreateTable.java
index 1955c4c47b7..c8496ff9767 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCreateTable.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCreateTable.java
@@ -23,6 +23,7 @@
import com.alibaba.fastjson.JSONObject;
import java.util.List;
+import javax.annotation.Nullable;
import org.apache.beam.sdk.extensions.sql.impl.BeamCalciteSchema;
import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils;
import org.apache.beam.sdk.extensions.sql.meta.Table;
@@ -148,8 +149,14 @@ private void unparseColumn(SqlWriter writer, Schema.Field
column) {
}
}
- private String getString(SqlNode n) {
- return n == null ? null : ((NlsString) SqlLiteral.value(n)).getValue();
+ private @Nullable String getString(SqlNode n) {
+ if (n == null) {
+ return null;
+ }
+ if (n instanceof SqlIdentifier) {
+ return ((SqlIdentifier) n).toString();
+ }
+ return ((NlsString) SqlLiteral.value(n)).getValue();
}
private Table toTable() {
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/parser/BeamDDLTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/parser/BeamDDLTest.java
index 93a73226c86..e44a0c1b137 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/parser/BeamDDLTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/parser/BeamDDLTest.java
@@ -129,6 +129,25 @@ public void testParseCreateTable_withoutLocation() throws
Exception {
tableProvider.getTables().get("person"));
}
+ @Test
+ public void testParseCreateTable_minimal() throws Exception {
+ TestTableProvider tableProvider = new TestTableProvider();
+ BeamSqlEnv env = BeamSqlEnv.withTableProvider(tableProvider);
+
+ env.executeDdl("CREATE TABLE person (id INT) TYPE text");
+
+ assertEquals(
+ Table.builder()
+ .name("person")
+ .type("text")
+ .schema(
+ Stream.of(Schema.Field.of("id",
CalciteUtils.INTEGER).withNullable(true))
+ .collect(toSchema()))
+ .properties(new JSONObject())
+ .build(),
+ tableProvider.getTables().get("person"));
+ }
+
@Test
public void testParseDropTable() throws Exception {
TestTableProvider tableProvider = new TestTableProvider();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 111948)
Time Spent: 2h 10m (was: 2h)
> Beam SQL should support unquoted types
> --------------------------------------
>
> Key: BEAM-4533
> URL: https://issues.apache.org/jira/browse/BEAM-4533
> Project: Beam
> Issue Type: Bug
> Components: dsl-sql
> Reporter: Andrew Pilloud
> Assignee: Andrew Pilloud
> Priority: Major
> Time Spent: 2h 10m
> Remaining Estimate: 0h
>
> TYPE text in addition to TYPE 'text'
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
