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

[jOOQ/jOOQ#9603] Change names to conform with SQL standard

Browse Source 
The names of the XML elements in `jooq-meta-3.13.0.xsd` corresponding to
sequence flags have been changed to conform with the SQL standard.

Additionally the type of the numeric sequence flags have been changed
from `Long` to `BigInteger` and consequently also in other APIs from
`Long` to `Number`.
This commit is contained in:
Knut Wannheden 2019-12-05 13:51:48 +01:00
parent c4d6155aeb
commit 791ed71c5b
14 changed files with 169 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
View File

@ -4634,8 +4634,8 @@ public class JavaGenerator extends AbstractGenerator {
typeRef,
sequence.getStartWith() != null ? sequence.getStartWith() + "L" : "null",
sequence.getIncrementBy() != null ? sequence.getIncrementBy() + "L" : "null",
sequence.getMinValue() != null ? sequence.getMinValue() + "L" : "null",
sequence.getMaxValue() != null ? sequence.getMaxValue() + "L" : "null",
sequence.getMinvalue() != null ? sequence.getMinvalue() + "L" : "null",
sequence.getMaxvalue() != null ? sequence.getMaxvalue() + "L" : "null",
sequence.getCycle(),
sequence.getCache() != null ? sequence.getCache() + "L" : "null");
else
@ -4650,8 +4650,8 @@ public class JavaGenerator extends AbstractGenerator {
typeRef,
sequence.getStartWith() != null ? sequence.getStartWith() + "L" : "null",
sequence.getIncrementBy() != null ? sequence.getIncrementBy() + "L" : "null",
sequence.getMinValue() != null ? sequence.getMinValue() + "L" : "null",
sequence.getMaxValue() != null ? sequence.getMaxValue() + "L" : "null",
sequence.getMinvalue() != null ? sequence.getMinvalue() + "L" : "null",
sequence.getMaxvalue() != null ? sequence.getMaxvalue() + "L" : "null",
sequence.getCycle(),
sequence.getCache() != null ? sequence.getCache() + "L" : "null"
);

14
jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java
View File

@ -44,6 +44,7 @@ import static org.jooq.util.xml.jaxb.TableConstraintType.PRIMARY_KEY;
import static org.jooq.util.xml.jaxb.TableConstraintType.UNIQUE;
import java.io.StringWriter;
import java.math.BigInteger;
import java.util.List;
import org.jooq.SortOrder;
@ -62,6 +63,7 @@ import org.jooq.meta.SchemaDefinition;
import org.jooq.meta.SequenceDefinition;
import org.jooq.meta.TableDefinition;
import org.jooq.meta.UniqueKeyDefinition;
import org.jooq.tools.Convert;
import org.jooq.tools.JooqLogger;
import org.jooq.tools.StringUtils;
import org.jooq.util.jaxb.tools.MiniJAXB;
@ -347,12 +349,12 @@ public class XMLGenerator extends AbstractGenerator {
sequence.setNumericPrecision(type.getPrecision());
sequence.setNumericScale(type.getScale());
sequence.setStartWith(se.getStartWith());
sequence.setIncrementBy(se.getIncrementBy());
sequence.setMinValue(se.getMinValue());
sequence.setMaxValue(se.getMaxValue());
sequence.setCycle(se.getCycle());
sequence.setCache(se.getCache());
sequence.setStartValue(Convert.convert(se.getStartWith(), BigInteger.class));
sequence.setIncrement(Convert.convert(se.getIncrementBy(), BigInteger.class));
sequence.setMinimumValue(Convert.convert(se.getMinvalue(), BigInteger.class));
sequence.setMaximumValue(Convert.convert(se.getMaxvalue(), BigInteger.class));
sequence.setCycleOption(se.getCycle());
sequence.setCache(Convert.convert(se.getCache(), BigInteger.class));
is.getSequences().add(sequence);
}

22
jOOQ-meta/src/main/java/org/jooq/meta/DefaultSequenceDefinition.java
View File

@ -44,12 +44,12 @@ public class DefaultSequenceDefinition
extends AbstractTypedElementDefinition<SchemaDefinition>
implements SequenceDefinition {
private Long startWith;
private Long incrementBy;
private Long minValue;
private Long maxValue;
private Number startWith;
private Number incrementBy;
private Number minValue;
private Number maxValue;
private boolean cycle;
private Long cache;
private Number cache;
public DefaultSequenceDefinition(SchemaDefinition schema, String name, DataTypeDefinition type) {
this(schema, name, type, null);
@ -59,7 +59,7 @@ public class DefaultSequenceDefinition
this(schema, name, type, comment, null, null, null, null, false, null);
}
public DefaultSequenceDefinition(SchemaDefinition schema, String name, DataTypeDefinition type, String comment, Long startWith, Long incrementBy, Long minValue, Long maxValue, boolean cycle, Long cache) {
public DefaultSequenceDefinition(SchemaDefinition schema, String name, DataTypeDefinition type, String comment, Number startWith, Number incrementBy, Number minValue, Number maxValue, boolean cycle, Number cache) {
super(schema, name, -1, type, comment);
this.startWith = startWith;
@ -71,22 +71,22 @@ public class DefaultSequenceDefinition
}
@Override
public Long getStartWith() {
public Number getStartWith() {
return startWith;
}
@Override
public Long getIncrementBy() {
public Number getIncrementBy() {
return incrementBy;
}
@Override
public Long getMinValue() {
public Number getMinvalue() {
return minValue;
}
@Override
public Long getMaxValue() {
public Number getMaxvalue() {
return maxValue;
}
@ -96,7 +96,7 @@ public class DefaultSequenceDefinition
}
@Override
public Long getCache() {
public Number getCache() {
return cache;
}
}

14
jOOQ-meta/src/main/java/org/jooq/meta/SequenceDefinition.java
View File

@ -48,29 +48,29 @@ public interface SequenceDefinition extends TypedElementDefinition<SchemaDefinit
* Get the start value for this sequence or <code>null</code>, if no such
* value is specified.
*/
Long getStartWith();
Number getStartWith();
/**
* Get the increment for this sequence or <code>null</code>, if no such
* value is specified.
*/
Long getIncrementBy();
Number getIncrementBy();
/**
* Get the minimum value for this sequence or <code>null</code>, if no such
* value is specified.
*/
Long getMinValue();
Number getMinvalue();
/**
* Get the maximum value for this sequence or <code>null</code>, if no such
* value is specified.
*/
Long getMaxValue();
Number getMaxvalue();
/**
* Returns {@code true} if this sequence cycles to {@link #getMinValue()}
* when it reaches {@link #getMaxValue()}.
* Returns {@code true} if this sequence cycles to {@link #getMinvalue()}
* when it reaches {@link #getMaxvalue()}.
*/
boolean getCycle();
@ -78,6 +78,6 @@ public interface SequenceDefinition extends TypedElementDefinition<SchemaDefinit
* Get the number of sequence values to cache for this sequence or
* <code>null</code>, if no such value is specified.
*/
Long getCache();
Number getCache();
}

10
jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java
View File

@ -512,11 +512,11 @@ public class XMLDatabase extends AbstractDatabase {
sequence.getSequenceName(),
type,
sequence.getComment(),
sequence.getStartWith(),
sequence.getIncrementBy(),
sequence.getMinValue(),
sequence.getMaxValue(),
Boolean.TRUE.equals(sequence.isCycle()),
sequence.getStartValue(),
sequence.getIncrement(),
sequence.getMinimumValue(),
sequence.getMaximumValue(),
Boolean.TRUE.equals(sequence.isCycleOption()),
sequence.getCache()));
}
}

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

@ -97,17 +97,17 @@ public interface Sequence<T extends Number> extends Named {
* Get the minimum value for this sequence or <code>null</code>, if no such
* value is specified.
*/
Field<T> getMinValue();
Field<T> getMinvalue();
/**
* Get the maximum value for this sequence or <code>null</code>, if no such
* value is specified.
*/
Field<T> getMaxValue();
Field<T> getMaxvalue();
/**
* Returns {@code true} if this sequence cycles to {@link #getMinValue()}
* when it reaches {@link #getMaxValue()}.
* Returns {@code true} if this sequence cycles to {@link #getMinvalue()}
* when it reaches {@link #getMaxvalue()}.
*/
boolean getCycle();

8
jOOQ/src/main/java/org/jooq/impl/DDL.java
View File

@ -144,13 +144,13 @@ final class DDL {
else if (configuration.defaultSequenceFlags())
result = result.incrementBy(1);
if (sequence.getMinValue() != null)
result = result.minvalue(sequence.getMinValue());
if (sequence.getMinvalue() != null)
result = result.minvalue(sequence.getMinvalue());
else if (configuration.defaultSequenceFlags())
result = result.noMinvalue();
if (sequence.getMaxValue() != null)
result = result.maxvalue(sequence.getMaxValue());
if (sequence.getMaxvalue() != null)
result = result.maxvalue(sequence.getMaxvalue());
else if (configuration.defaultSequenceFlags())
result = result.noMaxvalue();

20
jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java
View File

@ -759,8 +759,8 @@ final class DDLInterpreter {
ms.startWith = query.$startWith();
ms.incrementBy = query.$incrementBy();
ms.minValue = query.$noMinvalue() ? null : query.$minvalue();
ms.maxValue = query.$noMaxvalue() ? null : query.$maxvalue();
ms.minvalue = query.$noMinvalue() ? null : query.$minvalue();
ms.maxvalue = query.$noMaxvalue() ? null : query.$maxvalue();
ms.cycle = query.$cycle();
ms.cache = query.$noCache() ? null : query.$cache();
}
@ -796,15 +796,15 @@ final class DDLInterpreter {
Field<? extends Number> minvalue = query.$minvalue();
if (minvalue != null && (seen |= true))
existing.minValue = minvalue;
existing.minvalue = minvalue;
else if (query.$noMinvalue() && (seen |= true))
existing.minValue = null;
existing.minvalue = null;
Field<? extends Number> maxvalue = query.$maxvalue();
if (maxvalue != null && (seen |= true))
existing.maxValue = maxvalue;
existing.maxvalue = maxvalue;
else if (query.$noMaxvalue() && (seen |= true))
existing.maxValue = null;
existing.maxvalue = null;
Boolean cycle = query.$cycle();
if (cycle != null && (seen |= true))
@ -1517,8 +1517,8 @@ final class DDLInterpreter {
MutableSchema schema;
Field<? extends Number> startWith;
Field<? extends Number> incrementBy;
Field<? extends Number> minValue;
Field<? extends Number> maxValue;
Field<? extends Number> minvalue;
Field<? extends Number> maxvalue;
boolean cycle;
Field<? extends Number> cache;
@ -1538,8 +1538,8 @@ final class DDLInterpreter {
super(MutableSequence.this.name, schema, BIGINT, false,
(Field<Long>) MutableSequence.this.startWith,
(Field<Long>) MutableSequence.this.incrementBy,
(Field<Long>) MutableSequence.this.minValue,
(Field<Long>) MutableSequence.this.maxValue,
(Field<Long>) MutableSequence.this.minvalue,
(Field<Long>) MutableSequence.this.maxvalue,
MutableSequence.this.cycle,
(Field<Long>) MutableSequence.this.cache);
}

17
jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java
View File

@ -43,6 +43,7 @@ import static org.jooq.util.xml.jaxb.TableConstraintType.FOREIGN_KEY;
import static org.jooq.util.xml.jaxb.TableConstraintType.PRIMARY_KEY;
import static org.jooq.util.xml.jaxb.TableConstraintType.UNIQUE;
import java.math.BigInteger;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@ -180,16 +181,16 @@ final class InformationSchemaExport {
iq.setNumericScale(q.getDataType().scale());
if (q.getStartWith() != null)
iq.setStartWith(Convert.convert(q.getStartWith() instanceof Param ? ((Param<?>) q.getStartWith()).getValue() : q.getStartWith().toString(), Long.class));
iq.setStartValue(Convert.convert(q.getStartWith() instanceof Param ? ((Param<?>) q.getStartWith()).getValue() : q.getStartWith().toString(), BigInteger.class));
if (q.getIncrementBy() != null)
iq.setIncrementBy(Convert.convert(q.getIncrementBy() instanceof Param ? ((Param<?>) q.getIncrementBy()).getValue() : q.getIncrementBy().toString(), Long.class));
if (q.getMinValue() != null)
iq.setMinValue(Convert.convert(q.getMinValue() instanceof Param ? ((Param<?>) q.getMinValue()).getValue() : q.getMinValue().toString(), Long.class));
if (q.getMaxValue() != null)
iq.setMaxValue(Convert.convert(q.getMaxValue() instanceof Param ? ((Param<?>) q.getMaxValue()).getValue() : q.getMaxValue().toString(), Long.class));
iq.setCycle(q.getCycle());
iq.setIncrement(Convert.convert(q.getIncrementBy() instanceof Param ? ((Param<?>) q.getIncrementBy()).getValue() : q.getIncrementBy().toString(), BigInteger.class));
if (q.getMinvalue() != null)
iq.setMinimumValue(Convert.convert(q.getMinvalue() instanceof Param ? ((Param<?>) q.getMinvalue()).getValue() : q.getMinvalue().toString(), BigInteger.class));
if (q.getMaxvalue() != null)
iq.setMaximumValue(Convert.convert(q.getMaxvalue() instanceof Param ? ((Param<?>) q.getMaxvalue()).getValue() : q.getMaxvalue().toString(), BigInteger.class));
iq.setCycleOption(q.getCycle());
if (q.getCache() != null)
iq.setCache(Convert.convert(q.getCache() instanceof Param ? ((Param<?>) q.getCache()).getValue() : q.getCache().toString(), Long.class));
iq.setCache(Convert.convert(q.getCache() instanceof Param ? ((Param<?>) q.getCache()).getValue() : q.getCache().toString(), BigInteger.class));
result.getSequences().add(iq);
}

23
jOOQ/src/main/java/org/jooq/impl/InformationSchemaMetaImpl.java
View File

@ -41,6 +41,7 @@ import static org.jooq.impl.DSL.name;
import static org.jooq.impl.Tools.EMPTY_SORTFIELD;
import static org.jooq.util.xml.jaxb.TableConstraintType.PRIMARY_KEY;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@ -448,12 +449,12 @@ final class InformationSchemaMetaImpl extends AbstractMeta {
int precision = xs.getNumericPrecision() == null ? 0 : xs.getNumericPrecision();
int scale = xs.getNumericScale() == null ? 0 : xs.getNumericScale();
boolean nullable = true;
Long startWith = xs.getStartWith();
Long incrementBy = xs.getIncrementBy();
Long minValue = xs.getMinValue();
Long maxValue = xs.getMaxValue();
Boolean cycle = xs.isCycle();
Long cache = xs.getCache();
BigInteger startWith = xs.getStartValue();
BigInteger incrementBy = xs.getIncrement();
BigInteger minvalue = xs.getMinimumValue();
BigInteger maxvalue = xs.getMaximumValue();
Boolean cycle = xs.isCycleOption();
BigInteger cache = xs.getCache();
@SuppressWarnings({ "rawtypes", "unchecked" })
InformationSchemaSequence is = new InformationSchemaSequence(
@ -462,8 +463,8 @@ final class InformationSchemaMetaImpl extends AbstractMeta {
type(typeName, length, precision, scale, nullable),
startWith,
incrementBy,
minValue,
maxValue,
minvalue,
maxvalue,
cycle,
cache
);
@ -648,15 +649,15 @@ final class InformationSchemaMetaImpl extends AbstractMeta {
*/
private static final long serialVersionUID = -1246697252597049756L;
InformationSchemaSequence(String name, Schema schema, DataType<N> type, Long startWith, Long incrementBy, Long minValue, Long maxValue, Boolean cycle, Long cache) {
InformationSchemaSequence(String name, Schema schema, DataType<N> type, Number startWith, Number incrementBy, Number minvalue, Number maxvalue, Boolean cycle, Number cache) {
super(DSL.name(name),
schema,
type,
false,
startWith != null ? Tools.field(startWith, type) : null,
incrementBy != null ? Tools.field(incrementBy, type) : null,
minValue != null ? Tools.field(minValue, type) : null,
maxValue != null ? Tools.field(maxValue, type) : null,
minvalue != null ? Tools.field(minvalue, type) : null,
maxvalue != null ? Tools.field(maxvalue, type) : null,
Boolean.TRUE.equals(cycle),
cache != null ? Tools.field(cache, type) : null
);

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

@ -148,7 +148,7 @@ public final class Internal {
/**
* Factory method for sequences.
*/
public static final <T extends Number> Sequence<T> createSequence(String name, Schema schema, DataType<T> type, Long startWith, Long incrementBy, Long minValue, Long maxValue, boolean cycle, Long cache) {
public static final <T extends Number> Sequence<T> createSequence(String name, Schema schema, DataType<T> type, Number startWith, Number incrementBy, Number minvalue, Number maxvalue, boolean cycle, Number cache) {
return new SequenceImpl<>(
DSL.name(name),
schema,
@ -156,8 +156,8 @@ public final class Internal {
false,
startWith != null ? Tools.field(startWith, type) : null,
incrementBy != null ? Tools.field(incrementBy, type) : null,
minValue != null ? Tools.field(minValue, type) : null,
maxValue != null ? Tools.field(maxValue, type) : null,
minvalue != null ? Tools.field(minvalue, type) : null,
maxvalue != null ? Tools.field(maxvalue, type) : null,
cycle,
cache != null ? Tools.field(cache, type) : null
);

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

@ -89,8 +89,8 @@ public class SequenceImpl<T extends Number> extends AbstractNamed implements Seq
private final DataType<T> type;
private final Field<T> startWith;
private final Field<T> incrementBy;
private final Field<T> minValue;
private final Field<T> maxValue;
private final Field<T> minvalue;
private final Field<T> maxvalue;
private final boolean cycle;
private final Field<T> cache;
@ -108,7 +108,7 @@ public class SequenceImpl<T extends Number> extends AbstractNamed implements Seq
}
SequenceImpl(Name name, Schema schema, DataType<T> type, boolean nameIsPlainSQL,
Field<T> startWith, Field<T> incrementBy, Field<T> minValue, Field<T> maxValue, boolean cycle, Field<T> cache) {
Field<T> startWith, Field<T> incrementBy, Field<T> minvalue, Field<T> maxvalue, boolean cycle, Field<T> cache) {
super(qualify(schema, name), CommentImpl.NO_COMMENT);
this.schema = schema;
@ -117,8 +117,8 @@ public class SequenceImpl<T extends Number> extends AbstractNamed implements Seq
this.startWith = startWith;
this.incrementBy = incrementBy;
this.minValue = minValue;
this.maxValue = maxValue;
this.minvalue = minvalue;
this.maxvalue = maxvalue;
this.cycle = cycle;
this.cache = cache;
}
@ -149,13 +149,13 @@ public class SequenceImpl<T extends Number> extends AbstractNamed implements Seq
}
@Override
public final Field<T> getMinValue() {
return minValue;
public final Field<T> getMinvalue() {
return minvalue;
}
@Override
public final Field<T> getMaxValue() {
return maxValue;
public final Field<T> getMaxvalue() {
return maxvalue;
}
@Override

153
jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java
View File

@ -2,6 +2,7 @@
package org.jooq.util.xml.jaxb;
import java.io.Serializable;
import java.math.BigInteger;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@ -29,12 +30,12 @@ import org.jooq.util.jaxb.tools.XMLBuilder;
* &lt;element name="character_maximum_length" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
* &lt;element name="numeric_precision" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
* &lt;element name="numeric_scale" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
* &lt;element name="start_with" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/&gt;
* &lt;element name="increment_by" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/&gt;
* &lt;element name="min_value" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/&gt;
* &lt;element name="max_value" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/&gt;
* &lt;element name="cycle" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
* &lt;element name="cache" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/&gt;
* &lt;element name="start_value" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/&gt;
* &lt;element name="increment" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/&gt;
* &lt;element name="minimum_value" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/&gt;
* &lt;element name="maximum_value" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/&gt;
* &lt;element name="cycle_option" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
* &lt;element name="cache" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/&gt;
* &lt;element name="comment" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;/all&gt;
* &lt;/restriction&gt;
@ -73,16 +74,16 @@ public class Sequence implements Serializable, XMLAppendable
protected Integer numericPrecision;
@XmlElement(name = "numeric_scale")
protected Integer numericScale;
@XmlElement(name = "start_with")
protected Long startWith;
@XmlElement(name = "increment_by")
protected Long incrementBy;
@XmlElement(name = "min_value")
protected Long minValue;
@XmlElement(name = "max_value")
protected Long maxValue;
protected Boolean cycle;
protected Long cache;
@XmlElement(name = "start_value")
protected BigInteger startValue;
protected BigInteger increment;
@XmlElement(name = "minimum_value")
protected BigInteger minimumValue;
@XmlElement(name = "maximum_value")
protected BigInteger maximumValue;
@XmlElement(name = "cycle_option")
protected Boolean cycleOption;
protected BigInteger cache;
@XmlJavaTypeAdapter(StringAdapter.class)
protected String comment;
@ -142,67 +143,67 @@ public class Sequence implements Serializable, XMLAppendable
this.numericScale = value;
}
public Long getStartWith() {
return startWith;
public BigInteger getStartValue() {
return startValue;
}
public void setStartWith(Long value) {
this.startWith = value;
public void setStartValue(BigInteger value) {
this.startValue = value;
}
public Long getIncrementBy() {
return incrementBy;
public BigInteger getIncrement() {
return increment;
}
public void setIncrementBy(Long value) {
this.incrementBy = value;
public void setIncrement(BigInteger value) {
this.increment = value;
}
public Long getMinValue() {
return minValue;
public BigInteger getMinimumValue() {
return minimumValue;
}
public void setMinValue(Long value) {
this.minValue = value;
public void setMinimumValue(BigInteger value) {
this.minimumValue = value;
}
public Long getMaxValue() {
return maxValue;
public BigInteger getMaximumValue() {
return maximumValue;
}
public void setMaxValue(Long value) {
this.maxValue = value;
public void setMaximumValue(BigInteger value) {
this.maximumValue = value;
}
/**
* Gets the value of the cycle property.
* Gets the value of the cycleOption property.
*
* @return
* possible object is
* {@link Boolean }
*
*/
public Boolean isCycle() {
return cycle;
public Boolean isCycleOption() {
return cycleOption;
}
/**
* Sets the value of the cycle property.
* Sets the value of the cycleOption property.
*
* @param value
* allowed object is
* {@link Boolean }
*
*/
public void setCycle(Boolean value) {
this.cycle = value;
public void setCycleOption(Boolean value) {
this.cycleOption = value;
}
public Long getCache() {
public BigInteger getCache() {
return cache;
}
public void setCache(Long value) {
public void setCache(BigInteger value) {
this.cache = value;
}
@ -249,32 +250,32 @@ public class Sequence implements Serializable, XMLAppendable
return this;
}
public Sequence withStartWith(Long value) {
setStartWith(value);
public Sequence withStartValue(BigInteger value) {
setStartValue(value);
return this;
}
public Sequence withIncrementBy(Long value) {
setIncrementBy(value);
public Sequence withIncrement(BigInteger value) {
setIncrement(value);
return this;
}
public Sequence withMinValue(Long value) {
setMinValue(value);
public Sequence withMinimumValue(BigInteger value) {
setMinimumValue(value);
return this;
}
public Sequence withMaxValue(Long value) {
setMaxValue(value);
public Sequence withMaximumValue(BigInteger value) {
setMaximumValue(value);
return this;
}
public Sequence withCycle(Boolean value) {
setCycle(value);
public Sequence withCycleOption(Boolean value) {
setCycleOption(value);
return this;
}
public Sequence withCache(Long value) {
public Sequence withCache(BigInteger value) {
setCache(value);
return this;
}
@ -293,11 +294,11 @@ public class Sequence implements Serializable, XMLAppendable
builder.append("character_maximum_length", characterMaximumLength);
builder.append("numeric_precision", numericPrecision);
builder.append("numeric_scale", numericScale);
builder.append("start_with", startWith);
builder.append("increment_by", incrementBy);
builder.append("min_value", minValue);
builder.append("max_value", maxValue);
builder.append("cycle", cycle);
builder.append("start_value", startValue);
builder.append("increment", increment);
builder.append("minimum_value", minimumValue);
builder.append("maximum_value", maximumValue);
builder.append("cycle_option", cycleOption);
builder.append("cache", cache);
builder.append("comment", comment);
}
@ -384,48 +385,48 @@ public class Sequence implements Serializable, XMLAppendable
return false;
}
}
if (startWith == null) {
if (other.startWith!= null) {
if (startValue == null) {
if (other.startValue!= null) {
return false;
}
} else {
if (!startWith.equals(other.startWith)) {
if (!startValue.equals(other.startValue)) {
return false;
}
}
if (incrementBy == null) {
if (other.incrementBy!= null) {
if (increment == null) {
if (other.increment!= null) {
return false;
}
} else {
if (!incrementBy.equals(other.incrementBy)) {
if (!increment.equals(other.increment)) {
return false;
}
}
if (minValue == null) {
if (other.minValue!= null) {
if (minimumValue == null) {
if (other.minimumValue!= null) {
return false;
}
} else {
if (!minValue.equals(other.minValue)) {
if (!minimumValue.equals(other.minimumValue)) {
return false;
}
}
if (maxValue == null) {
if (other.maxValue!= null) {
if (maximumValue == null) {
if (other.maximumValue!= null) {
return false;
}
} else {
if (!maxValue.equals(other.maxValue)) {
if (!maximumValue.equals(other.maximumValue)) {
return false;
}
}
if (cycle == null) {
if (other.cycle!= null) {
if (cycleOption == null) {
if (other.cycleOption!= null) {
return false;
}
} else {
if (!cycle.equals(other.cycle)) {
if (!cycleOption.equals(other.cycleOption)) {
return false;
}
}
@ -461,11 +462,11 @@ public class Sequence implements Serializable, XMLAppendable
result = ((prime*result)+((characterMaximumLength == null)? 0 :characterMaximumLength.hashCode()));
result = ((prime*result)+((numericPrecision == null)? 0 :numericPrecision.hashCode()));
result = ((prime*result)+((numericScale == null)? 0 :numericScale.hashCode()));
result = ((prime*result)+((startWith == null)? 0 :startWith.hashCode()));
result = ((prime*result)+((incrementBy == null)? 0 :incrementBy.hashCode()));
result = ((prime*result)+((minValue == null)? 0 :minValue.hashCode()));
result = ((prime*result)+((maxValue == null)? 0 :maxValue.hashCode()));
result = ((prime*result)+((cycle == null)? 0 :cycle.hashCode()));
result = ((prime*result)+((startValue == null)? 0 :startValue.hashCode()));
result = ((prime*result)+((increment == null)? 0 :increment.hashCode()));
result = ((prime*result)+((minimumValue == null)? 0 :minimumValue.hashCode()));
result = ((prime*result)+((maximumValue == null)? 0 :maximumValue.hashCode()));
result = ((prime*result)+((cycleOption == null)? 0 :cycleOption.hashCode()));
result = ((prime*result)+((cache == null)? 0 :cache.hashCode()));
result = ((prime*result)+((comment == null)? 0 :comment.hashCode()));
return result;

12
jOOQ/src/main/resources/xsd/jooq-meta-3.13.0.xsd
View File

@ -67,12 +67,12 @@
<element name="character_maximum_length" type="int" minOccurs="0" maxOccurs="1" />
<element name="numeric_precision" type="int" minOccurs="0" maxOccurs="1" />
<element name="numeric_scale" type="int" minOccurs="0" maxOccurs="1" />
<element name="start_with" type="long" minOccurs="0" maxOccurs="1" />
<element name="increment_by" type="long" minOccurs="0" maxOccurs="1" />
<element name="min_value" type="long" minOccurs="0" maxOccurs="1" />
<element name="max_value" type="long" minOccurs="0" maxOccurs="1" />
<element name="cycle" type="boolean" minOccurs="0" maxOccurs="1" />
<element name="cache" type="long" minOccurs="0" maxOccurs="1" />
<element name="start_value" type="integer" minOccurs="0" maxOccurs="1" />
<element name="increment" type="integer" minOccurs="0" maxOccurs="1" />
<element name="minimum_value" type="integer" minOccurs="0" maxOccurs="1" />
<element name="maximum_value" type="integer" minOccurs="0" maxOccurs="1" />
<element name="cycle_option" type="boolean" minOccurs="0" maxOccurs="1" />
<element name="cache" type="integer" minOccurs="0" maxOccurs="1" />
<element name="comment" type="string" minOccurs="0" maxOccurs="1" />
</all>
</complexType>