Skip to content

Fixes #1385 and PR#1380 #1386

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 1 commit into from
Oct 22, 2021
Merged

Fixes #1385 and PR#1380 #1386

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
24 changes: 6 additions & 18 deletions src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,12 @@ public void visit(UnPivot unpivot) {
boolean showOptions = unpivot.getIncludeNullsSpecified();
boolean includeNulls = unpivot.getIncludeNulls();
List<Column> unpivotForClause = unpivot.getUnPivotForClause();
buffer.append(" UNPIVOT").append(showOptions && includeNulls ? " INCLUDE NULLS" : "")
.append(showOptions && !includeNulls ? " EXCULDE NULLS" : "").append(" (")
.append(unpivot.getUnPivotClause()).append(" FOR ")
.append(PlainSelect.getStringList(unpivotForClause, true,
buffer
.append(" UNPIVOT")
.append(showOptions && includeNulls ? " INCLUDE NULLS" : "")
.append(showOptions && !includeNulls ? " EXCLUDE NULLS" : "")
.append(" (").append(unpivot.getUnPivotClause())
.append(" FOR ").append(PlainSelect.getStringList(unpivotForClause, true,
unpivotForClause != null && unpivotForClause.size() > 1))
.append(" IN ").append(PlainSelect.getStringList(unpivot.getUnPivotInClause(), true, true)).append(")");
if (unpivot.getAlias() != null) {
Expand Down Expand Up @@ -533,20 +535,6 @@ public void visit(ParenthesisFromItem parenthesis) {
buffer.append("(");
parenthesis.getFromItem().accept(this);

//@todo: investigate, why the Pivot is handled already
// while the UnPivot is NOT handled.
// Something here is wrong and the code below is just a work around

/* handled already somehow somewhere, see Special Oracle Test "pivot07_Parenthesis.sql"
if (parenthesis.getFromItem().getPivot()!=null) {
parenthesis.getFromItem().getPivot().accept(this);
}
*/

if (parenthesis.getFromItem().getUnPivot()!=null) {
parenthesis.getFromItem().getUnPivot().accept(this);
}

buffer.append(")");
if (parenthesis.getAlias() != null) {
buffer.append(parenthesis.getAlias().toString());
Expand Down
2 changes: 1 addition & 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 @@ -2285,7 +2285,7 @@ UnPivot UnPivot():
unpivotInClause = PivotSingleInItems()
")"
")"
[ alias = Alias() ]
[ LOOKAHEAD(2) alias = Alias() ]
{
retval.setUnPivotClause(unpivotClause);
retval.setUnPivotForClause(unpivotForClause);
Expand Down