From d0763a9d3e939846d7569e4d36fdb89e8764ec52 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 3 Jun 2020 17:23:47 +0200 Subject: [PATCH] [jOOQ/jOOQ#681] Added HSQLDB support for domains --- .../main/java/org/jooq/AlterDomainStep.java | 14 +++---- .../java/org/jooq/CreateDomainAsStep.java | 4 +- .../org/jooq/CreateDomainConstraintStep.java | 4 +- .../org/jooq/CreateDomainDefaultStep.java | 4 +- jOOQ/src/main/java/org/jooq/DSLContext.java | 30 +++++++-------- .../java/org/jooq/DropDomainCascadeStep.java | 4 +- jOOQ/src/main/java/org/jooq/impl/DSL.java | 38 +++++++++---------- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/AlterDomainStep.java b/jOOQ/src/main/java/org/jooq/AlterDomainStep.java index 3e53ebfb6f..17a22ae6c8 100644 --- a/jOOQ/src/main/java/org/jooq/AlterDomainStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterDomainStep.java @@ -68,25 +68,25 @@ public interface AlterDomainStep { /** * Add the ADD clause to the ALTER DOMAIN statement. */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainFinalStep add(Constraint addConstraint); /** * Add the DROP CONSTRAINT clause to the ALTER DOMAIN statement. */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainDropConstraintCascadeStep dropConstraint(String dropConstraint); /** * Add the DROP CONSTRAINT clause to the ALTER DOMAIN statement. */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainDropConstraintCascadeStep dropConstraint(Name dropConstraint); /** * Add the DROP CONSTRAINT clause to the ALTER DOMAIN statement. */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainDropConstraintCascadeStep dropConstraint(Constraint dropConstraint); /** @@ -164,19 +164,19 @@ public interface AlterDomainStep { /** * Add the SET DEFAULT clause to the ALTER DOMAIN statement. */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainFinalStep setDefault(T setDefault); /** * Add the SET DEFAULT clause to the ALTER DOMAIN statement. */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainFinalStep setDefault(Field setDefault); /** * Add the DROP DEFAULT clause to the ALTER DOMAIN statement. */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainFinalStep dropDefault(); /** diff --git a/jOOQ/src/main/java/org/jooq/CreateDomainAsStep.java b/jOOQ/src/main/java/org/jooq/CreateDomainAsStep.java index 049735ec57..b3e9ca2908 100644 --- a/jOOQ/src/main/java/org/jooq/CreateDomainAsStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateDomainAsStep.java @@ -68,12 +68,12 @@ public interface CreateDomainAsStep { /** * Add the AS clause to the CREATE DOMAIN statement. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) CreateDomainDefaultStep as(Class dataType); /** * Add the AS clause to the CREATE DOMAIN statement. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) CreateDomainDefaultStep as(DataType dataType); } diff --git a/jOOQ/src/main/java/org/jooq/CreateDomainConstraintStep.java b/jOOQ/src/main/java/org/jooq/CreateDomainConstraintStep.java index 7e70cfd901..4128bcced6 100644 --- a/jOOQ/src/main/java/org/jooq/CreateDomainConstraintStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateDomainConstraintStep.java @@ -68,12 +68,12 @@ public interface CreateDomainConstraintStep extends CreateDomainFinalStep { /** * Add the CONSTRAINTS clause to the CREATE DOMAIN statement. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) CreateDomainConstraintStep constraints(Constraint... constraints); /** * Add the CONSTRAINTS clause to the CREATE DOMAIN statement. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) CreateDomainConstraintStep constraints(Collection constraints); } diff --git a/jOOQ/src/main/java/org/jooq/CreateDomainDefaultStep.java b/jOOQ/src/main/java/org/jooq/CreateDomainDefaultStep.java index e15fdcd388..ae37b779db 100644 --- a/jOOQ/src/main/java/org/jooq/CreateDomainDefaultStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateDomainDefaultStep.java @@ -68,12 +68,12 @@ public interface CreateDomainDefaultStep extends CreateDomainConstraintStep { /** * Add the DEFAULT_ clause to the CREATE DOMAIN statement. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) CreateDomainConstraintStep default_(T default_); /** * Add the DEFAULT_ clause to the CREATE DOMAIN statement. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) CreateDomainConstraintStep default_(Field default_); } diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 1f9fef28e2..cd2a0bb78b 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -8793,7 +8793,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#createDomain(String) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) CreateDomainAsStep createDomain(String domain); /** @@ -8801,7 +8801,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#createDomain(Name) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) CreateDomainAsStep createDomain(Name domain); /** @@ -8809,7 +8809,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#createDomain(Domain) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) CreateDomainAsStep createDomain(Domain domain); /** @@ -8985,7 +8985,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#alterDomain(String) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainStep alterDomain(String domain); /** @@ -8993,7 +8993,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#alterDomain(Name) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainStep alterDomain(Name domain); /** @@ -9001,7 +9001,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#alterDomain(Domain) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainStep alterDomain(Domain domain); /** @@ -9009,7 +9009,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#alterDomainIfExists(String) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainStep alterDomainIfExists(String domain); /** @@ -9017,7 +9017,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#alterDomainIfExists(Name) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainStep alterDomainIfExists(Name domain); /** @@ -9025,7 +9025,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#alterDomainIfExists(Domain) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) AlterDomainStep alterDomainIfExists(Domain domain); /** @@ -9129,7 +9129,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#dropDomain(String) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) DropDomainCascadeStep dropDomain(String domain); /** @@ -9137,7 +9137,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#dropDomain(Name) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) DropDomainCascadeStep dropDomain(Name domain); /** @@ -9145,7 +9145,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#dropDomain(Domain) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) DropDomainCascadeStep dropDomain(Domain domain); /** @@ -9153,7 +9153,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#dropDomainIfExists(String) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) DropDomainCascadeStep dropDomainIfExists(String domain); /** @@ -9161,7 +9161,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#dropDomainIfExists(Name) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) DropDomainCascadeStep dropDomainIfExists(Name domain); /** @@ -9169,7 +9169,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see DSL#dropDomainIfExists(Domain) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) DropDomainCascadeStep dropDomainIfExists(Domain domain); /** diff --git a/jOOQ/src/main/java/org/jooq/DropDomainCascadeStep.java b/jOOQ/src/main/java/org/jooq/DropDomainCascadeStep.java index 524da1ba24..0ca7e18c5f 100644 --- a/jOOQ/src/main/java/org/jooq/DropDomainCascadeStep.java +++ b/jOOQ/src/main/java/org/jooq/DropDomainCascadeStep.java @@ -68,12 +68,12 @@ public interface DropDomainCascadeStep extends DropDomainFinalStep { /** * Add the CASCADE clause to the DROP DOMAIN statement. */ - @Support({ H2, POSTGRES }) + @Support({ H2, HSQLDB, POSTGRES }) DropDomainFinalStep cascade(); /** * Add the RESTRICT clause to the DROP DOMAIN statement. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) DropDomainFinalStep restrict(); } diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index f378c7d6f4..0817d0c2c9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -6882,7 +6882,7 @@ public class DSL { * * @see DSLContext#createDomain(String) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static org.jooq.CreateDomainAsStep createDomain(String domain) { return dsl().createDomain(domain); } @@ -6892,7 +6892,7 @@ public class DSL { * * @see DSLContext#createDomain(Name) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static org.jooq.CreateDomainAsStep createDomain(Name domain) { return dsl().createDomain(domain); } @@ -6902,7 +6902,7 @@ public class DSL { * * @see DSLContext#createDomain(Domain) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static org.jooq.CreateDomainAsStep createDomain(Domain domain) { return dsl().createDomain(domain); } @@ -7122,7 +7122,7 @@ public class DSL { * * @see DSLContext#alterDomain(String) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) public static org.jooq.AlterDomainStep alterDomain(String domain) { return dsl().alterDomain(domain); } @@ -7132,7 +7132,7 @@ public class DSL { * * @see DSLContext#alterDomain(Name) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) public static org.jooq.AlterDomainStep alterDomain(Name domain) { return dsl().alterDomain(domain); } @@ -7142,7 +7142,7 @@ public class DSL { * * @see DSLContext#alterDomain(Domain) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) public static org.jooq.AlterDomainStep alterDomain(Domain domain) { return dsl().alterDomain(domain); } @@ -7152,7 +7152,7 @@ public class DSL { * * @see DSLContext#alterDomainIfExists(String) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) public static org.jooq.AlterDomainStep alterDomainIfExists(String domain) { return dsl().alterDomainIfExists(domain); } @@ -7162,7 +7162,7 @@ public class DSL { * * @see DSLContext#alterDomainIfExists(Name) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) public static org.jooq.AlterDomainStep alterDomainIfExists(Name domain) { return dsl().alterDomainIfExists(domain); } @@ -7172,7 +7172,7 @@ public class DSL { * * @see DSLContext#alterDomainIfExists(Domain) */ - @Support({ FIREBIRD, POSTGRES }) + @Support({ FIREBIRD, HSQLDB, POSTGRES }) public static org.jooq.AlterDomainStep alterDomainIfExists(Domain domain) { return dsl().alterDomainIfExists(domain); } @@ -7302,7 +7302,7 @@ public class DSL { * * @see DSLContext#dropDomain(String) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static org.jooq.DropDomainCascadeStep dropDomain(String domain) { return dsl().dropDomain(domain); } @@ -7312,7 +7312,7 @@ public class DSL { * * @see DSLContext#dropDomain(Name) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static org.jooq.DropDomainCascadeStep dropDomain(Name domain) { return dsl().dropDomain(domain); } @@ -7322,7 +7322,7 @@ public class DSL { * * @see DSLContext#dropDomain(Domain) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static org.jooq.DropDomainCascadeStep dropDomain(Domain domain) { return dsl().dropDomain(domain); } @@ -7332,7 +7332,7 @@ public class DSL { * * @see DSLContext#dropDomainIfExists(String) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static org.jooq.DropDomainCascadeStep dropDomainIfExists(String domain) { return dsl().dropDomainIfExists(domain); } @@ -7342,7 +7342,7 @@ public class DSL { * * @see DSLContext#dropDomainIfExists(Name) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static org.jooq.DropDomainCascadeStep dropDomainIfExists(Name domain) { return dsl().dropDomainIfExists(domain); } @@ -7352,7 +7352,7 @@ public class DSL { * * @see DSLContext#dropDomainIfExists(Domain) */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static org.jooq.DropDomainCascadeStep dropDomainIfExists(Domain domain) { return dsl().dropDomainIfExists(domain); } @@ -11931,7 +11931,7 @@ public class DSL { * Create the VALUE pseudo field for usage with * DOMAIN specifications. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static Field value(Class type) { return value(DefaultDataType.getDataType(null, type)); } @@ -11940,7 +11940,7 @@ public class DSL { * Create the VALUE pseudo field for usage with * DOMAIN specifications. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static Field value(DataType type) { return field("{0}", type, N_VALUE); } @@ -11948,7 +11948,7 @@ public class DSL { /** * Create a DOMAIN reference. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static Domain domain(String name) { return domain(name(name)); } @@ -11956,7 +11956,7 @@ public class DSL { /** * Create a DOMAIN reference. */ - @Support({ FIREBIRD, H2, POSTGRES }) + @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static Domain domain(Name name) { return new DomainImpl<>(null, name, new DefaultDataType<>(null, Object.class, name)); }