Skip to content

Commit

Permalink
Merge pull request #4825 from ShenFeng312/master
Browse files Browse the repository at this point in the history 
fix #4817
  • Loading branch information
@wenshao
wenshao committed Sep 10, 2022
2 parents 8d432cb + edb8bd1 commit 2e8f32e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5419,14 +5419,14 @@ public boolean visit(SQLExternalRecordFormat x) {
public boolean visit(MySqlJSONTableExpr x) {
print0(ucase ? "JSON_TABLE(" : "json_table(");
x.getExpr().accept(this);
print(' ');
print(',');
x.getPath().accept(this);
incrementIndent();
println();
print0(ucase ? "COLUMNS (" : "columns (");
incrementIndent();
println();
printlnAndAccept(x.getColumns(), ", ");
printlnAndAccept(x.getColumns(), ",");
decrementIndent();
println();
print(')');
Expand Down
44 changes: 22 additions & 22 deletions src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_316_json_table.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ public void test_0() throws Exception {
System.out.println(stmt.toString());

assertEquals("SELECT *\n" +
"FROM JSON_TABLE('[ {\"c1\": null} ]' '$[*]'\n" +
"FROM JSON_TABLE('[ {\"c1\": null} ]','$[*]'\n" +
"\tCOLUMNS (\n" +
"\t\tc1 INT PATH '$.c1' DEFAULT ERROR ON ERROR\n" +
"\t)\n" +
") jt;", stmt.toString());

assertEquals("select *\n" +
"from json_table('[ {\"c1\": null} ]' '$[*]'\n" +
"from json_table('[ {\"c1\": null} ]','$[*]'\n" +
"\tcolumns (\n" +
"\t\tc1 INT path '$.c1' default ERROR on error\n" +
"\t)\n" +
Expand Down Expand Up @@ -84,21 +84,21 @@ public void test_1() throws Exception {
System.out.println(stmt.toString());

assertEquals("SELECT *\n" +
"FROM JSON_TABLE('[{\"a\":\"3\"},{\"a\":2},{\"b\":1},{\"a\":0},{\"a\":[1,2]}]' '$[*]'\n" +
"FROM JSON_TABLE('[{\"a\":\"3\"},{\"a\":2},{\"b\":1},{\"a\":0},{\"a\":[1,2]}]','$[*]'\n" +
"\tCOLUMNS (\n" +
"\t\trowid, \n" +
"\t\tac VARCHAR(100) PATH '$.a' DEFAULT '111' ON EMPTY DEFAULT '999' ON ERROR, \n" +
"\t\taj JSON PATH '$.a' DEFAULT '{\"x\": 333}' ON EMPTY, \n" +
"\t\trowid,\n" +
"\t\tac VARCHAR(100) PATH '$.a' DEFAULT '111' ON EMPTY DEFAULT '999' ON ERROR,\n" +
"\t\taj JSON PATH '$.a' DEFAULT '{\"x\": 333}' ON EMPTY,\n" +
"\t\tbx INT EXISTS PATH '$.b'\n" +
"\t)\n" +
") tt;", stmt.toString());

assertEquals("select *\n" +
"from json_table('[{\"a\":\"3\"},{\"a\":2},{\"b\":1},{\"a\":0},{\"a\":[1,2]}]' '$[*]'\n" +
"from json_table('[{\"a\":\"3\"},{\"a\":2},{\"b\":1},{\"a\":0},{\"a\":[1,2]}]','$[*]'\n" +
"\tcolumns (\n" +
"\t\trowid, \n" +
"\t\tac VARCHAR(100) path '$.a' default '111' on empty default '999' on error, \n" +
"\t\taj JSON path '$.a' default '{\"x\": 333}' on empty, \n" +
"\t\trowid,\n" +
"\t\tac VARCHAR(100) path '$.a' default '111' on empty default '999' on error,\n" +
"\t\taj JSON path '$.a' default '{\"x\": 333}' on empty,\n" +
"\t\tbx INT exists path '$.b'\n" +
"\t)\n" +
") tt;", stmt.toLowerCaseString());
Expand Down Expand Up @@ -135,19 +135,19 @@ public void test_2() throws Exception {
System.out.println(stmt.toString());

assertEquals("SELECT *\n" +
"FROM JSON_TABLE('[{\"a\": 1, \"b\": [11,111]}, {\"a\": 2, \"b\": [22,222]}]' '$[*]'\n" +
"FROM JSON_TABLE('[{\"a\": 1, \"b\": [11,111]}, {\"a\": 2, \"b\": [22,222]}]','$[*]'\n" +
"\tCOLUMNS (\n" +
"\t\ta INT PATH '$.a', \n" +
"\t\tNESTED PATH '$.b[*]' COLUMNS (b1 INT PATH '$'), \n" +
"\t\ta INT PATH '$.a',\n" +
"\t\tNESTED PATH '$.b[*]' COLUMNS (b1 INT PATH '$'),\n" +
"\t\tNESTED PATH '$.b[*]' COLUMNS (b2 INT PATH '$')\n" +
"\t)\n" +
") jt;", stmt.toString());

assertEquals("select *\n" +
"from json_table('[{\"a\": 1, \"b\": [11,111]}, {\"a\": 2, \"b\": [22,222]}]' '$[*]'\n" +
"from json_table('[{\"a\": 1, \"b\": [11,111]}, {\"a\": 2, \"b\": [22,222]}]','$[*]'\n" +
"\tcolumns (\n" +
"\t\ta INT path '$.a', \n" +
"\t\tNESTED path '$.b[*]' columns (b1 INT path '$'), \n" +
"\t\ta INT path '$.a',\n" +
"\t\tNESTED path '$.b[*]' columns (b1 INT path '$'),\n" +
"\t\tNESTED path '$.b[*]' columns (b2 INT path '$')\n" +
"\t)\n" +
") jt;", stmt.toLowerCaseString());
Expand Down Expand Up @@ -194,10 +194,10 @@ public void test_3() throws Exception {
"FROM JSON_TABLE('[{\"a\": \"a_val\",\n" +
" \"b\": [{\"c\": \"c_val\", \"l\": [1,2]}]},\n" +
" {\"a\": \"a_val\",\n" +
" \"b\": [{\"c\": \"c_val\",\"l\": [11]}, {\"c\": \"c_val\", \"l\": [22]}]}]' '$[*]'\n" +
" \"b\": [{\"c\": \"c_val\",\"l\": [11]}, {\"c\": \"c_val\", \"l\": [22]}]}]','$[*]'\n" +
"\tCOLUMNS (\n" +
"\t\ttop_ord, \n" +
"\t\tapath VARCHAR(10) PATH '$.a', \n" +
"\t\ttop_ord,\n" +
"\t\tapath VARCHAR(10) PATH '$.a',\n" +
"\t\tNESTED PATH '$.b[*]' COLUMNS (bpath VARCHAR(10) PATH '$.c', ord, NESTED PATH '$.l[*]' COLUMNS (lpath varchar(10) PATH '$'))\n" +
"\t)\n" +
") jt;", stmt.toString());
Expand All @@ -206,10 +206,10 @@ public void test_3() throws Exception {
"from json_table('[{\"a\": \"a_val\",\n" +
" \"b\": [{\"c\": \"c_val\", \"l\": [1,2]}]},\n" +
" {\"a\": \"a_val\",\n" +
" \"b\": [{\"c\": \"c_val\",\"l\": [11]}, {\"c\": \"c_val\", \"l\": [22]}]}]' '$[*]'\n" +
" \"b\": [{\"c\": \"c_val\",\"l\": [11]}, {\"c\": \"c_val\", \"l\": [22]}]}]','$[*]'\n" +
"\tcolumns (\n" +
"\t\ttop_ord, \n" +
"\t\tapath VARCHAR(10) path '$.a', \n" +
"\t\ttop_ord,\n" +
"\t\tapath VARCHAR(10) path '$.a',\n" +
"\t\tNESTED path '$.b[*]' columns (bpath VARCHAR(10) path '$.c', ord, NESTED path '$.l[*]' columns (lpath varchar(10) path '$'))\n" +
"\t)\n" +
") jt;", stmt.toLowerCaseString());
Expand Down

0 comments on commit 2e8f32e

Please sign in to comment.