diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java index 0ef5cca501..bb0d037099 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java @@ -441,25 +441,27 @@ abstract class AbstractDataType extends AbstractNamed implements DataType // be a lot of data types constructed with a 0 value instead of // a null value, historically, so removing this check would // introduce a lot of regressions! - if (lengthDefined() && length() > 0) + if (lengthDefined() && length() > 0) { return castTypePrefix0() + "(" + length() + ")" + castTypeSuffix0(); - - - - - - - else if (precisionDefined() && (isTimestamp() || precision() > 0)) + } + else if (precisionDefined() && (isTimestamp() || precision() > 0)) { // [#8029] Not all dialects support precision on timestamp // syntax, possibly despite there being explicit or implicit // precision support in DDL. if (isTimestamp() && NO_SUPPORT_TIMESTAMP_PRECISION.contains(dialect)) return castTypePrefix0() + castTypeSuffix0(); + + + + + + else if (scaleDefined() && scale() > 0) return castTypePrefix0() + "(" + precision() + ", " + scale() + ")" + castTypeSuffix0(); else return castTypePrefix0() + "(" + precision() + ")" + castTypeSuffix0(); + } else return castTypeName0(); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Diff.java b/jOOQ/src/main/java/org/jooq/impl/Diff.java index a81c351203..fc9962293b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Diff.java +++ b/jOOQ/src/main/java/org/jooq/impl/Diff.java @@ -49,11 +49,7 @@ import static org.jooq.impl.ConstraintType.CHECK; import static org.jooq.impl.ConstraintType.FOREIGN_KEY; import static org.jooq.impl.ConstraintType.PRIMARY_KEY; import static org.jooq.impl.ConstraintType.UNIQUE; -import static org.jooq.impl.DSL.bitAnd; -import static org.jooq.impl.DSL.greatest; -import static org.jooq.impl.DSL.inline; import static org.jooq.impl.DSL.noCondition; -import static org.jooq.impl.DSL.when; import static org.jooq.impl.Tools.NO_SUPPORT_TIMESTAMP_PRECISION; import static org.jooq.tools.StringUtils.defaultIfNull; import static org.jooq.tools.StringUtils.defaultString; diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index 287acd4415..df88d9dfdc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -5142,11 +5142,6 @@ final class Tools { - - - - - else { ctx.sql(typeName); }