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

[jOOQ/jOOQ#8820] Correct schema reference in NEXTVAL() for Postgres

Browse Source 
Postgres NEXTVAL() and CURRVAL() require a string literal as argument.
This commit corrects the quote escaping in this string literal.

Also the syntax for H2 is changed from `nextval('my_schema',
'my_sequence')` to `my_schema.my_sequence.nextval`.
This commit is contained in:
Knut Wannheden 2019-06-21 11:14:31 +02:00
parent db915f77f7
commit e027518dbd
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java
View File

@ -43,7 +43,6 @@ import static org.jooq.SQLDialect.CUBRID;
import static org.jooq.SQLDialect.FIREBIRD;
import static org.jooq.SQLDialect.HSQLDB;
// ...
import static org.jooq.impl.DSL.inline;
import static org.jooq.impl.DSL.select;
import static org.jooq.impl.Keywords.F_GEN_ID;
import static org.jooq.impl.Keywords.K_CURRENT_VALUE_FOR;
@ -145,6 +144,7 @@ public class SequenceImpl<T extends Number> extends AbstractNamed implements Seq
SQLDialect family = configuration.family();
switch (family) {
case H2:
@ -156,10 +156,9 @@ public class SequenceImpl<T extends Number> extends AbstractNamed implements Seq
case POSTGRES:
case H2: {
case POSTGRES: {
ctx.visit(keyword).sql('(');
SequenceImpl.this.accept0(ctx, true);
ctx.sql('\'').stringLiteral(true).visit(SequenceImpl.this).stringLiteral(false).sql('\'');
ctx.sql(')');
break;
}
@ -223,23 +222,13 @@ public class SequenceImpl<T extends Number> extends AbstractNamed implements Seq
@Override
public final void accept(Context<?> ctx) {
accept0(ctx, false);
}
private final void accept0(Context<?> ctx, boolean asStringLiterals) {
Schema mappedSchema = Tools.getMappedSchema(ctx.configuration(), schema);
if (mappedSchema != null && !"".equals(mappedSchema.getName()) && ctx.family() != CUBRID)
if (asStringLiterals)
ctx.visit(inline(mappedSchema.getName()))
.sql(", ");
else
ctx.visit(mappedSchema)
.sql('.');
if (asStringLiterals)
ctx.visit(inline(getName()));
else if (nameIsPlainSQL)
if (nameIsPlainSQL)
ctx.sql(getName());
else
ctx.visit(getUnqualifiedName());