From b15e7747904c2ab1ef273de7b5e7597ecc9cc226 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 20 Apr 2021 15:00:31 +0200 Subject: [PATCH] [jOOQ/jOOQ#11784] Add code generation support for Firebird 3.0 stored functions --- .../java/org/jooq/meta/RoutineDefinition.java | 6 - .../jooq/meta/firebird/FirebirdDatabase.java | 57 ++++- .../firebird/FirebirdRoutineDefinition.java | 76 +++++-- .../meta/firebird/rdb/DefaultCatalog.java | 7 +- .../jooq/meta/firebird/rdb/DefaultSchema.java | 26 ++- .../org/jooq/meta/firebird/rdb/Domains.java | 8 +- .../java/org/jooq/meta/firebird/rdb/Keys.java | 7 +- .../org/jooq/meta/firebird/rdb/Tables.java | 12 + .../rdb/tables/Rdb$checkConstraints.java | 4 +- .../meta/firebird/rdb/tables/Rdb$fields.java | 8 +- .../rdb/tables/Rdb$functionArguments.java | 215 ++++++++++++++++++ .../firebird/rdb/tables/Rdb$functions.java | 215 ++++++++++++++++++ .../firebird/rdb/tables/Rdb$generators.java | 8 +- .../rdb/tables/Rdb$indexSegments.java | 13 +- .../meta/firebird/rdb/tables/Rdb$indices.java | 8 +- .../rdb/tables/Rdb$procedureParameters.java | 8 +- .../firebird/rdb/tables/Rdb$procedures.java | 8 +- .../rdb/tables/Rdb$refConstraints.java | 8 +- .../rdb/tables/Rdb$relationConstraints.java | 8 +- .../rdb/tables/Rdb$relationFields.java | 8 +- .../firebird/rdb/tables/Rdb$relations.java | 8 +- .../firebird/rdb/tables/Rdb$triggers.java | 8 +- .../java/org/jooq/impl/AbstractRoutine.java | 1 + 23 files changed, 635 insertions(+), 92 deletions(-) create mode 100644 jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$functionArguments.java create mode 100644 jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$functions.java diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/RoutineDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/RoutineDefinition.java index ade8cb43a4..6f7cfb48e1 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/RoutineDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/RoutineDefinition.java @@ -47,12 +47,6 @@ import java.util.List; */ public interface RoutineDefinition extends Definition { - /** - * @return The routine's package. null if the routine is not in - * a package - */ - PackageDefinition getPackage(); - /** * A list of IN or INOUT parameter column definitions */ diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java index 1cae077c58..38ca8842b4 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java @@ -40,6 +40,7 @@ package org.jooq.meta.firebird; import static java.util.stream.Collectors.mapping; import static org.jooq.impl.DSL.any; import static org.jooq.impl.DSL.choose; +import static org.jooq.impl.DSL.coalesce; import static org.jooq.impl.DSL.decode; import static org.jooq.impl.DSL.falseCondition; import static org.jooq.impl.DSL.inline; @@ -52,16 +53,22 @@ import static org.jooq.impl.DSL.when; import static org.jooq.impl.SQLDataType.BIGINT; import static org.jooq.impl.SQLDataType.BOOLEAN; import static org.jooq.impl.SQLDataType.INTEGER; +import static org.jooq.impl.SQLDataType.SMALLINT; import static org.jooq.impl.SQLDataType.VARCHAR; import static org.jooq.meta.firebird.rdb.Tables.RDB$CHECK_CONSTRAINTS; import static org.jooq.meta.firebird.rdb.Tables.RDB$FIELDS; -import static org.jooq.meta.firebird.rdb.Tables.RDB$GENERATORS; +import static org.jooq.meta.firebird.rdb.Tables.RDB$FUNCTIONS; +import static org.jooq.meta.firebird.FirebirdDatabase.CHARACTER_LENGTH; +import static org.jooq.meta.firebird.FirebirdDatabase.FIELD_SCALE; +import static org.jooq.meta.firebird.FirebirdDatabase.FIELD_TYPE; +import static org.jooq.meta.firebird.rdb.Tables.*; import static org.jooq.meta.firebird.rdb.Tables.RDB$INDEX_SEGMENTS; import static org.jooq.meta.firebird.rdb.Tables.RDB$INDICES; import static org.jooq.meta.firebird.rdb.Tables.RDB$PROCEDURES; import static org.jooq.meta.firebird.rdb.Tables.RDB$REF_CONSTRAINTS; -import static org.jooq.meta.firebird.rdb.Tables.*; +import static org.jooq.meta.firebird.rdb.Tables.RDB$RELATIONS; import static org.jooq.meta.firebird.rdb.Tables.RDB$RELATION_CONSTRAINTS; +import static org.jooq.meta.firebird.rdb.Tables.RDB$RELATION_FIELDS; import static org.jooq.meta.firebird.rdb.Tables.RDB$TRIGGERS; import java.sql.SQLException; @@ -84,6 +91,7 @@ import org.jooq.SQLDialect; import org.jooq.SortOrder; import org.jooq.TableOptions.TableType; import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; import org.jooq.meta.AbstractDatabase; import org.jooq.meta.AbstractIndexDefinition; import org.jooq.meta.ArrayDefinition; @@ -108,8 +116,11 @@ import org.jooq.meta.TableDefinition; import org.jooq.meta.UDTDefinition; import org.jooq.meta.firebird.rdb.tables.Rdb$checkConstraints; import org.jooq.meta.firebird.rdb.tables.Rdb$fields; +import org.jooq.meta.firebird.rdb.tables.Rdb$functionArguments; +import org.jooq.meta.firebird.rdb.tables.Rdb$functions; import org.jooq.meta.firebird.rdb.tables.Rdb$indexSegments; import org.jooq.meta.firebird.rdb.tables.Rdb$indices; +import org.jooq.meta.firebird.rdb.tables.Rdb$procedures; import org.jooq.meta.firebird.rdb.tables.Rdb$refConstraints; import org.jooq.meta.firebird.rdb.tables.Rdb$relationConstraints; import org.jooq.meta.firebird.rdb.tables.Rdb$triggers; @@ -472,15 +483,49 @@ public class FirebirdDatabase extends AbstractDatabase implements ResultQueryDat @Override protected List getRoutines0() throws SQLException { + Rdb$procedures p = RDB$PROCEDURES.as("p"); + Rdb$functions fu = RDB$FUNCTIONS.as("fu"); + Rdb$functionArguments fa = RDB$FUNCTION_ARGUMENTS.as("fa"); + Rdb$fields fi = RDB$FIELDS.as("fi"); + return - create().select(RDB$PROCEDURES.RDB$PROCEDURE_NAME.trim()) - .from(RDB$PROCEDURES) + create().select( + p.RDB$PROCEDURE_NAME.trim(), + inline(null, VARCHAR).as("t"), + inline(null, SMALLINT).as("p"), + inline(null, SMALLINT).as("s")) + .from(p) // "executable" procedures - .where(RDB$PROCEDURES.RDB$PROCEDURE_TYPE.eq((short) 2)) + .where(p.RDB$PROCEDURE_TYPE.eq((short) 2)) + .union(is30() + ? select( + fu.RDB$FUNCTION_NAME.trim(), + FIELD_TYPE(fi).as("t"), + coalesce(CHARACTER_LENGTH(fi), fi.RDB$FIELD_PRECISION).as("p"), + FIELD_SCALE(fi).as("s")) + .from(fu) + + // [#11784] Procedures and functions live in different + // namespaces in Firebird. For now, such "overloads" are + // not yet supported. + .leftAntiJoin(p) + .on(fu.RDB$FUNCTION_NAME.eq(p.RDB$PROCEDURE_NAME)) + .join(fa) + .on(fu.RDB$FUNCTION_NAME.eq(fa.RDB$FUNCTION_NAME)) + .leftOuterJoin(fi) + .on(fa.RDB$FIELD_SOURCE.eq(fi.RDB$FIELD_NAME)) + .where(fa.RDB$ARGUMENT_POSITION.eq(inline((short) 0))) + : select(inline(""), inline(""), inline((short) 0), inline((short) 0)).where(falseCondition())) .orderBy(1) .collect(mapping( - r -> new FirebirdRoutineDefinition(getSchemata().get(0), r.get(0, String.class)), + r -> new FirebirdRoutineDefinition( + getSchemata().get(0), + r.get(0, String.class), + r.get(1, String.class), + r.get(2, Integer.class), + r.get(3, Integer.class) + ), Collectors.toList() )); } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdRoutineDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdRoutineDefinition.java index 47cf6c9c8d..399eb0c7c2 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdRoutineDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdRoutineDefinition.java @@ -37,10 +37,12 @@ */ package org.jooq.meta.firebird; +import static org.jooq.impl.DSL.inline; import static org.jooq.meta.firebird.FirebirdDatabase.CHARACTER_LENGTH; import static org.jooq.meta.firebird.FirebirdDatabase.FIELD_SCALE; import static org.jooq.meta.firebird.FirebirdDatabase.FIELD_TYPE; import static org.jooq.meta.firebird.rdb.Tables.RDB$FIELDS; +import static org.jooq.meta.firebird.rdb.Tables.RDB$FUNCTION_ARGUMENTS; import static org.jooq.meta.firebird.rdb.Tables.RDB$PROCEDURE_PARAMETERS; import java.sql.SQLException; @@ -55,7 +57,9 @@ import org.jooq.meta.InOutDefinition; import org.jooq.meta.ParameterDefinition; import org.jooq.meta.SchemaDefinition; import org.jooq.meta.firebird.rdb.tables.Rdb$fields; +import org.jooq.meta.firebird.rdb.tables.Rdb$functionArguments; import org.jooq.meta.firebird.rdb.tables.Rdb$procedureParameters; +import org.jooq.tools.StringUtils; /** * @author Lukas Eder @@ -63,32 +67,70 @@ import org.jooq.meta.firebird.rdb.tables.Rdb$procedureParameters; public class FirebirdRoutineDefinition extends AbstractRoutineDefinition { public FirebirdRoutineDefinition(SchemaDefinition schema, String name) { + this(schema, name, null, null, null); + } + + public FirebirdRoutineDefinition(SchemaDefinition schema, String name, String dataType, Number precision, Number scale) { super(schema, null, name, null, null, false); + + if (!StringUtils.isBlank(dataType)) { + DataTypeDefinition type = new DefaultDataTypeDefinition( + getDatabase(), + getSchema(), + dataType, + precision, + precision, + scale, + null, + (String) null + ); + + this.returnValue = new DefaultParameterDefinition(this, "RETURN_VALUE", -1, type); + } } @Override protected void init0() throws SQLException { Rdb$procedureParameters p = RDB$PROCEDURE_PARAMETERS.as("p"); + Rdb$functionArguments a = RDB$FUNCTION_ARGUMENTS.as("a"); Rdb$fields f = RDB$FIELDS.as("f"); int i = 0; - for (Record record : create() - .select( - p.RDB$PARAMETER_NUMBER, - p.RDB$PARAMETER_TYPE, - p.RDB$PARAMETER_NAME.trim().as(p.RDB$PARAMETER_NAME), - FIELD_TYPE(f).as("FIELD_TYPE"), - CHARACTER_LENGTH(f).as("CHAR_LEN"), - f.RDB$FIELD_PRECISION, - FIELD_SCALE(f).as("FIELD_SCALE"), - DSL.bitOr(p.RDB$NULL_FLAG.nvl((short) 0), f.RDB$NULL_FLAG.nvl((short) 0)).as(p.RDB$NULL_FLAG), - p.RDB$DEFAULT_SOURCE) - .from(p) - .leftOuterJoin(f).on(p.RDB$FIELD_SOURCE.eq(f.RDB$FIELD_NAME)) - .where(p.RDB$PROCEDURE_NAME.eq(getName())) - .orderBy( - p.RDB$PARAMETER_TYPE.desc(), - p.RDB$PARAMETER_NUMBER.asc())) { + for (Record record : returnValue == null + ? create() + .select( + p.RDB$PARAMETER_NUMBER, + p.RDB$PARAMETER_TYPE, + p.RDB$PARAMETER_NAME.trim().as(p.RDB$PARAMETER_NAME), + FIELD_TYPE(f).as("FIELD_TYPE"), + CHARACTER_LENGTH(f).as("CHAR_LEN"), + f.RDB$FIELD_PRECISION, + FIELD_SCALE(f).as("FIELD_SCALE"), + DSL.bitOr(p.RDB$NULL_FLAG.nvl((short) 0), f.RDB$NULL_FLAG.nvl((short) 0)).as(p.RDB$NULL_FLAG), + p.RDB$DEFAULT_SOURCE) + .from(p) + .leftOuterJoin(f).on(p.RDB$FIELD_SOURCE.eq(f.RDB$FIELD_NAME)) + .where(p.RDB$PROCEDURE_NAME.eq(getName())) + .orderBy( + p.RDB$PARAMETER_TYPE.desc(), + p.RDB$PARAMETER_NUMBER.asc()) + : create() + .select( + a.RDB$ARGUMENT_POSITION.as(p.RDB$PARAMETER_NUMBER), + inline(0).as(p.RDB$PARAMETER_TYPE), + a.RDB$ARGUMENT_NAME.trim().as(p.RDB$PARAMETER_NAME), + FIELD_TYPE(f).as("FIELD_TYPE"), + CHARACTER_LENGTH(f).as("CHAR_LEN"), + f.RDB$FIELD_PRECISION, + FIELD_SCALE(f).as("FIELD_SCALE"), + DSL.bitOr(a.RDB$NULL_FLAG.nvl((short) 0), f.RDB$NULL_FLAG.nvl((short) 0)).as(p.RDB$NULL_FLAG), + a.RDB$DEFAULT_SOURCE) + .from(a) + .leftOuterJoin(f).on(a.RDB$FIELD_SOURCE.eq(f.RDB$FIELD_NAME)) + .where(a.RDB$FUNCTION_NAME.eq(getName())) + .and(a.RDB$ARGUMENT_POSITION.gt(inline((short) 0))) + .orderBy(a.RDB$ARGUMENT_POSITION) + ) { DataTypeDefinition type = new DefaultDataTypeDefinition( getDatabase(), diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/DefaultCatalog.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/DefaultCatalog.java index ddd0413127..96d4e3f164 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/DefaultCatalog.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/DefaultCatalog.java @@ -17,7 +17,7 @@ import org.jooq.impl.CatalogImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = -454478492; + private static final long serialVersionUID = 1L; /** * The reference instance of DEFAULT_CATALOG @@ -38,7 +38,8 @@ public class DefaultCatalog extends CatalogImpl { @Override public final List getSchemas() { - return Arrays.asList( - DefaultSchema.DEFAULT_SCHEMA); + return Arrays.asList( + DefaultSchema.DEFAULT_SCHEMA + ); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/DefaultSchema.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/DefaultSchema.java index 77aec0e52a..7a400efe29 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/DefaultSchema.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/DefaultSchema.java @@ -13,6 +13,8 @@ import org.jooq.Table; import org.jooq.impl.SchemaImpl; import org.jooq.meta.firebird.rdb.tables.Rdb$checkConstraints; import org.jooq.meta.firebird.rdb.tables.Rdb$fields; +import org.jooq.meta.firebird.rdb.tables.Rdb$functionArguments; +import org.jooq.meta.firebird.rdb.tables.Rdb$functions; import org.jooq.meta.firebird.rdb.tables.Rdb$generators; import org.jooq.meta.firebird.rdb.tables.Rdb$indexSegments; import org.jooq.meta.firebird.rdb.tables.Rdb$indices; @@ -31,7 +33,7 @@ import org.jooq.meta.firebird.rdb.tables.Rdb$triggers; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultSchema extends SchemaImpl { - private static final long serialVersionUID = 1452293140; + private static final long serialVersionUID = 1L; /** * The reference instance of DEFAULT_SCHEMA @@ -48,6 +50,16 @@ public class DefaultSchema extends SchemaImpl { */ public final Rdb$fields RDB$FIELDS = Rdb$fields.RDB$FIELDS; + /** + * The table RDB$FUNCTION_ARGUMENTS. + */ + public final Rdb$functionArguments RDB$FUNCTION_ARGUMENTS = Rdb$functionArguments.RDB$FUNCTION_ARGUMENTS; + + /** + * The table RDB$FUNCTIONS. + */ + public final Rdb$functions RDB$FUNCTIONS = Rdb$functions.RDB$FUNCTIONS; + /** * The table RDB$GENERATORS. */ @@ -113,15 +125,18 @@ public class DefaultSchema extends SchemaImpl { @Override public final List> getDomains() { - return Arrays.>asList( - Domains.RDB$PROCEDURE_PARAMETERS); + return Arrays.asList( + Domains.RDB$PROCEDURE_PARAMETERS + ); } @Override public final List> getTables() { - return Arrays.>asList( + return Arrays.asList( Rdb$checkConstraints.RDB$CHECK_CONSTRAINTS, Rdb$fields.RDB$FIELDS, + Rdb$functionArguments.RDB$FUNCTION_ARGUMENTS, + Rdb$functions.RDB$FUNCTIONS, Rdb$generators.RDB$GENERATORS, Rdb$indexSegments.RDB$INDEX_SEGMENTS, Rdb$indices.RDB$INDICES, @@ -131,6 +146,7 @@ public class DefaultSchema extends SchemaImpl { Rdb$relationConstraints.RDB$RELATION_CONSTRAINTS, Rdb$relationFields.RDB$RELATION_FIELDS, Rdb$relations.RDB$RELATIONS, - Rdb$triggers.RDB$TRIGGERS); + Rdb$triggers.RDB$TRIGGERS + ); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Domains.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Domains.java index e93db336f2..95b0c1e174 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Domains.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Domains.java @@ -9,7 +9,6 @@ import org.jooq.Schema; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.LazySchema; -import org.jooq.impl.LazySupplier; import org.jooq.impl.SQLDataType; @@ -29,11 +28,6 @@ public class Domains { ); private static final Schema schema() { - return new LazySchema(DSL.name(""), DSL.comment(""), new LazySupplier() { - @Override - public Schema get() { - return DefaultSchema.DEFAULT_SCHEMA; - } - }); + return new LazySchema(DSL.name(""), DSL.comment(""), () -> DefaultSchema.DEFAULT_SCHEMA); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Keys.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Keys.java index 2a08eca05d..9792298799 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Keys.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Keys.java @@ -11,6 +11,7 @@ import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.meta.firebird.rdb.tables.Rdb$fields; +import org.jooq.meta.firebird.rdb.tables.Rdb$functions; import org.jooq.meta.firebird.rdb.tables.Rdb$generators; import org.jooq.meta.firebird.rdb.tables.Rdb$indexSegments; import org.jooq.meta.firebird.rdb.tables.Rdb$indices; @@ -24,8 +25,8 @@ import org.jooq.meta.firebird.rdb.tables.Rdb$triggers; /** - * A class modelling foreign key relationships and constraints of tables in - * the default schema. + * A class modelling foreign key relationships and constraints of tables in the + * default schema. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Keys { @@ -35,6 +36,8 @@ public class Keys { // ------------------------------------------------------------------------- public static final UniqueKey RDB$INDEX_2 = Internal.createUniqueKey(Rdb$fields.RDB$FIELDS, DSL.name("RDB$INDEX_2"), new TableField[] { Rdb$fields.RDB$FIELDS.RDB$FIELD_NAME }, true); + public static final UniqueKey RDB$INDEX_53 = Internal.createUniqueKey(Rdb$functions.RDB$FUNCTIONS, DSL.name("RDB$INDEX_53"), new TableField[] { Rdb$functions.RDB$FUNCTIONS.RDB$FUNCTION_ID }, true); + public static final UniqueKey RDB$INDEX_9 = Internal.createUniqueKey(Rdb$functions.RDB$FUNCTIONS, DSL.name("RDB$INDEX_9"), new TableField[] { Rdb$functions.RDB$FUNCTIONS.RDB$PACKAGE_NAME, Rdb$functions.RDB$FUNCTIONS.RDB$FUNCTION_NAME }, true); public static final UniqueKey RDB$INDEX_11 = Internal.createUniqueKey(Rdb$generators.RDB$GENERATORS, DSL.name("RDB$INDEX_11"), new TableField[] { Rdb$generators.RDB$GENERATORS.RDB$GENERATOR_NAME }, true); public static final UniqueKey RDB$INDEX_46 = Internal.createUniqueKey(Rdb$generators.RDB$GENERATORS, DSL.name("RDB$INDEX_46"), new TableField[] { Rdb$generators.RDB$GENERATORS.RDB$GENERATOR_ID }, true); public static final UniqueKey RDB$INDEX_5 = Internal.createUniqueKey(Rdb$indices.RDB$INDICES, DSL.name("RDB$INDEX_5"), new TableField[] { Rdb$indices.RDB$INDICES.RDB$INDEX_NAME }, true); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Tables.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Tables.java index cd78e20cdc..d1c575b86b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Tables.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/Tables.java @@ -6,6 +6,8 @@ package org.jooq.meta.firebird.rdb; import org.jooq.meta.firebird.rdb.tables.Rdb$checkConstraints; import org.jooq.meta.firebird.rdb.tables.Rdb$fields; +import org.jooq.meta.firebird.rdb.tables.Rdb$functionArguments; +import org.jooq.meta.firebird.rdb.tables.Rdb$functions; import org.jooq.meta.firebird.rdb.tables.Rdb$generators; import org.jooq.meta.firebird.rdb.tables.Rdb$indexSegments; import org.jooq.meta.firebird.rdb.tables.Rdb$indices; @@ -34,6 +36,16 @@ public class Tables { */ public static final Rdb$fields RDB$FIELDS = Rdb$fields.RDB$FIELDS; + /** + * The table RDB$FUNCTION_ARGUMENTS. + */ + public static final Rdb$functionArguments RDB$FUNCTION_ARGUMENTS = Rdb$functionArguments.RDB$FUNCTION_ARGUMENTS; + + /** + * The table RDB$FUNCTIONS. + */ + public static final Rdb$functions RDB$FUNCTIONS = Rdb$functions.RDB$FUNCTIONS; + /** * The table RDB$GENERATORS. */ diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$checkConstraints.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$checkConstraints.java index 785df4fa8e..ae7b2e519e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$checkConstraints.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$checkConstraints.java @@ -24,7 +24,7 @@ import org.jooq.meta.firebird.rdb.DefaultSchema; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$checkConstraints extends TableImpl { - private static final long serialVersionUID = 1433691037; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$CHECK_CONSTRAINTS @@ -84,7 +84,7 @@ public class Rdb$checkConstraints extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$fields.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$fields.java index f6ab305601..fb6727e841 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$fields.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$fields.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$fields extends TableImpl { - private static final long serialVersionUID = 542355137; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$FIELDS @@ -229,12 +229,12 @@ public class Rdb$fields extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_2); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_2); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$functionArguments.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$functionArguments.java new file mode 100644 index 0000000000..bf59c8d99d --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$functionArguments.java @@ -0,0 +1,215 @@ +/* + * This file is generated by jOOQ. + */ +package org.jooq.meta.firebird.rdb.tables; + + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; +import org.jooq.meta.firebird.rdb.DefaultSchema; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Rdb$functionArguments extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of RDB$FUNCTION_ARGUMENTS + */ + public static final Rdb$functionArguments RDB$FUNCTION_ARGUMENTS = new Rdb$functionArguments(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return Record.class; + } + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$FUNCTION_NAME. + */ + public final TableField RDB$FUNCTION_NAME = createField(DSL.name("RDB$FUNCTION_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$ARGUMENT_POSITION. + */ + public final TableField RDB$ARGUMENT_POSITION = createField(DSL.name("RDB$ARGUMENT_POSITION"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$MECHANISM. + */ + public final TableField RDB$MECHANISM = createField(DSL.name("RDB$MECHANISM"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$FIELD_TYPE. + */ + public final TableField RDB$FIELD_TYPE = createField(DSL.name("RDB$FIELD_TYPE"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$FIELD_SCALE. + */ + public final TableField RDB$FIELD_SCALE = createField(DSL.name("RDB$FIELD_SCALE"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$FIELD_LENGTH. + */ + public final TableField RDB$FIELD_LENGTH = createField(DSL.name("RDB$FIELD_LENGTH"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$FIELD_SUB_TYPE. + */ + public final TableField RDB$FIELD_SUB_TYPE = createField(DSL.name("RDB$FIELD_SUB_TYPE"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$CHARACTER_SET_ID. + */ + public final TableField RDB$CHARACTER_SET_ID = createField(DSL.name("RDB$CHARACTER_SET_ID"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$FIELD_PRECISION. + */ + public final TableField RDB$FIELD_PRECISION = createField(DSL.name("RDB$FIELD_PRECISION"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$CHARACTER_LENGTH. + */ + public final TableField RDB$CHARACTER_LENGTH = createField(DSL.name("RDB$CHARACTER_LENGTH"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$PACKAGE_NAME. + */ + public final TableField RDB$PACKAGE_NAME = createField(DSL.name("RDB$PACKAGE_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$ARGUMENT_NAME. + */ + public final TableField RDB$ARGUMENT_NAME = createField(DSL.name("RDB$ARGUMENT_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$FIELD_SOURCE. + */ + public final TableField RDB$FIELD_SOURCE = createField(DSL.name("RDB$FIELD_SOURCE"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$DEFAULT_VALUE. + */ + public final TableField RDB$DEFAULT_VALUE = createField(DSL.name("RDB$DEFAULT_VALUE"), SQLDataType.BLOB, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$DEFAULT_SOURCE. + */ + public final TableField RDB$DEFAULT_SOURCE = createField(DSL.name("RDB$DEFAULT_SOURCE"), SQLDataType.CLOB, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$COLLATION_ID. + */ + public final TableField RDB$COLLATION_ID = createField(DSL.name("RDB$COLLATION_ID"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$NULL_FLAG. + */ + public final TableField RDB$NULL_FLAG = createField(DSL.name("RDB$NULL_FLAG"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$ARGUMENT_MECHANISM. + */ + public final TableField RDB$ARGUMENT_MECHANISM = createField(DSL.name("RDB$ARGUMENT_MECHANISM"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$FIELD_NAME. + */ + public final TableField RDB$FIELD_NAME = createField(DSL.name("RDB$FIELD_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$RELATION_NAME. + */ + public final TableField RDB$RELATION_NAME = createField(DSL.name("RDB$RELATION_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$SYSTEM_FLAG. + */ + public final TableField RDB$SYSTEM_FLAG = createField(DSL.name("RDB$SYSTEM_FLAG"), SQLDataType.SMALLINT.nullable(false), this, ""); + + /** + * The column RDB$FUNCTION_ARGUMENTS.RDB$DESCRIPTION. + */ + public final TableField RDB$DESCRIPTION = createField(DSL.name("RDB$DESCRIPTION"), SQLDataType.CLOB, this, ""); + + private Rdb$functionArguments(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private Rdb$functionArguments(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); + } + + /** + * Create an aliased RDB$FUNCTION_ARGUMENTS table reference + */ + public Rdb$functionArguments(String alias) { + this(DSL.name(alias), RDB$FUNCTION_ARGUMENTS); + } + + /** + * Create an aliased RDB$FUNCTION_ARGUMENTS table reference + */ + public Rdb$functionArguments(Name alias) { + this(alias, RDB$FUNCTION_ARGUMENTS); + } + + /** + * Create a RDB$FUNCTION_ARGUMENTS table reference + */ + public Rdb$functionArguments() { + this(DSL.name("RDB$FUNCTION_ARGUMENTS"), null); + } + + public Rdb$functionArguments(Table child, ForeignKey key) { + super(child, key, RDB$FUNCTION_ARGUMENTS); + } + + @Override + public Schema getSchema() { + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; + } + + @Override + public Rdb$functionArguments as(String alias) { + return new Rdb$functionArguments(DSL.name(alias), this); + } + + @Override + public Rdb$functionArguments as(Name alias) { + return new Rdb$functionArguments(alias, this); + } + + /** + * Rename this table + */ + @Override + public Rdb$functionArguments rename(String name) { + return new Rdb$functionArguments(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Rdb$functionArguments rename(Name name) { + return new Rdb$functionArguments(name, null); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$functions.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$functions.java new file mode 100644 index 0000000000..f51c416ab3 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$functions.java @@ -0,0 +1,215 @@ +/* + * This file is generated by jOOQ. + */ +package org.jooq.meta.firebird.rdb.tables; + + +import java.util.Arrays; +import java.util.List; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; +import org.jooq.meta.firebird.rdb.DefaultSchema; +import org.jooq.meta.firebird.rdb.Keys; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Rdb$functions extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of RDB$FUNCTIONS + */ + public static final Rdb$functions RDB$FUNCTIONS = new Rdb$functions(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return Record.class; + } + + /** + * The column RDB$FUNCTIONS.RDB$FUNCTION_NAME. + */ + public final TableField RDB$FUNCTION_NAME = createField(DSL.name("RDB$FUNCTION_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$FUNCTION_TYPE. + */ + public final TableField RDB$FUNCTION_TYPE = createField(DSL.name("RDB$FUNCTION_TYPE"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$QUERY_NAME. + */ + public final TableField RDB$QUERY_NAME = createField(DSL.name("RDB$QUERY_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$DESCRIPTION. + */ + public final TableField RDB$DESCRIPTION = createField(DSL.name("RDB$DESCRIPTION"), SQLDataType.CLOB, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$MODULE_NAME. + */ + public final TableField RDB$MODULE_NAME = createField(DSL.name("RDB$MODULE_NAME"), SQLDataType.VARCHAR, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$ENTRYPOINT. + */ + public final TableField RDB$ENTRYPOINT = createField(DSL.name("RDB$ENTRYPOINT"), SQLDataType.CHAR, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$RETURN_ARGUMENT. + */ + public final TableField RDB$RETURN_ARGUMENT = createField(DSL.name("RDB$RETURN_ARGUMENT"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$SYSTEM_FLAG. + */ + public final TableField RDB$SYSTEM_FLAG = createField(DSL.name("RDB$SYSTEM_FLAG"), SQLDataType.SMALLINT.nullable(false), this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$ENGINE_NAME. + */ + public final TableField RDB$ENGINE_NAME = createField(DSL.name("RDB$ENGINE_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$PACKAGE_NAME. + */ + public final TableField RDB$PACKAGE_NAME = createField(DSL.name("RDB$PACKAGE_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$PRIVATE_FLAG. + */ + public final TableField RDB$PRIVATE_FLAG = createField(DSL.name("RDB$PRIVATE_FLAG"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$FUNCTION_SOURCE. + */ + public final TableField RDB$FUNCTION_SOURCE = createField(DSL.name("RDB$FUNCTION_SOURCE"), SQLDataType.CLOB, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$FUNCTION_ID. + */ + public final TableField RDB$FUNCTION_ID = createField(DSL.name("RDB$FUNCTION_ID"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$FUNCTION_BLR. + */ + public final TableField RDB$FUNCTION_BLR = createField(DSL.name("RDB$FUNCTION_BLR"), SQLDataType.BLOB, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$VALID_BLR. + */ + public final TableField RDB$VALID_BLR = createField(DSL.name("RDB$VALID_BLR"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$DEBUG_INFO. + */ + public final TableField RDB$DEBUG_INFO = createField(DSL.name("RDB$DEBUG_INFO"), SQLDataType.BLOB, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$SECURITY_CLASS. + */ + public final TableField RDB$SECURITY_CLASS = createField(DSL.name("RDB$SECURITY_CLASS"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$OWNER_NAME. + */ + public final TableField RDB$OWNER_NAME = createField(DSL.name("RDB$OWNER_NAME"), SQLDataType.CHAR(31), this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$LEGACY_FLAG. + */ + public final TableField RDB$LEGACY_FLAG = createField(DSL.name("RDB$LEGACY_FLAG"), SQLDataType.SMALLINT, this, ""); + + /** + * The column RDB$FUNCTIONS.RDB$DETERMINISTIC_FLAG. + */ + public final TableField RDB$DETERMINISTIC_FLAG = createField(DSL.name("RDB$DETERMINISTIC_FLAG"), SQLDataType.SMALLINT, this, ""); + + private Rdb$functions(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private Rdb$functions(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); + } + + /** + * Create an aliased RDB$FUNCTIONS table reference + */ + public Rdb$functions(String alias) { + this(DSL.name(alias), RDB$FUNCTIONS); + } + + /** + * Create an aliased RDB$FUNCTIONS table reference + */ + public Rdb$functions(Name alias) { + this(alias, RDB$FUNCTIONS); + } + + /** + * Create a RDB$FUNCTIONS table reference + */ + public Rdb$functions() { + this(DSL.name("RDB$FUNCTIONS"), null); + } + + public Rdb$functions(Table child, ForeignKey key) { + super(child, key, RDB$FUNCTIONS); + } + + @Override + public Schema getSchema() { + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; + } + + @Override + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_9, Keys.RDB$INDEX_53); + } + + @Override + public Rdb$functions as(String alias) { + return new Rdb$functions(DSL.name(alias), this); + } + + @Override + public Rdb$functions as(Name alias) { + return new Rdb$functions(alias, this); + } + + /** + * Rename this table + */ + @Override + public Rdb$functions rename(String name) { + return new Rdb$functions(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Rdb$functions rename(Name name) { + return new Rdb$functions(name, null); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$generators.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$generators.java index a0e093dded..00203d60be 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$generators.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$generators.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$generators extends TableImpl { - private static final long serialVersionUID = -1552014164; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$GENERATORS @@ -119,12 +119,12 @@ public class Rdb$generators extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_11, Keys.RDB$INDEX_46); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_11, Keys.RDB$INDEX_46); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$indexSegments.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$indexSegments.java index 0ebb181cbe..afe3caf392 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$indexSegments.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$indexSegments.java @@ -28,7 +28,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$indexSegments extends TableImpl { - private static final long serialVersionUID = -1285289609; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$INDEX_SEGMENTS @@ -98,16 +98,21 @@ public class Rdb$indexSegments extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override public List> getReferences() { - return Arrays.>asList(Keys.SYNTHETIC_FK_RDB$INDEX_SEGMENTS__RDB$INDEX_5); + return Arrays.asList(Keys.SYNTHETIC_FK_RDB$INDEX_SEGMENTS__RDB$INDEX_5); } + private transient Rdb$indices _rdb$indices; + public Rdb$indices rdb$indices() { - return new Rdb$indices(this, Keys.SYNTHETIC_FK_RDB$INDEX_SEGMENTS__RDB$INDEX_5); + if (_rdb$indices == null) + _rdb$indices = new Rdb$indices(this, Keys.SYNTHETIC_FK_RDB$INDEX_SEGMENTS__RDB$INDEX_5); + + return _rdb$indices; } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$indices.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$indices.java index 9a8764ead5..f2a81698f7 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$indices.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$indices.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$indices extends TableImpl { - private static final long serialVersionUID = 934712412; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$INDICES @@ -144,12 +144,12 @@ public class Rdb$indices extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_5); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_5); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$procedureParameters.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$procedureParameters.java index f188d252eb..df350f4a9d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$procedureParameters.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$procedureParameters.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$procedureParameters extends TableImpl { - private static final long serialVersionUID = 1990438625; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$PROCEDURE_PARAMETERS @@ -154,12 +154,12 @@ public class Rdb$procedureParameters extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_18); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_18); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$procedures.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$procedures.java index 6858bd4be3..b8614c9228 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$procedures.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$procedures.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$procedures extends TableImpl { - private static final long serialVersionUID = 1114120556; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$PROCEDURES @@ -169,12 +169,12 @@ public class Rdb$procedures extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_21, Keys.RDB$INDEX_22); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_21, Keys.RDB$INDEX_22); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$refConstraints.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$refConstraints.java index ed9c2e9930..7c5805cd86 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$refConstraints.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$refConstraints.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$refConstraints extends TableImpl { - private static final long serialVersionUID = 1352129042; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$REF_CONSTRAINTS @@ -104,12 +104,12 @@ public class Rdb$refConstraints extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_13); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_13); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relationConstraints.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relationConstraints.java index 9036287faa..3f660b2e80 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relationConstraints.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relationConstraints.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$relationConstraints extends TableImpl { - private static final long serialVersionUID = -465440119; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$RELATION_CONSTRAINTS @@ -109,12 +109,12 @@ public class Rdb$relationConstraints extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_12); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_12); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relationFields.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relationFields.java index a42ef5387d..6c31793740 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relationFields.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relationFields.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$relationFields extends TableImpl { - private static final long serialVersionUID = -927360807; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$RELATION_FIELDS @@ -184,12 +184,12 @@ public class Rdb$relationFields extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_15); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_15); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relations.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relations.java index 4bbdea34f7..c7c8c0c1b5 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relations.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$relations.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$relations extends TableImpl { - private static final long serialVersionUID = -1226016355; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$RELATIONS @@ -164,12 +164,12 @@ public class Rdb$relations extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_0); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_0); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$triggers.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$triggers.java index 481a710297..c4920e8d48 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$triggers.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/rdb/tables/Rdb$triggers.java @@ -29,7 +29,7 @@ import org.jooq.meta.firebird.rdb.Keys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Rdb$triggers extends TableImpl { - private static final long serialVersionUID = 745453431; + private static final long serialVersionUID = 1L; /** * The reference instance of RDB$TRIGGERS @@ -149,12 +149,12 @@ public class Rdb$triggers extends TableImpl { @Override public Schema getSchema() { - return DefaultSchema.DEFAULT_SCHEMA; + return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA; } @Override - public List> getKeys() { - return Arrays.>asList(Keys.RDB$INDEX_8); + public List> getUniqueKeys() { + return Arrays.asList(Keys.RDB$INDEX_8); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java index c0a0fc1d7b..adf6964212 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java @@ -395,6 +395,7 @@ public abstract class AbstractRoutine extends AbstractNamed implements Routin else { } + case FIREBIRD: case H2: