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

[jOOQ/jOOQ#15989] AbstractJoin.toString() should render SQL with tables declared, not referenced

Browse Source
This commit is contained in:
Lukas Eder 2023-12-22 15:14:56 +01:00
parent e07765fc3e
commit 5487cbdd29
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
View File

@ -38,6 +38,7 @@
package org.jooq.impl;
import static org.jooq.conf.ParamType.INLINED;
import static org.jooq.impl.Tools.CONFIG;
import java.io.IOException;
@ -53,6 +54,7 @@ import org.jooq.DSLContext;
// ...
import org.jooq.QueryPart;
import org.jooq.QueryPartInternal;
import org.jooq.RenderContext;
import org.jooq.exception.DataAccessException;
import org.jooq.exception.SQLDialectNotSupportedException;
import org.jooq.tools.JooqLogger;
@ -185,11 +187,15 @@ abstract class AbstractQueryPart implements QueryPartInternal {
@Override
public String toString() {
try {
// [#8355] Subtypes may have null configuration
Configuration configuration = Tools.configuration(configuration());
return create(configuration.deriveSettings(s -> s.withRenderFormatted(true))).renderInlined(this);
// [#8355] Subtypes may have null configuration
Configuration configuration = Tools.configuration(configuration());
return toString0(create(configuration.deriveSettings(s -> s.withRenderFormatted(true))).renderContext().paramType(INLINED));
}
String toString0(RenderContext ctx) {
try {
return ctx.visit(this).render();
}
catch (SQLDialectNotSupportedException e) {
return "[ ... " + e.getMessage() + " ... ]";

9
jOOQ/src/main/java/org/jooq/impl/JoinTable.java
View File

@ -131,6 +131,7 @@ import org.jooq.Operator;
// ...
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.RenderContext;
// ...
import org.jooq.SQLDialect;
import org.jooq.Table;
@ -961,4 +962,12 @@ abstract class JoinTable<J extends JoinTable<J>> extends AbstractJoinTable<J> {
// -------------------------------------------------------------------------
// XXX: Object API
// -------------------------------------------------------------------------
@Override
String toString0(RenderContext ctx) {
return super.toString0(ctx.declareTables(true));
}
}