From fddd51b3fda87ba7f5c60b6f512bb41fe9bb8ead Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 16 Jul 2020 10:34:15 +0200
Subject: [PATCH] [jOOQ/jOOQ#10399] Fixed Derby code generator

---
 .../main/java/org/jooq/meta/derby/DerbyTableDefinition.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/DerbyTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/DerbyTableDefinition.java
index 97ccfd1e23..e73033a880 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/DerbyTableDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/DerbyTableDefinition.java
@@ -39,6 +39,7 @@
 package org.jooq.meta.derby;
 
 import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.when;
 import static org.jooq.impl.SQLDataType.VARCHAR;
 import static org.jooq.meta.derby.sys.tables.Syscolumns.SYSCOLUMNS;
 
@@ -77,7 +78,7 @@ public class DerbyTableDefinition extends AbstractTableDefinition {
                 Syscolumns.COLUMNNAME,
                 Syscolumns.COLUMNNUMBER,
                 Syscolumns.COLUMNDATATYPE,
-                Syscolumns.COLUMNDEFAULT,
+                when(Syscolumns.AUTOINCREMENTINC.isNull(), Syscolumns.COLUMNDEFAULT).as(Syscolumns.COLUMNDEFAULT),
                 Syscolumns.AUTOINCREMENTINC)
             .from(SYSCOLUMNS)
             // [#1241] Suddenly, bind values didn't work any longer, here...