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

Merge pull request #1063 from querydsl/i1061

Browse Source 
Wrap RelationalFunctionCalls in joins for HSQLDB
This commit is contained in:
Timo Westkämper 2014-11-29 15:13:39 +02:00
commit 813032ccbf
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@ public class HSQLDBTemplates extends SQLTemplates {
setLimitRequired(true);
setAutoIncrement(" identity");
setDefaultValues("\ndefault values");
setFunctionJoinsWrapped(true);
add(Ops.TRIM, "trim(both from {0})");
add(Ops.NEGATE, "{0} * -1", 7);

3
querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
View File

@ -826,7 +826,8 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
@Override
public Void visit(TemplateExpression<?> expr, Void context) {
if (inJoin && templates.isFunctionJoinsWrapped()) {
if (inJoin && expr instanceof RelationalFunctionCall
&& templates.isFunctionJoinsWrapped()) {
append("table(");
super.visit(expr, context);
append(")");

13
querydsl-sql/src/test/java/com/mysema/query/sql/SerializationTest.java
View File

@ -138,6 +138,19 @@ public class SerializationTest {
"on not SURVEY.NAME like tokFunc.prop escape '\\'", q.toString());
}
@Test
public void FunctionCall3() {
RelationalFunctionCall<String> func = RelationalFunctionCall.create(String.class, "TableValuedFunction", "parameter");
PathBuilder<String> funcAlias = new PathBuilder<String>(String.class, "tokFunc");
SQLQuery q = new SQLQuery(new HSQLDBTemplates());
q.from(survey)
.join(func, funcAlias).on(survey.name.like(funcAlias.getString("prop")).not());
assertEquals("from SURVEY SURVEY\n" +
"join table(TableValuedFunction(?)) as tokFunc\n" +
"on not SURVEY.NAME like tokFunc.prop escape '\\'", q.toString());
}
@Test
public void Union() {
SQLQuery q = new SQLQuery(SQLTemplates.DEFAULT);