From b4710d2dfbbb3f38334eb8802308b2da389d9844 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Sat, 25 Jun 2016 14:09:25 +0200 Subject: [PATCH] [#5356] Incorrect order of HSQL column definition tokens: DEFAULT and NULL --- jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java index 3b48c93698..2a7278b222 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java @@ -253,7 +253,9 @@ final class CreateTableImpl extends AbstractQuery implements .sql(' '); Tools.toSQLDDLTypeDeclaration(ctx, type); - if (asList().contains(ctx.family())) + // [#5356] Some dialects require the DEFAULT clause prior to the + // NULL constraints clause + if (asList(HSQLDB).contains(ctx.family())) acceptDefault(ctx, type); if (type.nullable()) { @@ -266,7 +268,7 @@ final class CreateTableImpl extends AbstractQuery implements ctx.sql(' ').keyword("not null"); } - if (!asList().contains(ctx.family())) + if (!asList(HSQLDB).contains(ctx.family())) acceptDefault(ctx, type); if (i < columnFields.size() - 1)