Skip to content

Issue1673 case within brackets #1675

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
wumpz merged 7 commits into from
Jan 31, 2023
Merged

Issue1673 case within brackets #1675

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09c2fb7
fix: add missing public Getter
manticore-projects Sep 15, 2022
5ecd039
Merge branch 'master' of github.com:JSQLParser/JSqlParser
manticore-projects Oct 14, 2022
05a02eb
Merge branch 'master' of github.com:JSQLParser/JSqlParser
manticore-projects Oct 19, 2022
d5d6e3a
Merge github.com:JSQLParser/JSqlParser
manticore-projects Oct 28, 2022
9dfd527
Merge github.com:JSQLParser/JSqlParser
manticore-projects Nov 6, 2022
065a2f4
Merge https://github.com/JSQLParser/JSqlParser
manticore-projects Nov 27, 2022
e0471b5
fix: Case within brackets
manticore-projects Nov 28, 2022
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
Prev Previous commit
fix: Case within brackets 
fixes #1673
  • Loading branch information
@manticore-projects
manticore-projects committed Nov 28, 2022
commit e0471b5d8ee025f031ee0ddfdd38c38a597ffac7
9 changes: 8 additions & 1 deletion src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2228,10 +2228,17 @@ SelectExpressionItem SelectExpressionItem():
Alias alias = null;
}
{
expression=Expression() { selectExpressionItem = new SelectExpressionItem(); selectExpressionItem.setExpression(expression); }
(
LOOKAHEAD( Condition() ) expression = Condition()
Comment thread
manticore-projects marked this conversation as resolved.
|
LOOKAHEAD( 3 ) expression = ConcatExpression()
|
expression=Expression()
) { selectExpressionItem = new SelectExpressionItem(); selectExpressionItem.setExpression(expression); }
[ LOOKAHEAD(2) alias=Alias() { selectExpressionItem.setAlias(alias); }] { return selectExpressionItem; }
}


SelectItem SelectItem() #SelectItem:
{
SelectItem selectItem = null;
Expand Down
25 changes: 25 additions & 0 deletions src/test/java/net/sf/jsqlparser/expression/CaseExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,29 @@ public void testCaseAndSwitch() throws JSQLParserException {
public void testCaseOrSwitch() throws JSQLParserException {
TestUtils.assertExpressionCanBeParsedAndDeparsed("CASE true OR false WHEN true THEN 1 ELSE 2 END", true);
}

@Test
public void testCaseInsideBrackets() throws JSQLParserException {
String sqlStr = "SELECT ( CASE\n"
+ " WHEN something\n"
+ " THEN CASE\n"
+ " WHEN something2\n"
+ " THEN 1\n"
+ " ELSE 0\n"
+ " END + 1\n"
+ " ELSE 0\n"
+ " END ) + 1 \n"
+ "FROM test";

TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);

sqlStr = "SELECT\n"
+ "(CASE WHEN FIELD_A=0 THEN FIELD_B\n"
+ "WHEN FIELD_C >FIELD_D THEN (CASE WHEN FIELD_A>0 THEN\n"
+ "(FIELD_B)/(FIELD_A/(DATEDIFF(DAY,:started,:end)+1))\n"
+ "ELSE 0 END)-FIELD_D ELSE 0 END)*FIELD_A/(DATEDIFF(DAY,:started,:end)+1) AS UNNECESSARY_COMPLEX_EXPRESSION\n"
+ "FROM TEST";

TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
}
}