CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-13 21:01:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#1961 HSQLDB dont use parenthes in Union.

Browse Source
This commit is contained in:
Robert Csakany 2016-07-18 11:32:05 +02:00 committed by Robert Csakany
parent 15b8ab7c38
commit 6aad783de4
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
querydsl-sql/src/main/java/com/querydsl/sql/HSQLDBTemplates.java
View File

@ -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);

42
querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java
View File

@ -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());
}
}
}