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

[jOOQ/jOOQ#10317] Deprecate Context.formatIndentLockStart() and formatIndentLockEnd()

Browse Source
This commit is contained in:
Lukas Eder 2020-06-24 12:14:04 +02:00
parent 7aa5bbf6a8
commit 477fa58a44
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ/src/main/java/org/jooq/Context.java
View File

@ -406,7 +406,11 @@ public interface Context<C extends Context<C>> extends Scope {
/**
* Start indenting subsequent SQL at the same level as the current line, if
* {@link Settings#isRenderFormatted()} is set to <code>true</code>.
*
* @deprecated - [#10317] - 3.14.0 - Do not reuse this method. It will be
* removed without replacement.
*/
@Deprecated
@NotNull
C formatIndentLockStart();
@ -430,7 +434,11 @@ public interface Context<C extends Context<C>> extends Scope {
/**
* Stop indenting subsequent SQL at the same level as the current line, if
* {@link Settings#isRenderFormatted()} is set to <code>true</code>.
*
* @deprecated - [#10317] - 3.14.0 - Do not reuse this method. It will be
* removed without replacement.
*/
@Deprecated
@NotNull
C formatIndentLockEnd();

6
jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
View File

@ -409,10 +409,10 @@ final class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
.visit(K_DO_UPDATE)
.formatSeparator()
.visit(K_SET)
.sql(' ')
.formatIndentLockStart()
.formatIndentStart()
.formatSeparator()
.visit(updateMap)
.formatIndentLockEnd();
.formatIndentEnd();
if (condition.hasWhere())
ctx.formatSeparator()

12
jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
View File

@ -549,7 +549,7 @@ final class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
ctx.formatSeparator()
.start(UPDATE_SET)
.visit(K_SET)
.sql(' ');
.separatorRequired(true);
// A multi-row update was specified
if (multiRow != null) {
@ -565,9 +565,10 @@ final class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
map.put(k, Tools.field(v, k));
}
ctx.formatIndentLockStart()
ctx.formatIndentStart()
.formatSeparator()
.visit(map)
.formatIndentLockEnd();
.formatIndentEnd();
}
else {
boolean qualify = ctx.qualify();
@ -610,9 +611,10 @@ final class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
// A regular (non-multi-row) update was specified
else {
ctx.formatIndentLockStart()
ctx.formatIndentStart()
.formatSeparator()
.visit(updateMap)
.formatIndentLockEnd();
.formatIndentEnd();
}
ctx.end(UPDATE_SET);