[flink] branch release-1.10 updated: [FLINK-15175][sql client] Fix SqlClient not support with..select statement

[kurt]

This is an automated email from the ASF dual-hosted git repository.

kurt pushed a commit to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.10 by this push:
     new 3af8e1e  [FLINK-15175][sql client] Fix SqlClient not support 
with..select statement
3af8e1e is described below

commit 3af8e1ef31aa61cf08ed910df32a1a26dd26f892
Author: Liupengcheng <liupengch...@xiaomi.com>
AuthorDate: Wed Dec 18 15:13:41 2019 +0800

    [FLINK-15175][sql client] Fix SqlClient not support with..select statement
    
    This closes #10619
---
 .../java/org/apache/flink/table/client/cli/SqlCommandParser.java    | 2 +-
 .../org/apache/flink/table/client/cli/SqlCommandParserTest.java     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCommandParser.java
 
b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCommandParser.java
index da1fd94..a01b3c0 100644
--- 
a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCommandParser.java
+++ 
b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCommandParser.java
@@ -120,7 +120,7 @@ public final class SqlCommandParser {
                        SINGLE_OPERAND),
 
                SELECT(
-                       "(SELECT.*)",
+                       "(WITH.*SELECT.*|SELECT.*)",
                        SINGLE_OPERAND),
 
                INSERT_INTO(
diff --git 
a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/SqlCommandParserTest.java
 
b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/SqlCommandParserTest.java
index b5bad48..718a5cb 100644
--- 
a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/SqlCommandParserTest.java
+++ 
b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/SqlCommandParserTest.java
@@ -56,6 +56,12 @@ public class SqlCommandParserTest {
                        "   SELECT  complicated FROM table    ",
                        new SqlCommandCall(SqlCommand.SELECT, new 
String[]{"SELECT  complicated FROM table"}));
                testValidSqlCommand(
+                       "WITH t as (select complicated from table) select 
complicated from t",
+                       new SqlCommandCall(SqlCommand.SELECT, new 
String[]{"WITH t as (select complicated from table) select complicated from 
t"}));
+               testValidSqlCommand(
+                       "   WITH t as (select complicated from table) select 
complicated from t    ",
+                       new SqlCommandCall(SqlCommand.SELECT, new 
String[]{"WITH t as (select complicated from table) select complicated from 
t"}));
+               testValidSqlCommand(
                        "INSERT INTO other SELECT 1+1",
                        new SqlCommandCall(SqlCommand.INSERT_INTO, new 
String[]{"INSERT INTO other SELECT 1+1"}));
                testValidSqlCommand(