diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 395befbe55..832450366c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -9462,10 +9462,10 @@ public class DSL { if (name.getName().length < 1 || name.getName().length > 2) throw new IllegalArgumentException("Must provide a qualified name of length 1 or 2 : " + name); - String n = name.getName()[name.getName().length - 1]; - Schema s = name.getName().length == 2 ? schema(name(name.getName()[0])) : null; + Name n = name.unqualifiedName(); + Schema s = name.parts().length == 2 ? schema(name.qualifier()) : null; - return new SequenceImpl(n, s, type); + return new SequenceImpl(n, s, type, false); } /** diff --git a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java index ad107b3cac..a765585b50 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java @@ -52,6 +52,7 @@ import org.jooq.Configuration; import org.jooq.Context; import org.jooq.DataType; import org.jooq.Field; +import org.jooq.Name; import org.jooq.RenderContext; import org.jooq.SQLDialect; import org.jooq.Schema; @@ -73,7 +74,6 @@ public class SequenceImpl extends AbstractNamed implements Seq private static final long serialVersionUID = 6224349401603636427L; private static final Clause[] CLAUSES = { SEQUENCE, SEQUENCE_REFERENCE }; - final String name; final boolean nameIsPlainSQL; final Schema schema; final DataType type; @@ -83,9 +83,12 @@ public class SequenceImpl extends AbstractNamed implements Seq } SequenceImpl(String name, Schema schema, DataType type, boolean nameIsPlainSQL) { - super(qualify(schema, DSL.name(name)), CommentImpl.NO_COMMENT); + this(DSL.name(name), schema, type, nameIsPlainSQL); + } + + SequenceImpl(Name name, Schema schema, DataType type, boolean nameIsPlainSQL) { + super(qualify(schema, name), CommentImpl.NO_COMMENT); - this.name = name; this.schema = schema; this.type = type; this.nameIsPlainSQL = nameIsPlainSQL; @@ -241,11 +244,11 @@ public class SequenceImpl extends AbstractNamed implements Seq .sql('.'); if (asStringLiterals) - ctx.visit(inline(name)); + ctx.visit(inline(getName())); else if (nameIsPlainSQL) - ctx.sql(name); + ctx.sql(getName()); else - ctx.literal(name); + ctx.visit(getUnqualifiedName()); } @Override