From 59088d30c8b752c44215e2eecd3b638a67b3c9cf Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 15 Jul 2020 12:39:04 +0200
Subject: [PATCH] [jOOQ/jOOQ#10399] DataType.defaultValue() and
 DataType.identity() shouldn't be mutually exclusive

This also fixes:

[jOOQ/jOOQ#10398] <syntheticIdentities/> doesn't set DataType.identity(true) in generated code
---
 jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
index c6c316f448..05f6daf48e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
@@ -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