From 0dc660ebc65f21d49aab64be0920f78e612220f5 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Sat, 30 May 2015 09:24:17 +0200 Subject: [PATCH] [#4324] DROP SEQUENCE statement has a mandatory RESTRICT keyword in Derby --- jOOQ/src/main/java/org/jooq/DSLContext.java | 6 +++--- jOOQ/src/main/java/org/jooq/impl/DSL.java | 6 +++--- jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java | 8 ++++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 2a2e2855f9..6e8f88f9d7 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -5183,7 +5183,7 @@ public interface DSLContext extends Scope { * * @see DSL#dropSequence(String) */ - @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) + @Support({ DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) DropSequenceFinalStep dropSequence(String sequence); /** @@ -5191,7 +5191,7 @@ public interface DSLContext extends Scope { * * @see DSL#dropSequence(Name) */ - @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) + @Support({ DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) DropSequenceFinalStep dropSequence(Name sequence); /** @@ -5199,7 +5199,7 @@ public interface DSLContext extends Scope { * * @see DSL#dropSequence(Sequence) */ - @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) + @Support({ DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) DropSequenceFinalStep dropSequence(Sequence sequence); /** diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 419f429ecc..c50a12d4ce 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -4665,7 +4665,7 @@ public class DSL { * * @see DSLContext#dropSequence(String) */ - @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) + @Support({ DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) public static DropSequenceFinalStep dropSequence(String sequence) { return using(new DefaultConfiguration()).dropSequence(sequence); } @@ -4675,7 +4675,7 @@ public class DSL { * * @see DSLContext#dropSequence(Name) */ - @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) + @Support({ DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) public static DropSequenceFinalStep dropSequence(Name sequence) { return using(new DefaultConfiguration()).dropSequence(sequence); } @@ -4685,7 +4685,7 @@ public class DSL { * * @see DSLContext#dropSequence(Sequence) */ - @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) + @Support({ DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) public static DropSequenceFinalStep dropSequence(Sequence sequence) { return using(new DefaultConfiguration()).dropSequence(sequence); } diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java index e44f64ec87..4518464153 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java @@ -115,8 +115,12 @@ class DropSequenceImpl extends AbstractQuery implements if (ifExists && supportsIfExists(ctx)) ctx.keyword("if exists").sql(' '); - ctx.visit(sequence) - .end(DROP_SEQUENCE_SEQUENCE); + ctx.visit(sequence); + + if (ctx.family() == DERBY) + ctx.sql(' ').keyword("restrict"); + + ctx.end(DROP_SEQUENCE_SEQUENCE); } @Override