diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java index 4617474ab8..f7bc3ececb 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -10646,26 +10646,10 @@ public class JavaGenerator extends AbstractGenerator { } } - /** - * @deprecated - 3.9.0 - [#330] - Use {@link #getType(Database, SchemaDefinition, String, int, int, Name, String, String)} instead. - */ - @Deprecated - protected String getType(Database db, SchemaDefinition schema, JavaWriter out, String t, int p, int s, String u, String javaType, String defaultType) { - return getType(db, schema, out, t, p, s, name(u), javaType, defaultType); - } - protected String getType(Database db, SchemaDefinition schema, JavaWriter out, String t, int p, int s, Name u, String javaType, String defaultType) { return getType(db, schema, out, t, p, s, u, javaType, defaultType, Mode.RECORD); } - /** - * @deprecated - 3.9.0 - [#330] - Use {@link #getType(Database, SchemaDefinition, String, int, int, Name, String, String, Mode)} instead. - */ - @Deprecated - protected String getType(Database db, SchemaDefinition schema, JavaWriter out, String t, int p, int s, String u, String javaType, String defaultType, Mode udtMode) { - return getType(db, schema, out, t, p, s, name(u), javaType, defaultType, udtMode); - } - protected String getType(Database db, SchemaDefinition schema, JavaWriter out, String t, int p, int s, Name u, String javaType, String defaultType, Mode udtMode) { return getType(db, schema, out, t, p, s, u, javaType, defaultType, udtMode, null); } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultDataTypeDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultDataTypeDefinition.java index ee8435264d..c1d107c664 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultDataTypeDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultDataTypeDefinition.java @@ -86,70 +86,26 @@ public class DefaultDataTypeDefinition implements DataTypeDefinition { private final int precision; private final int scale; - private static final String defaultValue(Boolean defaultable) { - return defaultable != null && defaultable ? "NULL" : null; - } - public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName) { this(database, schema, typeName, null, null, null, null, (String) null, (Name) null); } public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, String defaultValue) { - this(database, schema, typeName, length, precision, scale, nullable, defaultValue, typeName, null); - } - - /** - * @deprecated - [#330] - 3.9.0 - Use {@link #DefaultDataTypeDefinition(Database, SchemaDefinition, String, Number, Number, Number, Boolean, String, Name)} instead. - */ - @Deprecated - public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, String defaultValue, String userType) { - this(database, schema, typeName, length, precision, scale, nullable, defaultValue, name(userType)); - } - - /** - * @deprecated - [#330] - 3.9.0 - Use {@link #DefaultDataTypeDefinition(Database, SchemaDefinition, String, Number, Number, Number, Boolean, String, Name)} instead. - */ - @Deprecated - public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, Boolean defaultValue, Name userType) { - this(database, schema, typeName, length, precision, scale, nullable, defaultValue(defaultValue), userType); + this(database, schema, typeName, length, precision, scale, nullable, defaultValue, name(typeName), null); } public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, String defaultValue, Name userType) { this(database, schema, typeName, length, precision, scale, nullable, defaultValue, userType, null); } - /** - * @deprecated - [#330] - 3.9.0 - Use {@link #DefaultDataTypeDefinition(Database, SchemaDefinition, String, Number, Number, Number, Boolean, String, Name, String)} instead. - */ - @Deprecated - public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, String defaultValue, String userType, String converter) { - this(database, schema, typeName, length, precision, scale, nullable, defaultValue, name(userType), converter); - } - public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, String defaultValue, Name userType, String converter) { this(database, schema, typeName, length, precision, scale, nullable, defaultValue, userType, converter, null); } - /** - * @deprecated - [#330] - 3.9.0 - Use {@link #DefaultDataTypeDefinition(Database, SchemaDefinition, String, Number, Number, Number, Boolean, String, Name, String, String)} instead. - */ - @Deprecated - public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, String defaultValue, String userType, String converter, String binding) { - this(database, schema, typeName, length, precision, scale, nullable, defaultValue, name(userType), converter, binding, null); - } - public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, String defaultValue, Name userType, String converter, String binding) { this(database, schema, typeName, length, precision, scale, nullable, defaultValue, userType, converter, binding, null); } - /** - * @deprecated - [#330] - 3.9.0 - Use {@link #DefaultDataTypeDefinition(Database, SchemaDefinition, String, Number, Number, Number, Boolean, String, Name, String, String, String)} instead. - */ - @Deprecated - public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, String defaultValue, String userType, String converter, String binding, String javaType) { - this(database, schema, typeName, length, precision, scale, nullable, defaultValue, name(userType), converter, binding, javaType); - } - public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, String defaultValue, Name userType, String converter, String binding, String javaType) { this(database, schema, typeName, length, precision, scale, nullable, defaultValue, false, userType, converter, binding, javaType); } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDTableDefinition.java index 466ec5a492..35651d98e5 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDTableDefinition.java @@ -38,6 +38,7 @@ package org.jooq.meta.cubrid; +import static org.jooq.impl.DSL.name; import static org.jooq.meta.cubrid.dba.Tables.DB_ATTRIBUTE; import static org.jooq.meta.cubrid.dba.Tables.DB_SERIAL; @@ -94,7 +95,7 @@ public class CUBRIDTableDefinition extends AbstractTableDefinition { record.get(DB_ATTRIBUTE.SCALE), record.get(DB_ATTRIBUTE.IS_NULLABLE, boolean.class), record.get(DB_ATTRIBUTE.DEFAULT_VALUE), - getName() + "_" + record.get(DB_ATTRIBUTE.ATTR_NAME) + name(getName() + "_" + record.get(DB_ATTRIBUTE.ATTR_NAME)) ); result.add(new DefaultColumnDefinition(