diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/HSQLDBTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/HSQLDBTemplates.java index 7d5bb5e7e..b349e4aea 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/HSQLDBTemplates.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/HSQLDBTemplates.java @@ -51,6 +51,7 @@ public class HSQLDBTemplates extends SQLTemplates { setAutoIncrement(" identity"); setDefaultValues("\ndefault values"); setFunctionJoinsWrapped(true); + setUnionsWrapped(false); setPrecedence(Precedence.ARITH_HIGH, Ops.CONCAT); setPrecedence(Precedence.ARITH_LOW + 1, Ops.NOT); diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java index 1dc2ba0b1..34404c064 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java @@ -69,20 +69,38 @@ public abstract class AbstractSQLTemplatesTest { select(three)); if (templates.getDummyTable() == null) { - assertEquals( - "(select 1 as col1)\n" + - "union\n" + - "(select 2)\n" + - "union\n" + - "(select 3)", union.toString()); + if (templates.isUnionsWrapped()) { + assertEquals( + "(select 1 as col1)\n" + + "union\n" + + "(select 2)\n" + + "union\n" + + "(select 3)", union.toString()); + } else { + assertEquals( + "select 1 as col1)\n" + + "union\n" + + "select 2\n" + + "union\n" + + "select 3", union.toString()); + } } else { String dummyTable = templates.getDummyTable(); - assertEquals( - "(select 1 as col1 from " + dummyTable + ")\n" + - "union\n" + - "(select 2 from " + dummyTable + ")\n" + - "union\n" + - "(select 3 from " + dummyTable + ")", union.toString()); + if (templates.isUnionsWrapped()) { + assertEquals( + "(select 1 as col1 from " + dummyTable + ")\n" + + "union\n" + + "(select 2 from " + dummyTable + ")\n" + + "union\n" + + "(select 3 from " + dummyTable + ")", union.toString()); + } else { + assertEquals( + "select 1 as col1 from " + dummyTable + "\n" + + "union\n" + + "select 2 from " + dummyTable + "\n" + + "union\n" + + "select 3 from " + dummyTable, union.toString()); + } } }