Avoid rendering unnecessary parenthesis for junctions

hibernate · Jan 31, 2022 · afdedb0 · afdedb0
1 parent cd555de
commit afdedb0
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
@@ -5076,10 +5076,18 @@ public void visitJunction(Junction junction) {
 	}
 
 	private void visitJunctionPredicate(Junction.Nature nature, Predicate p) {
-		if ( p instanceof Junction && nature != ( (Junction) p ).getNature() ) {
-			appendSql( OPEN_PARENTHESIS );
-			p.accept( this );
-			appendSql( CLOSE_PARENTHESIS );
+		if ( p instanceof Junction ) {
+			final Junction junction = (Junction) p;
+			// If we have the same nature, or if this is a disjunction and the operand is a conjunction,
+			// then we don't need parenthesis, because the AND operator binds stronger
+			if ( nature == junction.getNature() || nature == Junction.Nature.DISJUNCTION ) {
+				p.accept( this );
+			}
+			else {
+				appendSql( OPEN_PARENTHESIS );
+				p.accept( this );
+				appendSql( CLOSE_PARENTHESIS );
+			}
 		}
 		else {
 			p.accept( this );