github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#3045] DSL.groupConcat() without orderBy() is incorrectly emulated for Oracle

Browse Source
This commit is contained in:
lukaseder 2018-03-13 09:48:58 +01:00
parent d9328672d6
commit 6b941eda98
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jOOQ/src/main/java/org/jooq/impl/Function.java
View File

@ -59,6 +59,7 @@ import static org.jooq.impl.Keywords.K_FIRST;
import static org.jooq.impl.Keywords.K_IGNORE_NULLS;
import static org.jooq.impl.Keywords.K_KEEP;
import static org.jooq.impl.Keywords.K_LAST;
import static org.jooq.impl.Keywords.K_NULL;
import static org.jooq.impl.Keywords.K_ORDER_BY;
import static org.jooq.impl.Keywords.K_OVER;
import static org.jooq.impl.Keywords.K_RESPECT_NULLS;
@ -408,12 +409,15 @@ class Function<T> extends AbstractField<T> implements
* Render <code>WITHIN GROUP (ORDER BY ..)</code> clause
*/
final void toSQLWithinGroupClause(Context<?> ctx) {
if (!withinGroupOrderBy.isEmpty()) {
ctx.sql(' ').visit(K_WITHIN_GROUP)
.sql(" (").visit(K_ORDER_BY)
.sql(' ').visit(withinGroupOrderBy)
.sql(')');
}
ctx.sql(' ').visit(K_WITHIN_GROUP)
.sql(" (").visit(K_ORDER_BY).sql(' ');
if (withinGroupOrderBy.isEmpty())
ctx.visit(K_NULL);
else
ctx.visit(withinGroupOrderBy);
ctx.sql(')');
}
/**

11
jOOQ/src/main/java/org/jooq/impl/GroupConcat.java
View File

@ -89,13 +89,10 @@ final class GroupConcat extends AbstractFunction<String> implements GroupConcatO
final Field<String> getFunction0(Configuration configuration) {
Function<String> result;
if (separator == null) {
result = new Function<String>(Term.LIST_AGG, distinct, SQLDataType.VARCHAR, field);
}
else {
Field<String> literal = inline(separator);
result = new Function<String>(Term.LIST_AGG, distinct, SQLDataType.VARCHAR, field, literal);
}
if (separator == null)
result = new Function<String>(Term.LIST_AGG, distinct, SQLDataType.VARCHAR, field, inline(","));
else
result = new Function<String>(Term.LIST_AGG, distinct, SQLDataType.VARCHAR, field, inline(separator));
return result.withinGroupOrderBy(orderBy);
}