github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1740] Remove support for generated master data enums

Browse Source
This commit is contained in:
Lukas Eder 2012-10-26 17:02:06 +02:00
parent 4a1fc9cd8a
commit 65e292f261
426 changed files with 13865 additions and 14951 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
View File

@ -58,10 +58,7 @@ import org.jooq.EnumType;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Identity;
import org.jooq.MasterDataType;
import org.jooq.Parameter;
import org.jooq.Record;
import org.jooq.Result;
import org.jooq.Select;
import org.jooq.Sequence;
import org.jooq.Table;
@ -106,7 +103,6 @@ import org.jooq.util.GeneratorStrategy.Mode;
*
* @author Lukas Eder
*/
@SuppressWarnings("deprecation")
public class DefaultGenerator extends AbstractGenerator {
private static final JooqLogger log = JooqLogger.getLogger(DefaultGenerator.class);
@ -198,10 +194,6 @@ public class DefaultGenerator extends AbstractGenerator {
generateSequences(schema, targetSchemaDir);
}
if (database.getMasterDataTables(schema).size() > 0) {
generateMasterTables(schema);
}
if (database.getTables(schema).size() > 0) {
generateTables(schema);
}
@ -351,12 +343,6 @@ public class DefaultGenerator extends AbstractGenerator {
List<ForeignKeyDefinition> foreignKeys = table.getForeignKeys();
for (ForeignKeyDefinition foreignKey : foreignKeys) {
// Skip master data foreign keys
if (foreignKey.getReferencedTable() instanceof MasterDataTableDefinition) {
continue;
}
out.print("\tpublic static final ");
out.print(ForeignKey.class);
out.print("<");
@ -1701,13 +1687,6 @@ public class DefaultGenerator extends AbstractGenerator {
String separator = "";
for (ForeignKeyDefinition foreignKey : foreignKeys) {
TableDefinition referencedTable = foreignKey.getReferencedTable();
// Skip master data foreign keys
if (referencedTable instanceof MasterDataTableDefinition) {
continue;
}
out.print(separator);
out.print(strategy.getFullJavaIdentifier(foreignKey));
@ -1799,131 +1778,6 @@ public class DefaultGenerator extends AbstractGenerator {
out.close();
}
protected void generateMasterTables(SchemaDefinition schema) {
log.info("Generating master data");
for (MasterDataTableDefinition table : database.getMasterDataTables(schema)) {
try {
generateMasterTable(table);
} catch (Exception e) {
log.error("Exception while generating master data table " + table, e);
}
}
watch.splitInfo("Master data generated");
}
protected void generateMasterTable(MasterDataTableDefinition table) {
log.info("Generating table", strategy.getFileName(table));
GenerationWriter out = new GenerationWriter(strategy.getFile(table));
printHeader(out, table);
printClassJavadoc(out, table);
ColumnDefinition pk = table.getPrimaryKeyColumn();
ColumnDefinition l = table.getLiteralColumn();
ColumnDefinition d = table.getDescriptionColumn();
Result<Record> data = table.getData();
out.print("public enum ");
out.print(strategy.getJavaClassName(table));
printImplements(out, table, Mode.ENUM,
MasterDataType.class.getName() + "<" + getJavaType(pk.getType()) + ">");
out.println(" {");
Set<ColumnDefinition> columns =
new LinkedHashSet<ColumnDefinition>(Arrays.asList(pk, l, d));
for (Record record : data) {
String literal = record.getValueAsString(l.getName());
String description = record.getValueAsString(d.getName());
if (!StringUtils.isEmpty(description)) {
out.println();
out.println("\t/**");
out.println("\t * " + description);
out.println("\t */");
}
out.print("\t");
out.print(GenerationUtil.convertToJavaIdentifier(literal));
out.print("(");
String separator = "";
for (ColumnDefinition column : columns) {
out.print(separator);
out.printNewJavaObject(getJavaType(column.getType()), record.getValue(column.getName()));
separator = ", ";
}
out.println("),");
}
out.println("\t;");
out.println();
// Fields
for (ColumnDefinition column : columns) {
out.print("\tprivate final ");
out.print(getJavaType(column.getType()));
out.print(" ");
out.println(strategy.getJavaMemberName(column) + ";");
}
// Constructor
out.println();
out.print("\tprivate " + strategy.getJavaClassName(table) + "(");
String separator = "";
for (ColumnDefinition column : columns) {
out.print(separator);
out.print(getJavaType(column.getType()));
out.print(" ");
out.print(strategy.getJavaMemberName(column));
separator = ", ";
}
out.println(") {");
for (ColumnDefinition column : columns) {
out.print("\t\tthis.");
out.print(strategy.getJavaMemberName(column));
out.print(" = ");
out.print(strategy.getJavaMemberName(column));
out.println(";");
}
out.println("\t}");
// Implementation methods
out.println();
printOverride(out);
out.print("\tpublic ");
out.print(getJavaType(pk.getType()));
out.println(" getPrimaryKey() {");
out.println("\t\treturn " + strategy.getJavaMemberName(pk) + ";");
out.println("\t}");
// Getters
for (ColumnDefinition column : columns) {
printFieldJavaDoc(out, column);
out.print("\tpublic final ");
out.print(getJavaType(column.getType()));
out.print(" ");
out.print(strategy.getJavaGetterName(column, Mode.DEFAULT));
out.println("() {");
out.print("\t\treturn ");
out.print(strategy.getJavaMemberName(column));
out.println(";");
out.println("\t}");
}
out.println("}");
out.close();
}
protected void generateSequences(SchemaDefinition schema, File targetSchemaDir) {
log.info("Generating sequences");
@ -2870,10 +2724,6 @@ public class DefaultGenerator extends AbstractGenerator {
// Do not generate referential code for master data tables
TableDefinition referenced = foreignKey.getReferencedTable();
if (referenced instanceof MasterDataTableDefinition) {
return;
}
printFetchMethod(out, column, foreignKey, referenced);
}
@ -3401,42 +3251,24 @@ public class DefaultGenerator extends AbstractGenerator {
}
protected String getJavaTypeReference(Database db, DataTypeDefinition type) {
if (type instanceof MasterDataTypeDefinition) {
StringBuilder sb = new StringBuilder();
sb.append(getJavaTypeReference(db, ((MasterDataTypeDefinition) type).underlying));
sb.append(".asMasterDataType(");
sb.append(getJavaType(type));
sb.append(".class)");
return sb.toString();
if (database.isArrayType(type.getType())) {
String baseType = GenerationUtil.getArrayBaseType(db.getDialect(), type.getType(), type.getUserType());
return getTypeReference(db, type.getSchema(), baseType, 0, 0, baseType) + ".getArrayDataType()";
}
else {
if (database.isArrayType(type.getType())) {
String baseType = GenerationUtil.getArrayBaseType(db.getDialect(), type.getType(), type.getUserType());
return getTypeReference(db, type.getSchema(), baseType, 0, 0, baseType) + ".getArrayDataType()";
}
else {
return getTypeReference(db, type.getSchema(), type.getType(), type.getPrecision(), type.getScale(), type.getUserType());
}
return getTypeReference(db, type.getSchema(), type.getType(), type.getPrecision(), type.getScale(), type.getUserType());
}
}
protected String getJavaType(DataTypeDefinition type) {
if (type instanceof MasterDataTypeDefinition) {
return strategy.getFullJavaClassName(((MasterDataTypeDefinition) type).table);
}
else {
return getType(
type.getDatabase(),
type.getSchema(),
type.getType(),
type.getPrecision(),
type.getScale(),
type.getUserType(),
Object.class.getName());
}
return getType(
type.getDatabase(),
type.getSchema(),
type.getType(),
type.getPrecision(),
type.getScale(),
type.getUserType(),
Object.class.getName());
}
protected String getType(Database db, SchemaDefinition schema, String t, int p, int s, String u, String defaultType) {

6
jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java
View File

@ -216,12 +216,8 @@ public class DefaultGeneratorStrategy extends AbstractGeneratorStrategy {
return result.toString();
}
@SuppressWarnings("deprecation")
private final String getSubPackage(Definition definition) {
if (definition instanceof MasterDataTableDefinition) {
return "enums";
}
else if (definition instanceof TableDefinition) {
if (definition instanceof TableDefinition) {
return "tables";
}

22
jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
View File

@ -59,7 +59,6 @@ import org.jooq.util.jaxb.EnumType;
import org.jooq.util.jaxb.ForcedType;
import org.jooq.util.jaxb.Generate;
import org.jooq.util.jaxb.Jdbc;
import org.jooq.util.jaxb.MasterDataTable;
import org.jooq.util.jaxb.Property;
import org.jooq.util.jaxb.Schema;
import org.jooq.util.jaxb.Strategy;
@ -114,11 +113,11 @@ public class GenerationTool {
// TODO [#1201] Add better error handling here
xml = xml.replaceAll(
"<(\\w+:)?configuration xmlns(:\\w+)?=\"http://www.jooq.org/xsd/jooq-codegen-\\d+\\.\\d+\\.\\d+.xsd\">",
"<$1configuration xmlns$2=\"http://www.jooq.org/xsd/jooq-codegen-2.5.0.xsd\">");
"<$1configuration xmlns$2=\"http://www.jooq.org/xsd/jooq-codegen-3.0.0.xsd\">");
xml = xml.replace(
"<configuration>",
"<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-2.5.0.xsd\">");
"<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-3.0.0.xsd\">");
main(JAXB.unmarshal(new StringReader(xml), Configuration.class));
}
@ -149,19 +148,6 @@ public class GenerationTool {
Strategy strategy = new Strategy();
strategy.setName(properties.containsKey("generator.strategy") ? properties.getProperty("generator.strategy") : null);
List<MasterDataTable> masterDataTables = new ArrayList<MasterDataTable>();
for (String name : defaultString(properties.getProperty("generator.generate.master-data-tables")).split(",")) {
if (isBlank(name)) continue;
MasterDataTable table = new MasterDataTable();
table.setName(name);
table.setLiteral(properties.getProperty("generator.generate.master-data-table-literal." + name));
table.setDescription(properties.getProperty("generator.generate.master-data-table-description." + name));
masterDataTables.add(table);
}
List<EnumType> enumTypes = new ArrayList<EnumType>();
for (String property : properties.stringPropertyNames()) {
if (property.startsWith("generator.database.enum-type.")) {
@ -196,9 +182,6 @@ public class GenerationTool {
database.setOutputSchema(properties.containsKey("generator.database.output-schema") ? properties.getProperty("generator.database.output-schema") : null);
// Avoid creating these empty elements when migrating
if (!masterDataTables.isEmpty())
database.getMasterDataTables().addAll(masterDataTables);
if (!enumTypes.isEmpty())
database.getEnumTypes().addAll(enumTypes);
@ -344,7 +327,6 @@ public class GenerationTool {
database.setExcludes(defaultString(g.getDatabase().getExcludes()).split(","));
database.setRecordVersionFields(defaultString(g.getDatabase().getRecordVersionFields()).split(","));
database.setRecordTimestampFields(defaultString(g.getDatabase().getRecordTimestampFields()).split(","));
database.setConfiguredMasterDataTables(g.getDatabase().getMasterDataTables());
database.setConfiguredCustomTypes(g.getDatabase().getCustomTypes());
database.setConfiguredEnumTypes(g.getDatabase().getEnumTypes());
database.setConfiguredForcedTypes(g.getDatabase().getForcedTypes());

2
jOOQ-meta/pom.xml
View File

@ -33,7 +33,7 @@
<schemaDirectory>src/main/resources/xsd</schemaDirectory>
<bindingDirectory>src/main/resources/xjb</bindingDirectory>
<schemaIncludes>
<include>jooq-codegen-2.5.0.xsd</include>
<include>jooq-codegen-3.0.0.xsd</include>
</schemaIncludes>
<generatePackage>org.jooq.util.jaxb</generatePackage>
<args>

86
jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
View File

@ -54,7 +54,6 @@ import org.jooq.tools.csv.CSVReader;
import org.jooq.util.jaxb.CustomType;
import org.jooq.util.jaxb.EnumType;
import org.jooq.util.jaxb.ForcedType;
import org.jooq.util.jaxb.MasterDataTable;
import org.jooq.util.jaxb.Schema;
import org.jooq.util.oracle.OracleDatabase;
@ -81,7 +80,6 @@ public abstract class AbstractDatabase implements Database {
private boolean supportsUnsignedTypes;
private boolean dateAsTimestamp;
private List<Schema> configuredSchemata;
private List<MasterDataTable> configuredMasterDataTables;
private List<CustomType> configuredCustomTypes;
private List<EnumType> configuredEnumTypes;
private List<ForcedType> configuredForcedTypes;
@ -94,8 +92,6 @@ public abstract class AbstractDatabase implements Database {
private List<SchemaDefinition> schemata;
private List<SequenceDefinition> sequences;
private List<TableDefinition> tables;
@SuppressWarnings("deprecation")
private List<MasterDataTableDefinition> masterDataTables;
private List<EnumDefinition> enums;
private List<UDTDefinition> udts;
private List<ArrayDefinition> arrays;
@ -262,16 +258,6 @@ public abstract class AbstractDatabase implements Database {
return recordTimestampFields;
}
@Override
public final void setConfiguredMasterDataTables(List<MasterDataTable> configuredMasterDataTables) {
this.configuredMasterDataTables = configuredMasterDataTables;
}
@Override
public final List<MasterDataTable> getConfiguredMasterDataTables() {
return configuredMasterDataTables;
}
@Override
public final void setConfiguredEnumTypes(List<EnumType> configuredEnumTypes) {
this.configuredEnumTypes = configuredEnumTypes;
@ -357,7 +343,7 @@ public abstract class AbstractDatabase implements Database {
tables = new ArrayList<TableDefinition>();
try {
List<TableDefinition> t = filterMasterDataTables(getTables0(), false);
List<TableDefinition> t = getTables0();
tables = filterExcludeInclude(t);
log.info("Tables fetched", fetchedSize(t, tables));
@ -376,45 +362,7 @@ public abstract class AbstractDatabase implements Database {
@Override
public final TableDefinition getTable(SchemaDefinition schema, String name, boolean ignoreCase) {
TableDefinition result = null;
result = getDefinition(getTables(schema), name, ignoreCase);
if (result == null) {
result = getDefinition(getMasterDataTables(schema), name, ignoreCase);
}
return result;
}
@SuppressWarnings("deprecation")
@Override
public final List<MasterDataTableDefinition> getMasterDataTables(SchemaDefinition schema) {
if (masterDataTables == null) {
masterDataTables = new ArrayList<MasterDataTableDefinition>();
try {
List<MasterDataTableDefinition> t = filterMasterDataTables(getTables0(), true);
masterDataTables = filterExcludeInclude(t);
log.info("Masterdata tables fetched", fetchedSize(t, masterDataTables));
} catch (Exception e) {
log.error("Exception while fetching master data tables", e);
}
}
return filterSchema(masterDataTables, schema);
}
@SuppressWarnings("deprecation")
@Override
public final MasterDataTableDefinition getMasterDataTable(SchemaDefinition schema, String name) {
return getMasterDataTable(schema, name, false);
}
@SuppressWarnings("deprecation")
@Override
public final MasterDataTableDefinition getMasterDataTable(SchemaDefinition schema, String name, boolean ignoreCase) {
return getDefinition(getMasterDataTables(schema), name, ignoreCase);
return getDefinition(getTables(schema), name, ignoreCase);
}
@Override
@ -641,36 +589,6 @@ public abstract class AbstractDatabase implements Database {
return result;
}
@SuppressWarnings({ "unchecked", "deprecation" })
private final <T extends TableDefinition> List<T> filterMasterDataTables(List<TableDefinition> list, boolean include) {
List<T> result = new ArrayList<T>();
definitionLoop: for (TableDefinition definition : list) {
for (MasterDataTable table : configuredMasterDataTables) {
if (definition.getName().equals(table.getName())) {
// If we have a match, then add the table only if master
// data tables are included in the result
if (include) {
log.info("DEPRECATION", "Master data tables have been deprecated in jOOQ 2.5.0 and will be removed in jOOQ 3.0. Do not reuse this feature");
result.add((T) new DefaultMasterDataTableDefinition(definition));
}
continue definitionLoop;
}
}
// If we don't have any match, then add the table only if
// master data tables are excluded in the result
if (!include) {
result.add((T) definition);
}
}
return result;
}
/**
* Retrieve ALL relations from the database.
*/

32
jOOQ-meta/src/main/java/org/jooq/util/Database.java
View File

@ -44,7 +44,6 @@ import org.jooq.impl.Factory;
import org.jooq.util.jaxb.CustomType;
import org.jooq.util.jaxb.EnumType;
import org.jooq.util.jaxb.ForcedType;
import org.jooq.util.jaxb.MasterDataTable;
import org.jooq.util.jaxb.Schema;
/**
@ -89,25 +88,6 @@ public interface Database {
*/
TableDefinition getTable(SchemaDefinition schema, String name, boolean ignoreCase);
/**
* The master data tables contained in this database (for schema
* {@link #getSchema(String)})
*/
@SuppressWarnings("deprecation")
List<MasterDataTableDefinition> getMasterDataTables(SchemaDefinition schema);
/**
* Get a master data table in this database by name
*/
@SuppressWarnings("deprecation")
MasterDataTableDefinition getMasterDataTable(SchemaDefinition schema, String name);
/**
* Get a master data table in this database by name
*/
@SuppressWarnings("deprecation")
MasterDataTableDefinition getMasterDataTable(SchemaDefinition schema, String name, boolean ignoreCase);
/**
* The enum UDTs defined in this database
*/
@ -239,18 +219,6 @@ public interface Database {
*/
String[] getRecordTimestampFields();
/**
* Database objects matching any of these table names will be generated as
* master data tables.
*/
void setConfiguredMasterDataTables(List<MasterDataTable> tables);
/**
* Database objects matching any of these table names will be generated as
* master data tables.
*/
List<MasterDataTable> getConfiguredMasterDataTables();
/**
* Database objects matching any of these field names will be generated as
* custom types

38
jOOQ-meta/src/main/java/org/jooq/util/DefaultColumnDefinition.java
View File

@ -48,33 +48,21 @@ public class DefaultColumnDefinition
implements ColumnDefinition {
private final int position;
private final DataTypeDefinition underlying;
private final boolean isIdentity;
private final boolean nullable;
private DataTypeDefinition type;
private boolean primaryKeyLoaded;
private UniqueKeyDefinition primaryKey;
private List<UniqueKeyDefinition> uniqueKeys;
private boolean foreignKeyLoaded;
private ForeignKeyDefinition foreignKey;
/**
* @deprecated - 2.1.0 - Use the other constructor instead
*/
@Deprecated
public DefaultColumnDefinition(TableDefinition table, String name, int position, DataTypeDefinition type,
boolean isIdentity, String comment) {
this(table, name, position, type, true, isIdentity, comment);
}
public DefaultColumnDefinition(TableDefinition table, String name, int position, DataTypeDefinition type,
boolean nullable, boolean isIdentity, String comment) {
super(table, name, position, type, comment);
this.position = position;
this.underlying = type;
this.isIdentity = isIdentity;
this.nullable = nullable;
}
@ -84,32 +72,6 @@ public class DefaultColumnDefinition
return position;
}
@SuppressWarnings("deprecation")
@Override
public final DataTypeDefinition getType() {
// Lazy initialise
if (type == null) {
ForeignKeyDefinition fk = getDatabase().getRelations().getForeignKey(this);
// If this is a foreign key to a master data type
if (fk != null) {
TableDefinition referencedTable = fk.getReferencedTable();
if (referencedTable instanceof MasterDataTableDefinition) {
type = new MasterDataTypeDefinition(referencedTable, underlying);
}
}
// Else...
if (type == null) {
type = super.getType();
}
}
return type;
}
@Override
public final UniqueKeyDefinition getPrimaryKey() {
if (!primaryKeyLoaded) {

182
jOOQ-meta/src/main/java/org/jooq/util/DefaultMasterDataTableDefinition.java
View File

@ -1,182 +0,0 @@
/**
* Copyright (c) 2009-2012, Lukas Eder, lukas.eder@gmail.com
* All rights reserved.
*
* This software is licensed to you under the Apache License, Version 2.0
* (the "License"); You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* . Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* . Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* . Neither the name "jOOQ" nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.jooq.util;
import static org.jooq.impl.Factory.field;
import java.util.Arrays;
import java.util.List;
import org.jooq.Record;
import org.jooq.Result;
import org.jooq.Table;
import org.jooq.exception.DataAccessException;
import org.jooq.tools.JooqLogger;
import org.jooq.util.jaxb.MasterDataTable;
/**
* A default definition for a master data table
*
* @author Lukas Eder
* @deprecated - 2.5.0 [#1741] - This feature will be removed as of jOOQ 3.0
*/
@Deprecated
public class DefaultMasterDataTableDefinition extends AbstractDefinition implements MasterDataTableDefinition {
private static final JooqLogger log = JooqLogger.getLogger(DefaultMasterDataTableDefinition.class);
private final TableDefinition delegate;
private Result<Record> data;
private boolean dataFetched;
public DefaultMasterDataTableDefinition(TableDefinition delegate) {
super(delegate.getDatabase(), delegate.getSchema(), delegate.getName(), delegate.getComment());
this.delegate = delegate;
}
@Override
public List<Definition> getDefinitionPath() {
return Arrays.<Definition>asList(getSchema(), this);
}
@Override
public ColumnDefinition getPrimaryKeyColumn() {
for (ColumnDefinition column : getColumns()) {
if (getDatabase().getRelations().getPrimaryKey(column) != null) {
return column;
}
}
return null;
}
@Override
public ColumnDefinition getLiteralColumn() {
String columnName = getConfiguredMasterDataTable().getLiteral();
if (columnName == null) {
columnName = getPrimaryKeyColumn().getName();
}
return getColumn(columnName);
}
@Override
public ColumnDefinition getDescriptionColumn() {
String columnName = getConfiguredMasterDataTable().getDescription();
if (columnName == null) {
columnName = getLiteralColumn().getName();
}
return getColumn(columnName);
}
private final MasterDataTable getConfiguredMasterDataTable() {
for (MasterDataTable table : getDatabase().getConfiguredMasterDataTables()) {
if (table.getName().equals(getName())) {
return table;
}
}
return null;
}
@Override
public Result<Record> getData() {
if (!dataFetched) {
dataFetched = true;
try {
data = create().select()
.from(delegate.getTable())
.orderBy(field(getPrimaryKeyColumn().getName()))
.fetch();
}
catch (DataAccessException e) {
log.error("Error while initialising master data", e);
}
}
return data;
}
@Override
public UniqueKeyDefinition getMainUniqueKey() {
return delegate.getMainUniqueKey();
}
@Override
public List<UniqueKeyDefinition> getUniqueKeys() {
return delegate.getUniqueKeys();
}
@Override
public List<ForeignKeyDefinition> getForeignKeys() {
return delegate.getForeignKeys();
}
@Override
public IdentityDefinition getIdentity() {
return delegate.getIdentity();
}
@Override
public List<ColumnDefinition> getColumns() {
return delegate.getColumns();
}
@Override
public ColumnDefinition getColumn(String columnName) {
return delegate.getColumn(columnName);
}
@Override
public ColumnDefinition getColumn(String columnName, boolean ignoreCase) {
return delegate.getColumn(columnName, ignoreCase);
}
@Override
public ColumnDefinition getColumn(int columnIndex) {
return delegate.getColumn(columnIndex);
}
@Override
public Table<Record> getTable() {
return delegate.getTable();
}
}

72
jOOQ-meta/src/main/java/org/jooq/util/MasterDataTableDefinition.java
View File

@ -1,72 +0,0 @@
/**
* Copyright (c) 2009-2012, Lukas Eder, lukas.eder@gmail.com
* All rights reserved.
*
* This software is licensed to you under the Apache License, Version 2.0
* (the "License"); You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* . Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* . Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* . Neither the name "jOOQ" nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.jooq.util;
import org.jooq.Record;
import org.jooq.Result;
/**
* A definition for a master data table
*
* @author Lukas Eder
* @deprecated - 2.5.0 [#1741] - This feature will be removed as of jOOQ 3.0
*/
@Deprecated
public interface MasterDataTableDefinition extends TableDefinition {
/**
* The primary key for this master data table. This will not be
* <code>null</code>.
*/
ColumnDefinition getPrimaryKeyColumn();
/**
* The column used for generating literals in the generated class. This may
* be <code>null</code>.
*/
ColumnDefinition getLiteralColumn();
/**
* The column used for generating a description (Javadoc) in the generated
* class. This may be <code>null</code>.
*/
ColumnDefinition getDescriptionColumn();
/**
* The data contained in the master table
*/
Result<Record> getData();
}

98
jOOQ-meta/src/main/java/org/jooq/util/MasterDataTypeDefinition.java
View File

@ -1,98 +0,0 @@
/**
* Copyright (c) 2009-2012, Lukas Eder, lukas.eder@gmail.com
* All rights reserved.
*
* This software is licensed to you under the Apache License, Version 2.0
* (the "License"); You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* . Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* . Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* . Neither the name "jOOQ" nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.jooq.util;
/**
* @author Lukas Eder
* @deprecated - 2.5.0 [#1741] - This feature will be removed as of jOOQ 3.0
*/
@Deprecated
public class MasterDataTypeDefinition implements DataTypeDefinition {
final TableDefinition table;
final DataTypeDefinition underlying;
public MasterDataTypeDefinition(TableDefinition table, DataTypeDefinition underlying) {
this.table = table;
this.underlying = underlying;
}
@Override
public final String getType() {
return underlying.getType();
}
@Override
public final int getLength() {
return underlying.getLength();
}
@Override
public final int getPrecision() {
return underlying.getPrecision();
}
@Override
public final int getScale() {
return underlying.getScale();
}
@Override
public final String getUserType() {
return underlying.getUserType();
}
@Override
public final boolean isGenericNumberType() {
return underlying.isGenericNumberType();
}
@Override
public final boolean isUDT() {
return false;
}
@Override
public final Database getDatabase() {
return underlying.getDatabase();
}
@Override
public final SchemaDefinition getSchema() {
return underlying.getSchema();
}
}

4
jOOQ-meta/src/main/resources/xjb/binding.xjb
View File

@ -11,12 +11,12 @@
<jaxb:globalBindings>
<!-- Force all classes implements Serializable -->
<xjc:serializable uid="250" />
<xjc:serializable uid="300" />
</jaxb:globalBindings>
<!-- Annotate the following classes with @SuppressWarnings -->
<jaxb:bindings schemaLocation="../xsd/jooq-codegen-2.5.0.xsd" multiple="true" node="//xs:complexType">
<jaxb:bindings schemaLocation="../xsd/jooq-codegen-3.0.0.xsd" multiple="true" node="//xs:complexType">
<annox:annotate>
<annox:annotate annox:class="java.lang.SuppressWarnings" value="all" />
</annox:annotate>

375
jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.0.0.xsd Normal file
View File

@ -0,0 +1,375 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.0.0.xsd"
targetNamespace="http://www.jooq.org/xsd/jooq-codegen-3.0.0.xsd"
elementFormDefault="qualified">
<element name="configuration">
<complexType>
<all>
<!--
The JDBC configuration element contains information about how
to set up the database connection used for source code generation
-->
<element name="jdbc" type="tns:Jdbc" minOccurs="1"
maxOccurs="1" />
<!--
The GENERATOR configuration element contains information about
source code generation itself
-->
<element name="generator" type="tns:Generator" minOccurs="1"
maxOccurs="1" />
</all>
</complexType>
</element>
<complexType name="Jdbc">
<all>
<!-- The JDBC driver -->
<element name="driver" type="string" minOccurs="1" maxOccurs="1" />
<!-- The JDBC connection URL -->
<element name="url" type="string" minOccurs="1" maxOccurs="1" />
<!-- Deprecated. Use database schema configuration elements instead -->
<element name="schema" type="string" minOccurs="0" maxOccurs="1" />
<!--
The JDBC connection user. Be sure this user has all required
GRANTs to the dictionary views/tables to generate the desired artefacts
-->
<element name="user" type="string" minOccurs="0" maxOccurs="1" />
<!-- The JDBC connection password -->
<element name="password" type="string" minOccurs="0" maxOccurs="1" />
<!--
Enlist custom JDBC driver properties that are provided to the
java.sql.DriverManager when fetching a connection
-->
<element name="properties" type="tns:Properties" minOccurs="0" maxOccurs="1" />
</all>
</complexType>
<complexType name="Properties">
<sequence>
<element name="property" type="tns:Property" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
</complexType>
<complexType name="Property">
<all>
<element name="key" type="string" minOccurs="1" maxOccurs="1"/>
<element name="value" type="string" minOccurs="1" maxOccurs="1"/>
</all>
</complexType>
<complexType name="Generator">
<all>
<!--
The class used to generate source code. You may override this with
your custom source code generator
-->
<element name="name" type="string" default="org.jooq.util.DefaultGenerator"
minOccurs="0" maxOccurs="1" />
<!-- The naming strategy used for class and field names -->
<element name="strategy" type="tns:Strategy" minOccurs="0" maxOccurs="1" />
<!-- The jooq-meta configuration -->
<element name="database" type="tns:Database" minOccurs="1" maxOccurs="1" />
<!-- The jooq-codegen configuration -->
<element name="generate" type="tns:Generate" minOccurs="0" maxOccurs="1" />
<!-- Some information about generation output -->
<element name="target" type="tns:Target" minOccurs="0" maxOccurs="1" />
</all>
</complexType>
<complexType name="Strategy">
<all>
<!--
The class used to provide a naming strategy for generated source
code. You may override this with your custom naming strategy
-->
<element name="name" type="string" minOccurs="0" maxOccurs="1"
default="org.jooq.util.DefaultGeneratorStrategy" />
</all>
</complexType>
<complexType name="Database">
<all>
<!--
The database dialect from jooq-meta. Available dialects are
named org.util.[database].[database]Database. Known values are:
org.jooq.util.ase.ASEDatabase
org.jooq.util.cubrid.CUBRIDDatabase
org.jooq.util.db2.DB2Database
org.jooq.util.derby.DerbyDatabase
org.jooq.util.h2.H2Database
org.jooq.util.hsqldb.HSQLDBDatabase
org.jooq.util.ingres.IngresDatabase
org.jooq.util.mysql.MySQLDatabase
org.jooq.util.oracle.OracleDatabase
org.jooq.util.postgres.PostgresDatabase
org.jooq.util.sqlite.SQLiteDatabaes
org.jooq.util.sqlserver.SQLServerDatabase
org.jooq.util.sybase.SybaseDatabase
You can also provide your own org.jooq.util.Database implementation
here, if your database is currently not supported
-->
<element name="name" type="string" minOccurs="1" maxOccurs="1" />
<!--
All elements that are generated from your schema (several Java
regular expressions, separated by comma) Watch out for
case-sensitivity. Depending on your database, this might be
important! You can create case-insensitive regular expressions
using this syntax: (?i:expr)A comma-separated list of regular
expressions
-->
<element name="includes" type="string" default=".*" minOccurs="0" maxOccurs="1" />
<!--
All elements that are excluded from your schema (several Java
regular expressions, separated by comma). Excludes match before
includes
-->
<element name="excludes" type="string" default="" minOccurs="0" maxOccurs="1" />
<!--
All table and view columns that are used as "version" fields for
optimistic locking (several Java regular expressions, separated by comma).
See UpdatableRecord.store() and UpdatableRecord.delete() for details
-->
<element name="recordVersionFields" type="string" default="" minOccurs="0" maxOccurs="1" />
<!--
All table and view columns that are used as "timestamp" fields for
optimistic locking (several Java regular expressions, separated by comma).
See UpdatableRecord.store() and UpdatableRecord.delete() for details
-->
<element name="recordTimestampFields" type="string" default="" minOccurs="0" maxOccurs="1" />
<!--
Generate java.sql.Timestamp fields for DATE columns. This is
particularly useful for Oracle databases
-->
<element name="dateAsTimestamp" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
<!--
Generate jOOU data types for your unsigned data types, which are
not natively supported in Java
-->
<element name="unsignedTypes" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
<!--
The schema that is used locally as a source for meta information.
This could be your development schema or the production schema, etc
This cannot be combined with the schemata element.
If left empty (and without any schemata element), jOOQ will generate all available schemata.
For backwards compatibility, this defaults to jdbc/schema
-->
<element name="inputSchema" type="string" default="" minOccurs="0" maxOccurs="1" />
<!--
The schema that is used in generated source code. This will be the
production schema. Use this to override your local development
schema name for source code generation. If not specified, this
will be the same as the input-schema.
-->
<element name="outputSchema" type="string" default="" minOccurs="0" maxOccurs="1" />
<!--
A configuration element to configure several input and/or output
schemata for jooq-meta, in case you're using jooq-meta in a multi-
schema environment
-->
<element name="schemata" type="tns:Schemata" minOccurs="0" maxOccurs="1"/>
<!--
A configuration element to configure custom types introduced to jOOQ
using converters
This is EXPERIMENTAL functionality. Use at your own risk
-->
<element name="customTypes" type="tns:CustomTypes" minOccurs="0" maxOccurs="1"/>
<!--
A configuration element to configure synthetic enum types
This is EXPERIMENTAL / DEPRECATED functionality. Do not re-use
-->
<element name="enumTypes" type="tns:EnumTypes" minOccurs="0" maxOccurs="1"/>
<!--
A configuration element to configure type overrides for generated
artefacts (e.g. in combination with enumTypes)
This is EXPERIMENTAL functionality. Use at your own risk
-->
<element name="forcedTypes" type="tns:ForcedTypes" minOccurs="0" maxOccurs="1"/>
</all>
</complexType>
<complexType name="Schemata">
<sequence>
<!--
A configuration element for a single schema in multi-schema
environments
-->
<element name="schema" type="tns:Schema" minOccurs="1" maxOccurs="unbounded"/>
</sequence>
</complexType>
<complexType name="Schema">
<all>
<!-- See also database/inputSchema -->
<element name="inputSchema" type="string" default="" minOccurs="1" maxOccurs="1" />
<!-- See also database/outputSchema -->
<element name="outputSchema" type="string" default="" minOccurs="0" maxOccurs="1" />
</all>
</complexType>
<complexType name="CustomTypes">
<sequence>
<!-- A configuration element for a custom type -->
<element name="customType" type="tns:CustomType" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="EnumTypes">
<sequence>
<!-- A configuration element for a synthetic enum type -->
<element name="enumType" type="tns:EnumType" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="ForcedTypes">
<sequence>
<!-- A configuration element for a forced type override -->
<element name="forcedType" type="tns:ForcedType" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="CustomType">
<all>
<!-- The name of the custom type -->
<element name="name" type="string" minOccurs="1" maxOccurs="1" />
<!-- A converter implementation for the custom type -->
<element name="converter" type="string" minOccurs="1" maxOccurs="1" />
</all>
</complexType>
<complexType name="EnumType">
<all>
<!-- The name of the synthetic enum type -->
<element name="name" type="string" minOccurs="1" maxOccurs="1" />
<!-- A comma separated (CSV format) list of enum literals -->
<element name="literals" type="string" minOccurs="1" maxOccurs="1" />
</all>
</complexType>
<complexType name="ForcedType">
<all>
<!-- The name of the type to be forced upon various artefacts -->
<element name="name" type="string" minOccurs="1" maxOccurs="1" />
<!--
A comma-separated list of Java regular expressions matching
columns, parameters, attributes, etc to be forced to have this
type
-->
<element name="expressions" type="string" minOccurs="1" maxOccurs="1" />
</all>
</complexType>
<complexType name="Generate">
<all>
<!--
Primary key / foreign key relations should be generated and used.
This is a prerequisite for various advanced features
-->
<element name="relations" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
<!--
Generate navigation methods to navigate foreign key relationships
directly from Record classes. This is only relevant if relations
is set to true, too
-->
<element name="navigationMethods" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
<!-- Generate deprecated code for backwards compatibility -->
<element name="deprecated" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
<!--
Generate instance fields in your tables, as opposed to static
fields. This simplifies aliasing
-->
<element name="instanceFields" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
<!--
Generate the javax.annotation.Generated annotation to indicate
jOOQ version used for source code
-->
<element name="generatedAnnotation" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
<!--
Generate TableRecord classes. Disable this when you don't
need the additional type-safety
-->
<element name="records" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
<!--
Generate POJOs for usage of the ResultQuery.fetchInto(Class) API
-->
<element name="pojos" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
<!--
Generate immutable POJOs for usage of the ResultQuery.fetchInto(Class) API
This overrides any value set in <pojos/>
-->
<element name="immutablePojos" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
<!--
Generate interfaces that will be implemented by records and/or pojos.
You can also use these interfaces in Record.into(Class<?>) and similar
methods, to let jOOQ return proxy objects for them.
-->
<element name="interfaces" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
<!--
Generate DAOs in addition to POJO classes
-->
<element name="daos" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
<!--
Annotate POJOs and Records with JPA annotations for increased
compatibility and better integration with JPA/Hibernate, etc
-->
<element name="jpaAnnotations" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
<!--
Annotate POJOs and Records with JSR-303 validation annotations
-->
<element name="validationAnnotations" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
</all>
</complexType>
<complexType name="Target">
<all>
<!--
The destination package of your generated classes (within the
destination directory)
-->
<element name="packageName" type="string" default="org.jooq.generated" minOccurs="0" maxOccurs="1" />
<!-- The destination directory of your generated classes -->
<element name="directory" type="string" default="target/generated-sources/jooq" />
</all>
</complexType>
</schema>

8
jOOQ-test/configuration/org/jooq/configuration/IvanD/h2/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.relations=true
generator.generate.instance-fields=false
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=T_LANGUAGE,T_658_11,T_658_21,T_658_31,T_658_12,T_658_22,T_658_32
generator.generate.master-data-table-literal.T_LANGUAGE=CD
generator.generate.master-data-table-description.T_LANGUAGE=DESCRIPTION
generator.generate.master-data-table-literal.T_658_12=CD
generator.generate.master-data-table-literal.T_658_22=CD
generator.generate.master-data-table-literal.T_658_32=CD
generator.target.package=org.jooq.test.h2.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/IvanD/h2/library.xml
View File

@ -17,34 +17,6 @@
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<inputSchema>PUBLIC</inputSchema>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/espen/db2/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.relations=true
generator.generate.instance-fields=false
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=T_LANGUAGE,T_658_11,T_658_21,T_658_31,T_658_12,T_658_22,T_658_32
generator.generate.master-data-table-literal.T_LANGUAGE=CD
generator.generate.master-data-table-description.T_LANGUAGE=DESCRIPTION
generator.generate.master-data-table-literal.T_658_12=CD
generator.generate.master-data-table-literal.T_658_22=CD
generator.generate.master-data-table-literal.T_658_32=CD
generator.target.package=org.jooq.test.db2.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/espen/db2/library.xml
View File

@ -15,34 +15,6 @@
<excludes>T_BOOK_DETAILS</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/espen/h2/library.properties
View File

@ -35,13 +35,5 @@ generator.generate.relations=true
generator.generate.instance-fields=false
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=T_LANGUAGE,T_658_11,T_658_21,T_658_31,T_658_12,T_658_22,T_658_32
generator.generate.master-data-table-literal.T_LANGUAGE=CD
generator.generate.master-data-table-description.T_LANGUAGE=DESCRIPTION
generator.generate.master-data-table-literal.T_658_12=CD
generator.generate.master-data-table-literal.T_658_22=CD
generator.generate.master-data-table-literal.T_658_32=CD
generator.target.package=org.jooq.test.h2.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/espen/h2/library.xml
View File

@ -15,34 +15,6 @@
<excludes>T_BOOK_DETAILS,SYSTEM_SEQUENCE.*</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/library.properties
View File

@ -34,13 +34,5 @@ generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN)
generator.generate.relations=true
generator.generate.instance-fields=true
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=T_LANGUAGE,T_658_11,T_658_21,T_658_31,T_658_12,T_658_22,T_658_32
generator.generate.master-data-table-literal.T_LANGUAGE=CD
generator.generate.master-data-table-description.T_LANGUAGE=DESCRIPTION
generator.generate.master-data-table-literal.T_658_12=CD
generator.generate.master-data-table-literal.T_658_22=CD
generator.generate.master-data-table-literal.T_658_32=CD
generator.target.package=org.jooq.test.hsqldb.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/library.xml
View File

@ -15,34 +15,6 @@
<excludes>T_BOOK_DETAILS,S_TRIGGERS_SEQUENCE</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>
<name>org.jooq.test._.converters.StringEnum</name>

8
jOOQ-test/configuration/org/jooq/configuration/espen/sybase/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.records=true
generator.generate.instance-fields=true
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=t_language,t_658_11,t_658_21,t_658_31,t_658_12,t_658_22,t_658_32
generator.generate.master-data-table-literal.t_language=cd
generator.generate.master-data-table-description.t_language=description
generator.generate.master-data-table-literal.t_658_12=cd
generator.generate.master-data-table-literal.t_658_22=cd
generator.generate.master-data-table-literal.t_658_32=cd
generator.target.package=org.jooq.test.sybase.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/espen/sybase/library.xml
View File

@ -15,34 +15,6 @@
<includes>t_.*,x_.*,v_.*,V_.*,p_.*,f_.*,(f|p)[0-9]+,s_.*</includes>
<excludes>t_book_details</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<masterDataTables>
<masterDataTable>
<name>t_language</name>
<literal>cd</literal>
<description>description</description>
</masterDataTable>
<masterDataTable>
<name>t_658_11</name>
</masterDataTable>
<masterDataTable>
<name>t_658_21</name>
</masterDataTable>
<masterDataTable>
<name>t_658_31</name>
</masterDataTable>
<masterDataTable>
<name>t_658_12</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_22</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_32</name>
<literal>cd</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>
<name>org.jooq.test._.converters.Boolean_10</name>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.records=true
generator.generate.instance-fields=false
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=t_language,t_658_11,t_658_21,t_658_31,t_658_12,t_658_22,t_658_32
generator.generate.master-data-table-literal.t_language=cd
generator.generate.master-data-table-description.t_language=description
generator.generate.master-data-table-literal.t_658_12=cd
generator.generate.master-data-table-literal.t_658_22=cd
generator.generate.master-data-table-literal.t_658_32=cd
generator.target.package=org.jooq.test.ase.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.xml
View File

@ -15,34 +15,6 @@
<excludes>t_book_details</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>t_language</name>
<literal>cd</literal>
<description>description</description>
</masterDataTable>
<masterDataTable>
<name>t_658_11</name>
</masterDataTable>
<masterDataTable>
<name>t_658_21</name>
</masterDataTable>
<masterDataTable>
<name>t_658_31</name>
</masterDataTable>
<masterDataTable>
<name>t_658_12</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_22</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_32</name>
<literal>cd</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

28
jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/library.xml
View File

@ -15,34 +15,6 @@
<excludes>t_book_details</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>t_language</name>
<literal>cd</literal>
<description>description</description>
</masterDataTable>
<masterDataTable>
<name>t_658_11</name>
</masterDataTable>
<masterDataTable>
<name>t_658_21</name>
</masterDataTable>
<masterDataTable>
<name>t_658_31</name>
</masterDataTable>
<masterDataTable>
<name>t_658_12</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_22</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_32</name>
<literal>cd</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.relations=true
generator.generate.instance-fields=false
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=T_LANGUAGE,T_658_11,T_658_21,T_658_31,T_658_12,T_658_22,T_658_32
generator.generate.master-data-table-literal.T_LANGUAGE=CD
generator.generate.master-data-table-description.T_LANGUAGE=DESCRIPTION
generator.generate.master-data-table-literal.T_658_12=CD
generator.generate.master-data-table-literal.T_658_22=CD
generator.generate.master-data-table-literal.T_658_32=CD
generator.target.package=org.jooq.test.db2.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.xml
View File

@ -15,34 +15,6 @@
<excludes>T_BOOK_DETAILS</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.properties
View File

@ -35,13 +35,5 @@ generator.generate.relations=true
generator.generate.instance-fields=false
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=T_LANGUAGE,T_658_11,T_658_21,T_658_31,T_658_12,T_658_22,T_658_32
generator.generate.master-data-table-literal.T_LANGUAGE=CD
generator.generate.master-data-table-description.T_LANGUAGE=DESCRIPTION
generator.generate.master-data-table-literal.T_658_12=CD
generator.generate.master-data-table-literal.T_658_22=CD
generator.generate.master-data-table-literal.T_658_32=CD
generator.target.package=org.jooq.test.derby.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml
View File

@ -17,34 +17,6 @@
<recordVersionFields>REC_VERSION</recordVersionFields>
<recordTimestampFields>REC_TIMESTAMP</recordTimestampFields>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

28
jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.xml
View File

@ -24,34 +24,6 @@
<recordTimestampFields>REC_TIMESTAMP</recordTimestampFields>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>
<name>org.jooq.test._.converters.StringEnum</name>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.relations=true
generator.generate.instance-fields=false
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=T_LANGUAGE,T_658_11,T_658_21,T_658_31,T_658_12,T_658_22,T_658_32
generator.generate.master-data-table-literal.T_LANGUAGE=CD
generator.generate.master-data-table-description.T_LANGUAGE=DESCRIPTION
generator.generate.master-data-table-literal.T_658_12=CD
generator.generate.master-data-table-literal.T_658_22=CD
generator.generate.master-data-table-literal.T_658_32=CD
generator.target.package=org.jooq.test.h2.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml
View File

@ -17,34 +17,6 @@
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<inputSchema>PUBLIC</inputSchema>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.properties
View File

@ -34,13 +34,5 @@ generator.database.forced-type.BOOLEAN=(?i:(.*?\.)?T_BOOLEANS\.(VC|C|N)_BOOLEAN)
generator.generate.relations=true
generator.generate.instance-fields=
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=T_LANGUAGE,T_658_11,T_658_21,T_658_31,T_658_12,T_658_22,T_658_32
generator.generate.master-data-table-literal.T_LANGUAGE=CD
generator.generate.master-data-table-description.T_LANGUAGE=DESCRIPTION
generator.generate.master-data-table-literal.T_658_12=CD
generator.generate.master-data-table-literal.T_658_22=CD
generator.generate.master-data-table-literal.T_658_32=CD
generator.target.package=org.jooq.test.hsqldb.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.xml
View File

@ -25,34 +25,6 @@
<recordTimestampFields>REC_TIMESTAMP</recordTimestampFields>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>
<name>org.jooq.test._.converters.StringEnum</name>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/library.properties
View File

@ -35,13 +35,5 @@ generator.generate.relations=true
generator.generate.instance-fields=false
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=t_language,t_658_11,t_658_21,t_658_31,t_658_12,t_658_22,t_658_32
generator.generate.master-data-table-literal.t_language=cd
generator.generate.master-data-table-description.t_language=description
generator.generate.master-data-table-literal.t_658_12=cd
generator.generate.master-data-table-literal.t_658_22=cd
generator.generate.master-data-table-literal.t_658_32=cd
generator.target.package=org.jooq.test.ingres.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/library.xml
View File

@ -13,34 +13,6 @@
<excludes>t_book_details</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>t_language</name>
<literal>cd</literal>
<description>description</description>
</masterDataTable>
<masterDataTable>
<name>t_658_11</name>
</masterDataTable>
<masterDataTable>
<name>t_658_21</name>
</masterDataTable>
<masterDataTable>
<name>t_658_31</name>
</masterDataTable>
<masterDataTable>
<name>t_658_12</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_22</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_32</name>
<literal>cd</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.properties
View File

@ -42,13 +42,5 @@ generator.generate.generated-annotation=false
generator.generate.pojos=true
generator.generate.jpa-annotations=true
#Generate a master data table enum from t_language
generator.generate.master-data-tables=t_language,t_658_11,t_658_21,t_658_31,t_658_12,t_658_22,t_658_32
generator.generate.master-data-table-literal.t_language=CD
generator.generate.master-data-table-description.t_language=DESCRIPTION
generator.generate.master-data-table-literal.t_658_12=cd
generator.generate.master-data-table-literal.t_658_22=cd
generator.generate.master-data-table-literal.t_658_32=cd
generator.target.package=org.jooq.test.mysql2.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.xml
View File

@ -17,34 +17,6 @@
<unsignedTypes>true</unsignedTypes>
<inputSchema>test</inputSchema>
<outputSchema>test2</outputSchema>
<masterDataTables>
<masterDataTable>
<name>t_language</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>t_658_11</name>
</masterDataTable>
<masterDataTable>
<name>t_658_21</name>
</masterDataTable>
<masterDataTable>
<name>t_658_31</name>
</masterDataTable>
<masterDataTable>
<name>t_658_12</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_22</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_32</name>
<literal>cd</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.instance-fields=false
generator.generate.generated-annotation=false
generator.generate.pojos=true
#Generate a master data table enum from t_language
generator.generate.master-data-tables=t_language,t_658_11,t_658_21,t_658_31,t_658_12,t_658_22,t_658_32
generator.generate.master-data-table-literal.t_language=CD
generator.generate.master-data-table-description.t_language=DESCRIPTION
generator.generate.master-data-table-literal.t_658_12=cd
generator.generate.master-data-table-literal.t_658_22=cd
generator.generate.master-data-table-literal.t_658_32=cd
generator.target.package=org.jooq.test.mysql.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.xml
View File

@ -15,34 +15,6 @@
<excludes>t_book_details</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>t_language</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>t_658_11</name>
</masterDataTable>
<masterDataTable>
<name>t_658_21</name>
</masterDataTable>
<masterDataTable>
<name>t_658_31</name>
</masterDataTable>
<masterDataTable>
<name>t_658_12</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_22</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_32</name>
<literal>cd</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

2
jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/sakila.properties
View File

@ -20,7 +20,5 @@ generator.strategy.record-class-prefix=sakila_r_
generator.strategy.record-class-suffix=_record
generator.strategy.member-scheme=case-sensitive
#Generate a master data table enum from t_language
generator.target.package=org.jooq.examples.mysql.sakila
generator.target.directory=./examples

28
jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library-custom-strategy.xml
View File

@ -26,34 +26,6 @@
<inputSchema>TEST</inputSchema>
</schema>
</schemata>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
</database>
<generate>
<relations>true</relations>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.instance-fields=
generator.generate.generated-annotation=false
generator.generate.pojos=true
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=T_LANGUAGE,T_658_11,T_658_21,T_658_31,T_658_12,T_658_22,T_658_32
generator.generate.master-data-table-literal.T_LANGUAGE=CD
generator.generate.master-data-table-description.T_LANGUAGE=DESCRIPTION
generator.generate.master-data-table-literal.T_658_12=CD
generator.generate.master-data-table-literal.T_658_22=CD
generator.generate.master-data-table-literal.T_658_32=CD
generator.target.package=org.jooq.test.oracle.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml
View File

@ -22,34 +22,6 @@
<inputSchema>MULTI_SCHEMA</inputSchema>
</schema>
</schemata>
<masterDataTables>
<masterDataTable>
<name>T_LANGUAGE</name>
<literal>CD</literal>
<description>DESCRIPTION</description>
</masterDataTable>
<masterDataTable>
<name>T_658_11</name>
</masterDataTable>
<masterDataTable>
<name>T_658_21</name>
</masterDataTable>
<masterDataTable>
<name>T_658_31</name>
</masterDataTable>
<masterDataTable>
<name>T_658_12</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_22</name>
<literal>CD</literal>
</masterDataTable>
<masterDataTable>
<name>T_658_32</name>
<literal>CD</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.properties
View File

@ -38,13 +38,5 @@ generator.generate.generated-annotation=false
generator.generate.pojos=true
generator.generate.jpa-annotations=true
#Generate a master data table enum from t_language
generator.generate.master-data-tables=t_language,t_658_11,t_658_21,t_658_31,t_658_12,t_658_22,t_658_32
generator.generate.master-data-table-literal.t_language=cd
generator.generate.master-data-table-description.t_language=description
generator.generate.master-data-table-literal.t_658_12=cd
generator.generate.master-data-table-literal.t_658_22=cd
generator.generate.master-data-table-literal.t_658_32=cd
generator.target.package=org.jooq.test.postgres.generatedclasses
generator.target.directory=./src

29
jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.xml
View File

@ -15,35 +15,6 @@
<excludes>t_book_details,.*?_seq</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>t_language</name>
<literal>cd</literal>
<description>description</description>
</masterDataTable>
<masterDataTable>
<name>t_658_11</name>
</masterDataTable>
<masterDataTable>
<name>t_658_21</name>
</masterDataTable>
<masterDataTable>
<name>t_658_31</name>
</masterDataTable>
<masterDataTable>
<name>t_658_12</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_22</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_32</name>
<literal>cd</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>
<name>org.jooq.test._.converters.Boolean_10</name>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.properties
View File

@ -35,13 +35,5 @@ generator.generate.relations=true
generator.generate.instance-fields=false
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=t_language,t_658_11,t_658_21,t_658_31,t_658_12,t_658_22,t_658_32
generator.generate.master-data-table-literal.t_language=cd
generator.generate.master-data-table-description.t_language=description
generator.generate.master-data-table-literal.t_658_12=cd
generator.generate.master-data-table-literal.t_658_22=cd
generator.generate.master-data-table-literal.t_658_32=cd
generator.target.package=org.jooq.test.sqlite.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.xml
View File

@ -15,34 +15,6 @@
<excludes>t_book_details,sqlite_sequence</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<unsignedTypes>true</unsignedTypes>
<masterDataTables>
<masterDataTable>
<name>t_language</name>
<literal>cd</literal>
<description>description</description>
</masterDataTable>
<masterDataTable>
<name>t_658_11</name>
</masterDataTable>
<masterDataTable>
<name>t_658_21</name>
</masterDataTable>
<masterDataTable>
<name>t_658_31</name>
</masterDataTable>
<masterDataTable>
<name>t_658_12</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_22</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_32</name>
<literal>cd</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.instance-fields=true
generator.generate.generated-annotation=false
generator.generate.pojos=true
#Generate a master data table enum from t_language
generator.generate.master-data-tables=t_language,t_658_11,t_658_21,t_658_31,t_658_12,t_658_22,t_658_32
generator.generate.master-data-table-literal.t_language=cd
generator.generate.master-data-table-description.t_language=description
generator.generate.master-data-table-literal.t_658_12=cd
generator.generate.master-data-table-literal.t_658_22=cd
generator.generate.master-data-table-literal.t_658_32=cd
generator.target.package=org.jooq.test.sqlserver.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/library.xml
View File

@ -15,34 +15,6 @@
<jooq:includes>t_.*,x_.*,v_.*,p_.*,f_.*,(f|p)[0-9]+,s_.*</jooq:includes>
<jooq:excludes>t_book_details</jooq:excludes>
<jooq:dateAsTimestamp>false</jooq:dateAsTimestamp>
<jooq:masterDataTables>
<jooq:masterDataTable>
<jooq:name>t_language</jooq:name>
<jooq:literal>cd</jooq:literal>
<jooq:description>description</jooq:description>
</jooq:masterDataTable>
<jooq:masterDataTable>
<jooq:name>t_658_11</jooq:name>
</jooq:masterDataTable>
<jooq:masterDataTable>
<jooq:name>t_658_21</jooq:name>
</jooq:masterDataTable>
<jooq:masterDataTable>
<jooq:name>t_658_31</jooq:name>
</jooq:masterDataTable>
<jooq:masterDataTable>
<jooq:name>t_658_12</jooq:name>
<jooq:literal>cd</jooq:literal>
</jooq:masterDataTable>
<jooq:masterDataTable>
<jooq:name>t_658_22</jooq:name>
<jooq:literal>cd</jooq:literal>
</jooq:masterDataTable>
<jooq:masterDataTable>
<jooq:name>t_658_32</jooq:name>
<jooq:literal>cd</jooq:literal>
</jooq:masterDataTable>
</jooq:masterDataTables>
<jooq:customTypes>
<jooq:customType>
<jooq:name>org.jooq.test._.converters.Boolean_10</jooq:name>

8
jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.properties
View File

@ -36,13 +36,5 @@ generator.generate.records=true
generator.generate.instance-fields=true
generator.generate.generated-annotation=false
#Generate a master data table enum from T_LANGUAGE
generator.generate.master-data-tables=t_language,t_658_11,t_658_21,t_658_31,t_658_12,t_658_22,t_658_32
generator.generate.master-data-table-literal.t_language=cd
generator.generate.master-data-table-description.t_language=description
generator.generate.master-data-table-literal.t_658_12=cd
generator.generate.master-data-table-literal.t_658_22=cd
generator.generate.master-data-table-literal.t_658_32=cd
generator.target.package=org.jooq.test.sybase.generatedclasses
generator.target.directory=./src

28
jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.xml
View File

@ -15,34 +15,6 @@
<includes>t_.*,x_.*,v_.*,V_.*,p_.*,f_.*,(f|p)[0-9]+,s_.*</includes>
<excludes>t_book_details</excludes>
<dateAsTimestamp>false</dateAsTimestamp>
<masterDataTables>
<masterDataTable>
<name>t_language</name>
<literal>cd</literal>
<description>description</description>
</masterDataTable>
<masterDataTable>
<name>t_658_11</name>
</masterDataTable>
<masterDataTable>
<name>t_658_21</name>
</masterDataTable>
<masterDataTable>
<name>t_658_31</name>
</masterDataTable>
<masterDataTable>
<name>t_658_12</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_22</name>
<literal>cd</literal>
</masterDataTable>
<masterDataTable>
<name>t_658_32</name>
<literal>cd</literal>
</masterDataTable>
</masterDataTables>
<customTypes>
<customType>

15
jOOQ-test/examples/org/jooq/examples/Library.java
View File

@ -35,6 +35,7 @@
*/
package org.jooq.examples;
import static org.jooq.test.mysql.generatedclasses.Tables.T_LANGUAGE;
import static org.jooq.test.mysql.generatedclasses.tables.TAuthor.T_AUTHOR;
import static org.jooq.test.mysql.generatedclasses.tables.TBook.T_BOOK;
@ -48,9 +49,9 @@ import org.jooq.Select;
import org.jooq.SelectQuery;
import org.jooq.impl.Factory;
import org.jooq.test.mysql.generatedclasses.enums.TBookStatus;
import org.jooq.test.mysql.generatedclasses.enums.TLanguage;
import org.jooq.test.mysql.generatedclasses.tables.TAuthor;
import org.jooq.test.mysql.generatedclasses.tables.TBook;
import org.jooq.test.mysql.generatedclasses.tables.TLanguage;
import org.jooq.test.mysql.generatedclasses.tables.records.TAuthorRecord;
import org.jooq.test.mysql.generatedclasses.tables.records.TBookRecord;
@ -177,10 +178,16 @@ public class Library {
}
for (TAuthorRecord record : create().selectFrom(T_AUTHOR)
.where(TAuthor.ID.in(create().selectDistinct(TBook.AUTHOR_ID)
.from(T_BOOK).where(TBook.LANGUAGE_ID.in(TLanguage.en, TLanguage.pt)))).fetch()) {
.where(TAuthor.ID.in(create()
.selectDistinct(TBook.AUTHOR_ID)
.from(T_BOOK)
.where(TBook.LANGUAGE_ID.in(
create().select(TLanguage.ID)
.from(T_LANGUAGE)
.where(TLanguage.CD.in("pt", "en"))
)))).fetch()) {
System.out.println("Author : " + record.getFirstName() + " " + record.getLastName() + " have english or portuguese books");
System.out.println("Author : " + record.getFirstName() + " " + record.getLastName() + " has english or portuguese books");
}
Select<?> union =

10
jOOQ-test/src/org/jooq/test/ASETest.java
View File

@ -70,7 +70,6 @@ import org.jooq.test.ase.generatedclasses.tables.TIdentity;
import org.jooq.test.ase.generatedclasses.tables.TIdentityPk;
import org.jooq.test.ase.generatedclasses.tables.TTriggers;
import org.jooq.test.ase.generatedclasses.tables.T_639NumbersTable;
import org.jooq.test.ase.generatedclasses.tables.T_658Ref;
import org.jooq.test.ase.generatedclasses.tables.T_725LobTest;
import org.jooq.test.ase.generatedclasses.tables.T_785;
import org.jooq.test.ase.generatedclasses.tables.VLibrary;
@ -84,7 +83,6 @@ import org.jooq.test.ase.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.ase.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.ase.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.ase.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.ase.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.ase.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.ase.generatedclasses.tables.records.T_785Record;
import org.jooq.test.ase.generatedclasses.tables.records.VLibraryRecord;
@ -118,7 +116,6 @@ public class ASETest extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -233,11 +230,6 @@ public class ASETest extends jOOQAbstractTest<
return T_725LobTest.LOB;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658Ref.T_658_REF;
}
@Override
protected Table<T_785Record> T785() {
return T_785.T_785;
@ -464,7 +456,7 @@ public class ASETest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return TBook.LANGUAGE_ID;
}

16
jOOQ-test/src/org/jooq/test/BaseTest.java
View File

@ -35,8 +35,6 @@
*/
package org.jooq.test;
import static org.jooq.tools.reflect.Reflect.on;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.math.BigInteger;
@ -128,7 +126,6 @@ public abstract class BaseTest<
IPK extends UpdatableRecord<IPK>,
// Various tables related to trac ticket numbers
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>> {
@ -147,16 +144,12 @@ public abstract class BaseTest<
protected static final JooqLogger log = JooqLogger.getLogger(jOOQAbstractTest.class);
protected final jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate;
protected final jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate;
protected BaseTest(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
protected BaseTest(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
this.delegate = delegate;
}
protected Table<T658> T658() {
return delegate.T658();
}
protected Table<T725> T725() {
return delegate.T725();
}
@ -441,7 +434,7 @@ public abstract class BaseTest<
return delegate.TBook_TITLE();
}
protected TableField<B, ?> TBook_LANGUAGE_ID() {
protected TableField<B, Integer> TBook_LANGUAGE_ID() {
return delegate.TBook_LANGUAGE_ID();
}
@ -725,7 +718,6 @@ public abstract class BaseTest<
/**
* Convenience method to create a new dummy book
*/
@SuppressWarnings("unchecked")
protected final B newBook(int id) {
B record = create().newRecord(TBook());
@ -733,7 +725,7 @@ public abstract class BaseTest<
record.setValue(TBook_AUTHOR_ID(), 1);
record.setValue(TBook_TITLE(), "XX");
record.setValue(TBook_PUBLISHED_IN(), 2000);
record.setValue((Field<Object>)TBook_LANGUAGE_ID(), on(TBook_LANGUAGE_ID().getDataType().getType()).get("en"));
record.setValue(TBook_LANGUAGE_ID(), 1);
return record;
}

10
jOOQ-test/src/org/jooq/test/CUBRIDTest.java
View File

@ -73,7 +73,6 @@ import org.jooq.test.cubrid.generatedclasses.tables.TIdentity;
import org.jooq.test.cubrid.generatedclasses.tables.TIdentityPk;
import org.jooq.test.cubrid.generatedclasses.tables.TTriggers;
import org.jooq.test.cubrid.generatedclasses.tables.T_639NumbersTable;
import org.jooq.test.cubrid.generatedclasses.tables.T_658Ref;
import org.jooq.test.cubrid.generatedclasses.tables.T_725LobTest;
import org.jooq.test.cubrid.generatedclasses.tables.T_785;
import org.jooq.test.cubrid.generatedclasses.tables.VLibrary;
@ -88,7 +87,6 @@ import org.jooq.test.cubrid.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.cubrid.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.cubrid.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.cubrid.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.cubrid.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.cubrid.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.cubrid.generatedclasses.tables.records.T_785Record;
import org.jooq.test.cubrid.generatedclasses.tables.records.VLibraryRecord;
@ -122,7 +120,6 @@ public class CUBRIDTest extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -237,11 +234,6 @@ public class CUBRIDTest extends jOOQAbstractTest<
return T_725LobTest.LOB;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658Ref.T_658_REF;
}
@Override
protected Table<T_785Record> T785() {
return T_785.T_785;
@ -471,7 +463,7 @@ public class CUBRIDTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return TBook.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/DB2Test.java
View File

@ -77,7 +77,6 @@ import org.jooq.test.db2.generatedclasses.tables.TIdentity;
import org.jooq.test.db2.generatedclasses.tables.TIdentityPk;
import org.jooq.test.db2.generatedclasses.tables.TTriggers;
import org.jooq.test.db2.generatedclasses.tables.T_639NumbersTable;
import org.jooq.test.db2.generatedclasses.tables.T_658Ref;
import org.jooq.test.db2.generatedclasses.tables.T_725LobTest;
import org.jooq.test.db2.generatedclasses.tables.T_785;
import org.jooq.test.db2.generatedclasses.tables.VLibrary;
@ -91,7 +90,6 @@ import org.jooq.test.db2.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.db2.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.db2.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.db2.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.db2.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.db2.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.db2.generatedclasses.tables.records.T_785Record;
import org.jooq.test.db2.generatedclasses.tables.records.VLibraryRecord;
@ -125,7 +123,6 @@ public class DB2Test extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -230,11 +227,6 @@ public class DB2Test extends jOOQAbstractTest<
return TBookToBookStore.STOCK;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658Ref.T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639NumbersTable.T_639_NUMBERS_TABLE;
@ -484,7 +476,7 @@ public class DB2Test extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return TBook.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/DerbyTest.java
View File

@ -77,7 +77,6 @@ import org.jooq.test.derby.generatedclasses.tables.TIdentity;
import org.jooq.test.derby.generatedclasses.tables.TIdentityPk;
import org.jooq.test.derby.generatedclasses.tables.TTriggers;
import org.jooq.test.derby.generatedclasses.tables.T_639NumbersTable;
import org.jooq.test.derby.generatedclasses.tables.T_658Ref;
import org.jooq.test.derby.generatedclasses.tables.T_725LobTest;
import org.jooq.test.derby.generatedclasses.tables.T_785;
import org.jooq.test.derby.generatedclasses.tables.VLibrary;
@ -91,7 +90,6 @@ import org.jooq.test.derby.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.derby.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.derby.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.derby.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.derby.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.derby.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.derby.generatedclasses.tables.records.T_785Record;
import org.jooq.test.derby.generatedclasses.tables.records.VLibraryRecord;
@ -122,7 +120,6 @@ public class DerbyTest extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -232,11 +229,6 @@ public class DerbyTest extends jOOQAbstractTest<
return TBookToBookStore.STOCK;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658Ref.T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639NumbersTable.T_639_NUMBERS_TABLE;
@ -483,7 +475,7 @@ public class DerbyTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return TBook.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/FirebirdTest.java
View File

@ -37,7 +37,6 @@
package org.jooq.test;
import static org.jooq.test.firebird.generatedclasses.Tables.T_639_NUMBERS_TABLE;
import static org.jooq.test.firebird.generatedclasses.Tables.T_658_REF;
import static org.jooq.test.firebird.generatedclasses.Tables.T_725_LOB_TEST;
import static org.jooq.test.firebird.generatedclasses.Tables.T_785;
import static org.jooq.test.firebird.generatedclasses.Tables.T_AUTHOR;
@ -82,7 +81,6 @@ import org.jooq.test.firebird.generatedclasses.tables.records.TBooleansRecord;
import org.jooq.test.firebird.generatedclasses.tables.records.TDatesRecord;
import org.jooq.test.firebird.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.firebird.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.firebird.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.firebird.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.firebird.generatedclasses.tables.records.T_785Record;
import org.jooq.test.firebird.generatedclasses.tables.records.VLibraryRecord;
@ -115,7 +113,6 @@ public class FirebirdTest extends jOOQAbstractTest<
XUnusedRecord,
XUnusedRecord,
XUnusedRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -230,11 +227,6 @@ public class FirebirdTest extends jOOQAbstractTest<
return T_725_LOB_TEST.LOB;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639_NUMBERS_TABLE;
@ -466,7 +458,7 @@ public class FirebirdTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ?> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return T_BOOK.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/H2Test.java
View File

@ -80,7 +80,6 @@ import org.jooq.test.h2.generatedclasses.tables.TIdentity;
import org.jooq.test.h2.generatedclasses.tables.TIdentityPk;
import org.jooq.test.h2.generatedclasses.tables.TTriggers;
import org.jooq.test.h2.generatedclasses.tables.T_639NumbersTable;
import org.jooq.test.h2.generatedclasses.tables.T_658Ref;
import org.jooq.test.h2.generatedclasses.tables.T_725LobTest;
import org.jooq.test.h2.generatedclasses.tables.T_785;
import org.jooq.test.h2.generatedclasses.tables.VLibrary;
@ -96,7 +95,6 @@ import org.jooq.test.h2.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.h2.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.h2.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.h2.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.h2.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.h2.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.h2.generatedclasses.tables.records.T_785Record;
import org.jooq.test.h2.generatedclasses.tables.records.VLibraryRecord;
@ -129,7 +127,6 @@ public class H2Test extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -244,11 +241,6 @@ public class H2Test extends jOOQAbstractTest<
return TBookToBookStore.STOCK;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658Ref.T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639NumbersTable.T_639_NUMBERS_TABLE;
@ -498,7 +490,7 @@ public class H2Test extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return TBook.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/HSQLDBTest.java
View File

@ -37,7 +37,6 @@
package org.jooq.test;
import static org.jooq.test.hsqldb.generatedclasses.Tables.T_639_NUMBERS_TABLE;
import static org.jooq.test.hsqldb.generatedclasses.Tables.T_658_REF;
import static org.jooq.test.hsqldb.generatedclasses.Tables.T_725_LOB_TEST;
import static org.jooq.test.hsqldb.generatedclasses.Tables.T_785;
import static org.jooq.test.hsqldb.generatedclasses.Tables.T_ARRAYS;
@ -90,7 +89,6 @@ import org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.hsqldb.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.hsqldb.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.hsqldb.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.hsqldb.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.hsqldb.generatedclasses.tables.records.T_785Record;
import org.jooq.test.hsqldb.generatedclasses.tables.records.VLibraryRecord;
@ -121,7 +119,6 @@ public class HSQLDBTest extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -231,11 +228,6 @@ public class HSQLDBTest extends jOOQAbstractTest<
return T_BOOK_TO_BOOK_STORE.STOCK;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639_NUMBERS_TABLE;
@ -482,7 +474,7 @@ public class HSQLDBTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return T_BOOK.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
View File

@ -37,7 +37,6 @@
package org.jooq.test;
import static org.jooq.test.h2.generatedclasses.Tables.T_639_NUMBERS_TABLE;
import static org.jooq.test.h2.generatedclasses.Tables.T_658_REF;
import static org.jooq.test.h2.generatedclasses.Tables.T_725_LOB_TEST;
import static org.jooq.test.h2.generatedclasses.Tables.T_785;
import static org.jooq.test.h2.generatedclasses.Tables.T_AUTHOR;
@ -88,7 +87,6 @@ import org.jooq.test.h2.generatedclasses.tables.records.TBooleansRecord;
import org.jooq.test.h2.generatedclasses.tables.records.TDatesRecord;
import org.jooq.test.h2.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.h2.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.h2.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.h2.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.h2.generatedclasses.tables.records.T_785Record;
import org.jooq.test.h2.generatedclasses.tables.records.VLibraryRecord;
@ -120,7 +118,6 @@ public class HSQLDBTest2 extends jOOQAbstractTest<
XUnusedRecord,
XUnusedRecord,
XUnusedRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -235,11 +232,6 @@ public class HSQLDBTest2 extends jOOQAbstractTest<
return T_BOOK_TO_BOOK_STORE.STOCK;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639_NUMBERS_TABLE;
@ -486,7 +478,7 @@ public class HSQLDBTest2 extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return T_BOOK.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/IngresTest.java
View File

@ -76,7 +76,6 @@ import org.jooq.test.ingres.generatedclasses.tables.TIdentity;
import org.jooq.test.ingres.generatedclasses.tables.TIdentityPk;
import org.jooq.test.ingres.generatedclasses.tables.TTriggers;
import org.jooq.test.ingres.generatedclasses.tables.T_639NumbersTable;
import org.jooq.test.ingres.generatedclasses.tables.T_658Ref;
import org.jooq.test.ingres.generatedclasses.tables.T_725LobTest;
import org.jooq.test.ingres.generatedclasses.tables.T_785;
import org.jooq.test.ingres.generatedclasses.tables.VLibrary;
@ -90,7 +89,6 @@ import org.jooq.test.ingres.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.ingres.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.ingres.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.ingres.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.ingres.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.ingres.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.ingres.generatedclasses.tables.records.T_785Record;
import org.jooq.test.ingres.generatedclasses.tables.records.VLibraryRecord;
@ -122,7 +120,6 @@ public class IngresTest extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -222,11 +219,6 @@ public class IngresTest extends jOOQAbstractTest<
return TBookToBookStore.STOCK;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658Ref.T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639NumbersTable.T_639_NUMBERS_TABLE;
@ -473,7 +465,7 @@ public class IngresTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return TBook.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/MySQLTest.java
View File

@ -96,7 +96,6 @@ import org.jooq.test.mysql.generatedclasses.tables.TIdentityPk;
import org.jooq.test.mysql.generatedclasses.tables.TTriggers;
import org.jooq.test.mysql.generatedclasses.tables.TUnsigned;
import org.jooq.test.mysql.generatedclasses.tables.T_639NumbersTable;
import org.jooq.test.mysql.generatedclasses.tables.T_658Ref;
import org.jooq.test.mysql.generatedclasses.tables.T_725LobTest;
import org.jooq.test.mysql.generatedclasses.tables.T_785;
import org.jooq.test.mysql.generatedclasses.tables.T_959;
@ -112,7 +111,6 @@ import org.jooq.test.mysql.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.mysql.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.mysql.generatedclasses.tables.records.TUnsignedRecord;
import org.jooq.test.mysql.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.mysql.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.mysql.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.mysql.generatedclasses.tables.records.T_785Record;
import org.jooq.test.mysql.generatedclasses.tables.records.VLibraryRecord;
@ -146,7 +144,6 @@ public class MySQLTest extends jOOQAbstractTest<
TUnsignedRecord,
XUnusedRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -251,11 +248,6 @@ public class MySQLTest extends jOOQAbstractTest<
return TBookToBookStore.STOCK;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658Ref.T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639NumbersTable.T_639_NUMBERS_TABLE;
@ -502,7 +494,7 @@ public class MySQLTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return TBook.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
View File

@ -37,7 +37,6 @@
package org.jooq.test;
import static org.jooq.test.mysql2.generatedclasses.Tables.T_639_NUMBERS_TABLE;
import static org.jooq.test.mysql2.generatedclasses.Tables.T_658_REF;
import static org.jooq.test.mysql2.generatedclasses.Tables.T_725_LOB_TEST;
import static org.jooq.test.mysql2.generatedclasses.Tables.T_785;
import static org.jooq.test.mysql2.generatedclasses.Tables.T_AUTHOR;
@ -85,7 +84,6 @@ import org.jooq.test.mysql2.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.mysql2.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.mysql2.generatedclasses.tables.records.TUnsignedRecord;
import org.jooq.test.mysql2.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.mysql2.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.mysql2.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.mysql2.generatedclasses.tables.records.T_785Record;
import org.jooq.test.mysql2.generatedclasses.tables.records.VLibraryRecord;
@ -117,7 +115,6 @@ public class MySQLTestSchemaRewrite extends jOOQAbstractTest<
TUnsignedRecord,
XUnusedRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -222,11 +219,6 @@ public class MySQLTestSchemaRewrite extends jOOQAbstractTest<
return T_BOOK_TO_BOOK_STORE.STOCK;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639_NUMBERS_TABLE;
@ -473,7 +465,7 @@ public class MySQLTestSchemaRewrite extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return T_BOOK.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/OracleTest.java
View File

@ -57,7 +57,6 @@ import static org.jooq.test.oracle.generatedclasses.test.Routines.pArrays1;
import static org.jooq.test.oracle.generatedclasses.test.Routines.pTables1;
import static org.jooq.test.oracle.generatedclasses.test.Routines.secondMax;
import static org.jooq.test.oracle.generatedclasses.test.Tables.T_639_NUMBERS_TABLE;
import static org.jooq.test.oracle.generatedclasses.test.Tables.T_658_REF;
import static org.jooq.test.oracle.generatedclasses.test.Tables.T_725_LOB_TEST;
import static org.jooq.test.oracle.generatedclasses.test.Tables.T_785;
import static org.jooq.test.oracle.generatedclasses.test.Tables.T_ARRAYS;
@ -123,7 +122,6 @@ import org.jooq.test.oracle.generatedclasses.test.tables.records.TDatesRecord;
import org.jooq.test.oracle.generatedclasses.test.tables.records.TDirectoryRecord;
import org.jooq.test.oracle.generatedclasses.test.tables.records.TTriggersRecord;
import org.jooq.test.oracle.generatedclasses.test.tables.records.T_639NumbersTableRecord;
import org.jooq.test.oracle.generatedclasses.test.tables.records.T_658RefRecord;
import org.jooq.test.oracle.generatedclasses.test.tables.records.T_725LobTestRecord;
import org.jooq.test.oracle.generatedclasses.test.tables.records.T_785Record;
import org.jooq.test.oracle.generatedclasses.test.tables.records.VIncompleteRecord;
@ -181,7 +179,6 @@ public class OracleTest extends jOOQAbstractTest<
XUnusedRecord,
XUnusedRecord,
XUnusedRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -431,11 +428,6 @@ public class OracleTest extends jOOQAbstractTest<
return T_BOOLEANS.N_BOOLEAN;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639_NUMBERS_TABLE;
@ -557,7 +549,7 @@ public class OracleTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return T_BOOK.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/PostgresTest.java
View File

@ -37,7 +37,6 @@
package org.jooq.test;
import static org.jooq.test.postgres.generatedclasses.Tables.T_639_NUMBERS_TABLE;
import static org.jooq.test.postgres.generatedclasses.Tables.T_658_REF;
import static org.jooq.test.postgres.generatedclasses.Tables.T_725_LOB_TEST;
import static org.jooq.test.postgres.generatedclasses.Tables.T_785;
import static org.jooq.test.postgres.generatedclasses.Tables.T_959;
@ -93,7 +92,6 @@ import org.jooq.test.postgres.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.postgres.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.postgres.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.postgres.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.postgres.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.postgres.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.postgres.generatedclasses.tables.records.T_785Record;
import org.jooq.test.postgres.generatedclasses.tables.records.VLibraryRecord;
@ -129,7 +127,6 @@ public class PostgresTest extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -354,11 +351,6 @@ public class PostgresTest extends jOOQAbstractTest<
return T_BOOLEANS.N_BOOLEAN;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639_NUMBERS_TABLE;
@ -480,7 +472,7 @@ public class PostgresTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return T_BOOK.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/SQLServerTest.java
View File

@ -75,7 +75,6 @@ import org.jooq.test._.converters.Boolean_YES_NO_UC;
import org.jooq.test._.converters.Boolean_YN_LC;
import org.jooq.test._.converters.Boolean_YN_UC;
import org.jooq.test.sqlserver.generatedclasses.Routines;
import org.jooq.test.sqlserver.generatedclasses.tables.T_658Ref;
import org.jooq.test.sqlserver.generatedclasses.tables.records.TAuthorRecord;
import org.jooq.test.sqlserver.generatedclasses.tables.records.TBookRecord;
import org.jooq.test.sqlserver.generatedclasses.tables.records.TBookStoreRecord;
@ -86,7 +85,6 @@ import org.jooq.test.sqlserver.generatedclasses.tables.records.TIdentityPkRecord
import org.jooq.test.sqlserver.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.sqlserver.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.sqlserver.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.sqlserver.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.sqlserver.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.sqlserver.generatedclasses.tables.records.T_785Record;
import org.jooq.test.sqlserver.generatedclasses.tables.records.VLibraryRecord;
@ -117,7 +115,6 @@ public class SQLServerTest extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -232,11 +229,6 @@ public class SQLServerTest extends jOOQAbstractTest<
return T_725_LOB_TEST.LOB;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658Ref.T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639_NUMBERS_TABLE;
@ -468,7 +460,7 @@ public class SQLServerTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return T_BOOK.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/SQLiteTest.java
View File

@ -71,7 +71,6 @@ import org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore;
import org.jooq.test.sqlite.generatedclasses.tables.TBooleans;
import org.jooq.test.sqlite.generatedclasses.tables.TTriggers;
import org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable;
import org.jooq.test.sqlite.generatedclasses.tables.T_658Ref;
import org.jooq.test.sqlite.generatedclasses.tables.T_725LobTest;
import org.jooq.test.sqlite.generatedclasses.tables.T_785;
import org.jooq.test.sqlite.generatedclasses.tables.VLibrary;
@ -83,7 +82,6 @@ import org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord;
import org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord;
import org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.sqlite.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.sqlite.generatedclasses.tables.records.T_785Record;
import org.jooq.test.sqlite.generatedclasses.tables.records.VLibraryRecord;
@ -116,7 +114,6 @@ public class SQLiteTest extends jOOQAbstractTest<
XUnusedRecord,
XUnusedRecord,
XUnusedRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -231,11 +228,6 @@ public class SQLiteTest extends jOOQAbstractTest<
return T_725LobTest.LOB;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658Ref.T_658_REF;
}
@Override
protected Table<T_639NumbersTableRecord> T639() {
return T_639NumbersTable.T_639_NUMBERS_TABLE;
@ -467,7 +459,7 @@ public class SQLiteTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ?> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return TBook.LANGUAGE_ID;
}

10
jOOQ-test/src/org/jooq/test/SybaseTest.java
View File

@ -32,7 +32,6 @@
package org.jooq.test;
import static org.jooq.test.sybase.generatedclasses.Tables.T_639_NUMBERS_TABLE;
import static org.jooq.test.sybase.generatedclasses.Tables.T_658_REF;
import static org.jooq.test.sybase.generatedclasses.Tables.T_725_LOB_TEST;
import static org.jooq.test.sybase.generatedclasses.Tables.T_785;
import static org.jooq.test.sybase.generatedclasses.Tables.T_AUTHOR;
@ -82,7 +81,6 @@ import org.jooq.test.sybase.generatedclasses.tables.records.TIdentityPkRecord;
import org.jooq.test.sybase.generatedclasses.tables.records.TIdentityRecord;
import org.jooq.test.sybase.generatedclasses.tables.records.TTriggersRecord;
import org.jooq.test.sybase.generatedclasses.tables.records.T_639NumbersTableRecord;
import org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord;
import org.jooq.test.sybase.generatedclasses.tables.records.T_725LobTestRecord;
import org.jooq.test.sybase.generatedclasses.tables.records.T_785Record;
import org.jooq.test.sybase.generatedclasses.tables.records.VLibraryRecord;
@ -116,7 +114,6 @@ public class SybaseTest extends jOOQAbstractTest<
XUnusedRecord,
TIdentityRecord,
TIdentityPkRecord,
T_658RefRecord,
T_725LobTestRecord,
T_639NumbersTableRecord,
T_785Record> {
@ -232,11 +229,6 @@ public class SybaseTest extends jOOQAbstractTest<
return T_725_LOB_TEST.LOB;
}
@Override
protected Table<T_658RefRecord> T658() {
return T_658_REF;
}
@Override
protected Table<T_785Record> T785() {
return T_785;
@ -463,7 +455,7 @@ public class SybaseTest extends jOOQAbstractTest<
}
@Override
protected TableField<TBookRecord, ? extends Enum<?>> TBook_LANGUAGE_ID() {
protected TableField<TBookRecord, Integer> TBook_LANGUAGE_ID() {
return T_BOOK.LANGUAGE_ID;
}

5
jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
View File

@ -119,13 +119,12 @@ public class AggregateWindowFunctionTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public AggregateWindowFunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public AggregateWindowFunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java
View File

@ -66,16 +66,15 @@ public class BenchmarkTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
private static final int REPETITIONS = 100;
private static final String RANDOM = "" + new Random().nextLong();
public BenchmarkTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public BenchmarkTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
View File

@ -90,13 +90,12 @@ public class CRUDTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public CRUDTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public CRUDTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
View File

@ -67,13 +67,12 @@ public class DaoTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public DaoTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public DaoTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
View File

@ -115,13 +115,12 @@ public class DataTypeTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public DataTypeTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public DataTypeTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

51
jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java
View File

@ -36,7 +36,6 @@
package org.jooq.test._.testcases;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
import static org.jooq.tools.reflect.Reflect.on;
import java.util.List;
@ -74,13 +73,12 @@ public class EnumTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public EnumTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public EnumTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}
@ -242,49 +240,4 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
assertEquals(Boolean_YN_UC.Y, on(b.get(1)).call("getYNUc").get());
}
}
@SuppressWarnings({ "unchecked", "rawtypes", "deprecation" })
@Test
public void testMasterData() throws Exception {
if (!supportsReferences()) {
log.info("SKIPPING", "master data test");
return;
}
jOOQAbstractTest.reset = false;
B book = create().fetchOne(TBook(), TBook_TITLE().equal("1984"));
Enum<?> value = (Enum<?>) book.getValue(TBook_LANGUAGE_ID());
assertEquals(Integer.valueOf(1), ((org.jooq.MasterDataType<?>) value).getPrimaryKey());
assertEquals("en", value.name());
book.setValue((Field) TBook_LANGUAGE_ID(), Enum.valueOf(value.getClass(), "de"));
book.store();
book = create().fetchOne(TBook(), TBook_TITLE().equal("1984"));
value = (Enum<?>) book.getValue(TBook_LANGUAGE_ID());
assertEquals(Integer.valueOf(2), ((org.jooq.MasterDataType<?>) value).getPrimaryKey());
assertEquals("de", value.name());
// [#658] - General master data test
T658 master = create().fetchOne(T658());
assertNotNull(master);
assertEquals("A", invoke(master.getValue(0), "getPrimaryKey").toString().trim());
assertEquals("A", invoke(master.getValue(0), "getId").toString().trim());
assertEquals(1, invoke(master.getValue(1), "getPrimaryKey"));
assertEquals(1, invoke(master.getValue(1), "getId"));
assertEquals(1L, invoke(master.getValue(2), "getPrimaryKey"));
assertEquals(1L, invoke(master.getValue(2), "getId"));
assertEquals("B", invoke(master.getValue(3), "getPrimaryKey").toString().trim());
assertEquals("B", invoke(master.getValue(3), "getId").toString().trim());
assertEquals("B", invoke(master.getValue(3), "getCd").toString().trim());
assertEquals(2, invoke(master.getValue(4), "getPrimaryKey"));
assertEquals(2, invoke(master.getValue(4), "getId"));
assertEquals(2, invoke(master.getValue(4), "getCd"));
assertEquals(2L, invoke(master.getValue(5), "getPrimaryKey"));
assertEquals(2L, invoke(master.getValue(5), "getId"));
assertEquals(2L, invoke(master.getValue(5), "getCd"));
}
}

9
jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
View File

@ -44,7 +44,6 @@ import static junit.framework.Assert.fail;
import static org.jooq.conf.SettingsTools.executePreparedStatements;
import static org.jooq.impl.Factory.param;
import static org.jooq.impl.Factory.val;
import static org.jooq.tools.reflect.Reflect.on;
import java.util.ArrayList;
import java.util.HashMap;
@ -56,7 +55,6 @@ import org.jooq.Cursor;
import org.jooq.ExecuteContext;
import org.jooq.ExecuteListener;
import org.jooq.ExecuteType;
import org.jooq.Field;
import org.jooq.Result;
import org.jooq.TableRecord;
import org.jooq.UpdatableRecord;
@ -85,13 +83,12 @@ public class ExecuteListenerTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public ExecuteListenerTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public ExecuteListenerTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}
@ -684,7 +681,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
.set(TBook_ID(), 6)
.set(TBook_AUTHOR_ID(), 8)
.set(TBook_PUBLISHED_IN(), 1994)
.set((Field<Object>)TBook_LANGUAGE_ID(), on(TBook_LANGUAGE_ID().getDataType().getType()).get("en"))
.set(TBook_LANGUAGE_ID(), 1)
.set(TBook_CONTENT_TEXT(), "Design Patterns are awesome")
.set(TBook_TITLE(), "Design Patterns"),

5
jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
View File

@ -88,13 +88,12 @@ public class ExoticTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public ExoticTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public ExoticTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
View File

@ -119,13 +119,12 @@ public class FetchTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public FetchTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public FetchTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
View File

@ -85,13 +85,12 @@ public class FormatTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public FormatTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public FormatTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
View File

@ -158,13 +158,12 @@ public class FunctionTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public FunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public FunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

12
jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
View File

@ -63,7 +63,6 @@ import static org.jooq.impl.Factory.trim;
import static org.jooq.impl.Factory.two;
import static org.jooq.impl.Factory.val;
import static org.jooq.impl.Factory.zero;
import static org.jooq.tools.reflect.Reflect.on;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@ -115,13 +114,12 @@ public class GeneralTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public GeneralTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public GeneralTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}
@ -734,7 +732,6 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
testBatchAuthors("Gamma", "Helm", "Johnson");
}
@SuppressWarnings("unchecked")
@Test
public void testBatchMultiple() throws Exception {
jOOQAbstractTest.reset = false;
@ -752,7 +749,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
.set(TBook_ID(), 6)
.set(TBook_AUTHOR_ID(), 8)
.set(TBook_PUBLISHED_IN(), 1994)
.set((Field<Object>)TBook_LANGUAGE_ID(), on(TBook_LANGUAGE_ID().getDataType().getType()).get("en"))
.set(TBook_LANGUAGE_ID(), 1)
.set(TBook_CONTENT_TEXT(), "Design Patterns are awesome")
.set(TBook_TITLE(), "Design Patterns"),
@ -766,7 +763,6 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
testBatchAuthors("Gamma", "Helm", "Johnson");
}
@SuppressWarnings("unchecked")
@Test
public void testBatchStore() throws Exception {
jOOQAbstractTest.reset = false;
@ -786,7 +782,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
b1.setValue(TBook_AUTHOR_ID(), 8);
b1.setValue(TBook_TITLE(), "XX 1");
b1.setValue(TBook_PUBLISHED_IN(), 2000);
b1.setValue((Field<Object>)TBook_LANGUAGE_ID(), on(TBook_LANGUAGE_ID().getDataType().getType()).get("en"));
b1.setValue(TBook_LANGUAGE_ID(), 1);
int[] result1 = create().batchStore(a1, b1, a2).execute();
assertEquals(3, result1.length);

5
jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
View File

@ -77,13 +77,12 @@ public class GroupByTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public GroupByTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public GroupByTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
View File

@ -94,13 +94,12 @@ public class InsertUpdateTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public InsertUpdateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public InsertUpdateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
View File

@ -87,13 +87,12 @@ public class JoinTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public JoinTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public JoinTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java
View File

@ -70,13 +70,12 @@ public class LoaderTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public LoaderTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public LoaderTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
View File

@ -82,13 +82,12 @@ public class OrderByTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public OrderByTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public OrderByTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
View File

@ -97,13 +97,12 @@ public class PlainSQLTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public PlainSQLTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public PlainSQLTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

8
jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java
View File

@ -50,7 +50,6 @@ import static org.jooq.impl.Factory.lower;
import static org.jooq.impl.Factory.trueCondition;
import static org.jooq.impl.Factory.upper;
import static org.jooq.impl.Factory.val;
import static org.jooq.tools.reflect.Reflect.on;
import java.util.ArrayList;
import java.util.Arrays;
@ -85,13 +84,12 @@ public class PredicateTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public PredicateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public PredicateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}
@ -183,7 +181,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
.set(TBook_ID(), 5)
.set(TBook_AUTHOR_ID(), 2)
.set(TBook_PUBLISHED_IN(), 2012)
.set((Field<Object>) TBook_LANGUAGE_ID(), on(TBook_LANGUAGE_ID().getDataType().getType()).get("en"))
.set(TBook_LANGUAGE_ID(), 1)
.set(TBook_TITLE(), "About percentages (%) and underscores (_), a critical review! Check exclamation marks, too!")
.execute());

5
jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
View File

@ -62,13 +62,12 @@ public class RecordTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public RecordTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public RecordTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
View File

@ -91,13 +91,12 @@ public class RenderAndBindTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public RenderAndBindTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public RenderAndBindTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java
View File

@ -65,13 +65,12 @@ public class ResultTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public ResultTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public ResultTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
View File

@ -84,13 +84,12 @@ public class RoutineAndUDTTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public RoutineAndUDTTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public RoutineAndUDTTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}
@Test

5
jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java
View File

@ -78,13 +78,12 @@ public class RowValueExpressionTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public RowValueExpressionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public RowValueExpressionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

7
jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
View File

@ -59,8 +59,8 @@ import org.jooq.conf.RenderMapping;
import org.jooq.conf.Settings;
import org.jooq.impl.Factory;
import org.jooq.test.BaseTest;
import org.jooq.test.jOOQAbstractTest;
import org.jooq.test.MySQLTestSchemaRewrite;
import org.jooq.test.jOOQAbstractTest;
import org.junit.Test;
@ -80,13 +80,12 @@ public class SchemaAndMappingTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public SchemaAndMappingTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public SchemaAndMappingTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
View File

@ -76,13 +76,12 @@ public class SelectTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public SelectTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public SelectTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
View File

@ -81,13 +81,12 @@ public class StatementTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public StatementTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public StatementTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

5
jOOQ-test/src/org/jooq/test/_/testcases/Template.java
View File

@ -56,13 +56,12 @@ public class Template<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public Template(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public Template(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}
}

5
jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
View File

@ -61,13 +61,12 @@ public class ThreadSafetyTests<
U extends TableRecord<U>,
I extends TableRecord<I>,
IPK extends UpdatableRecord<IPK>,
T658 extends TableRecord<T658>,
T725 extends UpdatableRecord<T725>,
T639 extends UpdatableRecord<T639>,
T785 extends TableRecord<T785>>
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> {
extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> {
public ThreadSafetyTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
public ThreadSafetyTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725, T639, T785> delegate) {
super(delegate);
}

69
jOOQ-test/src/org/jooq/test/ase/create.sql
View File

@ -29,13 +29,6 @@ DROP TABLE t_986_1/
DROP TABLE t_986_2/
DROP TABLE x_unused/
DROP TABLE t_639_numbers_table/
DROP TABLE t_658_ref/
DROP TABLE t_658_11/
DROP TABLE t_658_21/
DROP TABLE t_658_31/
DROP TABLE t_658_12/
DROP TABLE t_658_22/
DROP TABLE t_658_32/
DROP TABLE t_725_lob_test/
DROP TABLE t_785/
DROP TABLE t_booleans/
@ -110,68 +103,6 @@ CREATE TABLE t_language (
)
/
CREATE TABLE t_658_11 (
id CHAR(3) NOT NULL,
CONSTRAINT pk_t_658_11 PRIMARY KEY (id)
)
/
CREATE TABLE t_658_21 (
id INT NOT NULL,
CONSTRAINT pk_t_658_21 PRIMARY KEY (id)
)
/
CREATE TABLE t_658_31 (
id BIGINT NOT NULL,
CONSTRAINT pk_t_658_31 PRIMARY KEY (id)
)
/
CREATE TABLE t_658_12 (
id CHAR(3) NOT NULL,
cd CHAR(3) NOT NULL,
CONSTRAINT pk_t_658_12 PRIMARY KEY (id)
)
/
CREATE TABLE t_658_22 (
id INT NOT NULL,
cd INT NOT NULL,
CONSTRAINT pk_t_658_22 PRIMARY KEY (id)
)
/
CREATE TABLE t_658_32 (
id BIGINT NOT NULL,
cd BIGINT NOT NULL,
CONSTRAINT pk_t_658_32 PRIMARY KEY (id)
)
/
CREATE TABLE t_658_ref (
ref_11 char(3),
ref_21 int,
ref_31 bigint,
ref_12 char(3),
ref_22 int,
ref_32 bigint,
CONSTRAINT fk_t_658_11 FOREIGN KEY (ref_11) REFERENCES t_658_11(id),
CONSTRAINT fk_t_658_21 FOREIGN KEY (ref_21) REFERENCES t_658_21(id),
CONSTRAINT fk_t_658_31 FOREIGN KEY (ref_31) REFERENCES t_658_31(id),
CONSTRAINT fk_t_658_12 FOREIGN KEY (ref_12) REFERENCES t_658_12(id),
CONSTRAINT fk_t_658_22 FOREIGN KEY (ref_22) REFERENCES t_658_22(id),
CONSTRAINT fk_t_658_32 FOREIGN KEY (ref_32) REFERENCES t_658_32(id)
)
/
CREATE TABLE t_725_lob_test (
id int NOT NULL,
lob VARBINARY(500) NULL,

Some files were not shown because too many files have changed in this diff Show More