@@ -112,7 +112,6 @@ public class ExpressionDeParser extends AbstractDeParser<Expression>
112
112
113
113
private static final String NOT = "NOT " ;
114
114
private SelectVisitor selectVisitor ;
115
- private boolean useBracketsInExprList = true ;
116
115
private OrderByDeParser orderByDeParser = new OrderByDeParser ();
117
116
118
117
public ExpressionDeParser () {
@@ -487,20 +486,13 @@ public void visit(Function function) {
487
486
} else if (function .getParameters () == null && function .getNamedParameters () == null ) {
488
487
buffer .append ("()" );
489
488
} else {
490
- boolean oldUseBracketsInExprList = useBracketsInExprList ;
491
- useBracketsInExprList = !function .isDistinct () &&
492
- !function .isAllColumns () &&
493
- function .getOrderByElements () == null ;
494
- if (!useBracketsInExprList ) {
495
- buffer .append ("(" );
496
- }
489
+ buffer .append ("(" );
497
490
if (function .isDistinct ()) {
498
491
buffer .append ("DISTINCT " );
499
492
} else if (function .isAllColumns ()) {
500
493
buffer .append ("ALL " );
501
494
} else if (function .isUnique ()) {
502
- useBracketsInExprList = false ;
503
- buffer .append ("(UNIQUE " );
495
+ buffer .append ("UNIQUE " );
504
496
}
505
497
if (function .getNamedParameters () != null ) {
506
498
visit (function .getNamedParameters ());
@@ -522,11 +514,7 @@ public void visit(Function function) {
522
514
orderByDeParser .deParseElement (orderByElement );
523
515
}
524
516
}
525
- if (!useBracketsInExprList ) {
526
- buffer .append (")" );
527
- }
528
- useBracketsInExprList = oldUseBracketsInExprList ;
529
-
517
+ buffer .append (")" );
530
518
}
531
519
532
520
if (function .getAttribute () != null ) {
@@ -545,7 +533,7 @@ public void visit(Function function) {
545
533
546
534
@ Override
547
535
public void visit (ExpressionList expressionList ) {
548
- if (useBracketsInExprList ) {
536
+ if (expressionList . isUsingBrackets () ) {
549
537
buffer .append ("(" );
550
538
}
551
539
for (Iterator <Expression > iter = expressionList .getExpressions ().iterator (); iter .hasNext ();) {
@@ -555,16 +543,13 @@ public void visit(ExpressionList expressionList) {
555
543
buffer .append (", " );
556
544
}
557
545
}
558
- if (useBracketsInExprList ) {
546
+ if (expressionList . isUsingBrackets () ) {
559
547
buffer .append (")" );
560
548
}
561
549
}
562
550
563
551
@ Override
564
552
public void visit (NamedExpressionList namedExpressionList ) {
565
- if (useBracketsInExprList ) {
566
- buffer .append ("(" );
567
- }
568
553
List <String > names = namedExpressionList .getNames ();
569
554
List <Expression > expressions = namedExpressionList .getExpressions ();
570
555
for (int i = 0 ; i < names .size (); i ++) {
@@ -578,9 +563,6 @@ public void visit(NamedExpressionList namedExpressionList) {
578
563
}
579
564
expressions .get (i ).accept (this );
580
565
}
581
- if (useBracketsInExprList ) {
582
- buffer .append (")" );
583
- }
584
566
}
585
567
586
568
public SelectVisitor getSelectVisitor () {
0 commit comments