Skip to content

support collate field option in compare predicate sql from datagrip #4365

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
morningman merged 1 commit into from
Aug 17, 2020
Merged

support collate field option in compare predicate sql from datagrip #4365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions fe/fe-core/src/main/cup/sql_parser.cup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ precedence left LPAREN, RPAREN;
// Support chaining of timestamp arithmetic exprs.
precedence left KW_INTERVAL;
precedence left KW_OVER;
precedence left KW_COLLATE;
precedence left KW_PARTITION;
precedence left KW_PARTITIONS;
precedence right KW_TEMPORARY;
Expand Down Expand Up @@ -3258,7 +3259,7 @@ select_sublist ::=
;

select_list_item ::=
expr:expr opt_collate:collate select_alias:alias
expr:expr select_alias:alias
{:
RESULT = new SelectListItem(expr, alias);
:}
Expand Down Expand Up @@ -3849,7 +3850,7 @@ sign_chain_expr ::=
;

expr ::=
non_pred_expr:e
non_pred_expr:e opt_collate:collate
{: RESULT = e; :}
| predicate:p
{: RESULT = p; :}
Expand Down
12 changes: 12 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,4 +350,16 @@ public void testOuterJoinNullUnionView() throws Exception{
"SELECT v1.k FROM test_view AS v1 LEFT OUTER JOIN test_view AS v2 ON v1.k=v2.k";
dorisAssert.query(sql).explainQuery();
}

@Test
public void testDataGripSupport() throws Exception {
String sql = "select schema();";
dorisAssert.query(sql).explainQuery();
sql = "select\n" +
"collation_name,\n" +
"character_set_name,\n" +
"is_default collate utf8_general_ci = 'Yes' as is_default\n" +
"from information_schema.collations";
dorisAssert.query(sql).explainQuery();
}
}