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

[jOOQ/jOOQ#5179] Revert some recent changes related to Informix

Browse Source
This commit is contained in:
Lukas Eder 2020-10-30 15:55:04 +01:00
parent 54607c3105
commit 2c75ee6ac3
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,25 +441,27 @@ abstract class AbstractDataType<T> extends AbstractNamed implements DataType<T>
// 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();
}

4
jOOQ/src/main/java/org/jooq/impl/Diff.java
View File

@ -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;

5
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -5142,11 +5142,6 @@ final class Tools {
else {
ctx.sql(typeName);
}