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

[jOOQ/jOOQ#10399] DataType.defaultValue() and DataType.identity() shouldn't be mutually exclusive

Browse Source 
This also fixes:

[jOOQ/jOOQ#10398] <syntheticIdentities/> doesn't set DataType.identity(true) in generated code
This commit is contained in:
Lukas Eder 2020-07-15 12:39:04 +02:00
parent 299f98616a
commit 59088d30c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,7 @@ abstract class AbstractDataType<T> extends AbstractNamed implements DataType<T>
@Override
public final DataType<T> identity(boolean i) {
return construct(precision0(), scale0(), length0(), i ? NOT_NULL : nullability(), collation(), characterSet(), i, i ? null : defaultValue());
return construct(precision0(), scale0(), length0(), i ? NOT_NULL : nullability(), collation(), characterSet(), i, defaultValue());
}
@Override
@ -172,7 +172,7 @@ abstract class AbstractDataType<T> extends AbstractNamed implements DataType<T>
@Override
public final DataType<T> default_(Field<T> d) {
return construct(precision0(), scale0(), length0(), nullability(), collation(), characterSet(), d != null ? false : identity(), d);
return construct(precision0(), scale0(), length0(), nullability(), collation(), characterSet(), identity(), d);
}
@Override