diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java index 56168684cf..451fd649e4 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java @@ -52,7 +52,6 @@ import java.io.OutputStream; import java.io.StringReader; import java.sql.Connection; import java.sql.Driver; -import java.sql.DriverManager; import java.util.List; import java.util.Properties; diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java index 8e868a8565..f302e6f312 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java @@ -317,6 +317,7 @@ public class JavaGenerator extends AbstractGenerator { printPackage(out, schema); printClassJavadoc(out, "A class modelling foreign key relationships between tables of the " + schema.getOutputName() + " schema"); + printClassAnnotations(out); out.println("public class Keys {"); out.tab(1).header("IDENTITY definitions"); @@ -540,7 +541,13 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(getStrategy().getFile(tableOrUdt, Mode.RECORD)); printPackage(out, tableOrUdt, Mode.RECORD); - printClassJavadoc(out, tableOrUdt); + + if (tableOrUdt instanceof TableDefinition) + generateRecordClassJavadoc((TableDefinition) tableOrUdt, out); + else + generateUDTRecordClassJavadoc((UDTDefinition) tableOrUdt, out); + + printClassAnnotations(out); if (tableOrUdt instanceof TableDefinition) printTableJPAAnnotation(out, (TableDefinition) tableOrUdt); @@ -776,12 +783,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide record class footer code. - * - * @param table The table - * @param out The writer */ + @SuppressWarnings("unused") protected void generateRecordClassFooter(TableDefinition table, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateRecordClassJavadoc(TableDefinition table, JavaWriter out) { + printClassJavadoc(out, table); + } + private final String getRowType(Collection> columns) { StringBuilder result = new StringBuilder(); String separator = ""; @@ -822,7 +834,12 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(getStrategy().getFile(tableOrUDT, Mode.INTERFACE)); printPackage(out, tableOrUDT, Mode.INTERFACE); - printClassJavadoc(out, tableOrUDT); + if (tableOrUDT instanceof TableDefinition) + generateInterfaceClassJavadoc((TableDefinition) tableOrUDT, out); + else + generateUDTInterfaceClassJavadoc((UDTDefinition) tableOrUDT, out); + + printClassAnnotations(out); if (tableOrUDT instanceof TableDefinition) printTableJPAAnnotation(out, (TableDefinition) tableOrUDT); @@ -865,12 +882,10 @@ public class JavaGenerator extends AbstractGenerator { } - if (tableOrUDT instanceof TableDefinition) { + if (tableOrUDT instanceof TableDefinition) generateInterfaceClassFooter((TableDefinition) tableOrUDT, out); - } - else { + else generateUDTInterfaceClassFooter((UDTDefinition) tableOrUDT, out); - } out.println("}"); out.close(); @@ -879,12 +894,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide interface class footer * code. - * - * @param table The table - * @param out The writer */ + @SuppressWarnings("unused") protected void generateInterfaceClassFooter(TableDefinition table, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateInterfaceClassJavadoc(TableDefinition table, JavaWriter out) { + printClassJavadoc(out, table); + } + protected void generateUDTs(SchemaDefinition schema) { log.info("Generating UDTs"); @@ -910,7 +930,8 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(getStrategy().getFile(udt)); printPackage(out, udt); - printClassJavadoc(out, udt); + generateUDTClassJavadoc(udt, out); + printClassAnnotations(out); // [#799] Oracle UDTs with member procedures have similarities with packages if (udt.getRoutines().size() > 0) { @@ -976,12 +997,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide udt class footer code. - * - * @param udt The udt - * @param out The writer */ + @SuppressWarnings("unused") protected void generateUDTClassFooter(UDTDefinition udt, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateUDTClassJavadoc(UDTDefinition udt, JavaWriter out) { + printClassJavadoc(out, udt); + } + protected void generateUDTPojos(SchemaDefinition schema) { log.info("Generating UDT POJOs"); @@ -999,12 +1025,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide UDT POJO class footer code. - * - * @param udt The UDT - * @param out The writer */ + @SuppressWarnings("unused") protected void generateUDTPojoClassFooter(UDTDefinition udt, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateUDTPojoClassJavadoc(UDTDefinition udt, JavaWriter out) { + printClassJavadoc(out, udt); + } + protected void generateUDTInterfaces(SchemaDefinition schema) { log.info("Generating UDT interfaces"); @@ -1021,12 +1052,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide UDT interface class footer code. - * - * @param udt The UDT - * @param out The writer */ + @SuppressWarnings("unused") protected void generateUDTInterfaceClassFooter(UDTDefinition udt, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateUDTInterfaceClassJavadoc(UDTDefinition udt, JavaWriter out) { + printClassJavadoc(out, udt); + } + /** * Generating UDT record classes */ @@ -1050,12 +1086,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide udt record class footer code. - * - * @param udt The udt - * @param out The writer */ + @SuppressWarnings("unused") protected void generateUDTRecordClassFooter(UDTDefinition udt, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateUDTRecordClassJavadoc(UDTDefinition udt, JavaWriter out) { + printClassJavadoc(out, udt); + } + protected void generateUDTRoutines(SchemaDefinition schema) { for (UDTDefinition udt : database.getUDTs(schema)) { if (udt.getRoutines().size() > 0) { @@ -1087,6 +1128,7 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "UDTs.java")); printPackage(out, schema); printClassJavadoc(out, "Convenience access to all UDTs in " + schema.getOutputName()); + printClassAnnotations(out); out.println("public class UDTs {"); for (UDTDefinition udt : database.getUDTs(schema)) { @@ -1131,7 +1173,8 @@ public class JavaGenerator extends AbstractGenerator { xxxxxxxxxx xxx x xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxxxx xxxxxxx + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxx + xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxx xxxxx xx xxxxxxx xxxxxxxxxxxxxxx xxxxxxxxxx xxxxxx xxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxx xxxxxxxxxxxx xxxxxxxxxxxxxxxxxx @@ -1183,12 +1226,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide array class footer code. - * - * @param array The array - * @param out The writer */ + @SuppressWarnings("unused") protected void generateArrayClassFooter(ArrayDefinition array, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateArrayClassJavadoc(ArrayDefinition array, JavaWriter out) { + printClassJavadoc(out, array); + } + protected void generateEnums(SchemaDefinition schema) { log.info("Generating ENUMs"); @@ -1211,7 +1259,8 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(getStrategy().getFile(e, Mode.ENUM)); printPackage(out, e); - printClassJavadoc(out, e); + generateEnumClassJavadoc(e, out); + printClassAnnotations(out); interfaces.add(EnumType.class.getName()); @@ -1266,22 +1315,28 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide enum class footer code. - * - * @param e The enum - * @param out The writer */ + @SuppressWarnings("unused") protected void generateEnumClassFooter(EnumDefinition e, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateEnumClassJavadoc(EnumDefinition e, JavaWriter out) { + printClassJavadoc(out, e); + } + protected void generateRoutines(SchemaDefinition schema) { log.info("Generating routines and table-valued functions"); - JavaWriter outR = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "Routines.java")); - printPackage(outR, schema); - printClassJavadoc(outR, "Convenience access to all stored procedures and functions in " + schema.getOutputName()); + JavaWriter out = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "Routines.java")); + printPackage(out, schema); + printClassJavadoc(out, "Convenience access to all stored procedures and functions in " + schema.getOutputName()); + printClassAnnotations(out); - outR.println("public class Routines {"); + out.println("public class Routines {"); for (RoutineDefinition routine : database.getRoutines(schema)) { - printRoutine(outR, routine); + printRoutine(out, routine); try { generateRoutine(schema, routine); @@ -1292,12 +1347,12 @@ public class JavaGenerator extends AbstractGenerator { for (TableDefinition table : database.getTables(schema)) { if (table.isTableValuedFunction()) { - printTableValuedFunction(outR, table); + printTableValuedFunction(out, table); } } - outR.println("}"); - outR.close(); + out.println("}"); + out.close(); watch.splitInfo("Routines generated"); } @@ -1351,7 +1406,8 @@ public class JavaGenerator extends AbstractGenerator { // Static convenience methods JavaWriter out = new JavaWriter(getStrategy().getFile(pkg)); printPackage(out, pkg); - printClassJavadoc(out, "Convenience access to all stored procedures and functions in " + pkg.getName()); + generatePackageClassJavadoc(pkg, out); + printClassAnnotations(out); out.println("public class %s extends %s[[before= implements ][%s]] {", className, PackageImpl.class, interfaces); out.printSerial(); @@ -1379,12 +1435,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide package class footer code. - * - * @param pkg The package - * @param out The writer */ + @SuppressWarnings("unused") protected void generatePackageClassFooter(PackageDefinition pkg, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generatePackageClassJavadoc(PackageDefinition pkg, JavaWriter out) { + printClassJavadoc(out, "Convenience access to all stored procedures and functions in " + pkg.getName()); + } + /** * Generating central static table access */ @@ -1394,6 +1455,7 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "Tables.java")); printPackage(out, schema); printClassJavadoc(out, "Convenience access to all tables in " + schema.getOutputName()); + printClassAnnotations(out); out.println("public class Tables {"); for (TableDefinition table : database.getTables(schema)) { @@ -1468,7 +1530,8 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(getStrategy().getFile(table, Mode.DAO)); printPackage(out, table, Mode.DAO); - printClassJavadoc(out, table); + generateDaoClassJavadoc(table, out); + printClassAnnotations(out); out.println("public class %s extends %s<%s, %s, %s> {", className, daoImpl, tableRecord, pType, tType); @@ -1547,12 +1610,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide dao class footer code. - * - * @param table The table - * @param out The writer */ + @SuppressWarnings("unused") protected void generateDaoClassFooter(TableDefinition table, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateDaoClassJavadoc(TableDefinition table, JavaWriter out) { + printClassJavadoc(out, table); + } + protected void generatePojos(SchemaDefinition schema) { log.info("Generating table POJOs"); @@ -1585,7 +1653,13 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(getStrategy().getFile(tableOrUDT, Mode.POJO)); printPackage(out, tableOrUDT, Mode.POJO); - printClassJavadoc(out, tableOrUDT); + + if (tableOrUDT instanceof TableDefinition) + generatePojoClassJavadoc((TableDefinition) tableOrUDT, out); + else + generateUDTPojoClassJavadoc((UDTDefinition) tableOrUDT, out); + + printClassAnnotations(out); if (tableOrUDT instanceof TableDefinition) printTableJPAAnnotation(out, (TableDefinition) tableOrUDT); @@ -1699,12 +1773,10 @@ public class JavaGenerator extends AbstractGenerator { printFromAndInto(out, tableOrUDT); } - if (tableOrUDT instanceof TableDefinition) { + if (tableOrUDT instanceof TableDefinition) generatePojoClassFooter((TableDefinition) tableOrUDT, out); - } - else { + else generateUDTPojoClassFooter((UDTDefinition) tableOrUDT, out); - } out.println("}"); out.close(); @@ -1727,12 +1799,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide POJO class footer code. - * - * @param table The table - * @param out The writer */ + @SuppressWarnings("unused") protected void generatePojoClassFooter(TableDefinition table, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generatePojoClassJavadoc(TableDefinition table, JavaWriter out) { + printClassJavadoc(out, table); + } + protected void generateTables(SchemaDefinition schema) { log.info("Generating tables"); @@ -1767,7 +1844,8 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(getStrategy().getFile(table)); printPackage(out, table); - printClassJavadoc(out, table); + generateTableClassJavadoc(table, out); + printClassAnnotations(out); out.println("public class %s extends %s<%s>[[before= implements ][%s]] {", className, TableImpl.class, recordType, interfaces); out.printSerial(); @@ -1999,18 +2077,24 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide table class footer code. - * - * @param table The table - * @param out The writer */ + @SuppressWarnings("unused") protected void generateTableClassFooter(TableDefinition table, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateTableClassJavadoc(TableDefinition table, JavaWriter out) { + printClassJavadoc(out, table); + } + protected void generateSequences(SchemaDefinition schema) { log.info("Generating sequences"); JavaWriter out = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "Sequences.java")); printPackage(out, schema); printClassJavadoc(out, "Convenience access to all sequences in " + schema.getOutputName()); + printClassAnnotations(out); out.println("public class Sequences {"); for (SequenceDefinition sequence : database.getSequences(schema)) { @@ -2041,7 +2125,8 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(getStrategy().getFile(schema)); printPackage(out, schema); - printClassJavadoc(out, schema); + generateSchemaClassJavadoc(schema, out); + printClassAnnotations(out); out.println("public class %s extends %s[[before= implements ][%s]] {", className, SchemaImpl.class, interfaces); out.printSerial(); @@ -2068,12 +2153,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide schema class footer code. - * - * @param schema The schema - * @param out The writer */ + @SuppressWarnings("unused") protected void generateSchemaClassFooter(SchemaDefinition schema, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateSchemaClassJavadoc(SchemaDefinition schema, JavaWriter out) { + printClassJavadoc(out, schema); + } + protected void printFromAndInto(JavaWriter out, TableDefinition table) { printFromAndInto(out, (Definition) table); } @@ -2269,7 +2359,8 @@ public class JavaGenerator extends AbstractGenerator { JavaWriter out = new JavaWriter(getStrategy().getFile(routine)); printPackage(out, routine); - printClassJavadoc(out, routine); + generateRoutineClassJavadoc(routine, out); + printClassAnnotations(out); out.println("public class %s extends %s<%s>[[before= implements ][%s]] {", className, AbstractRoutine.class, returnType, interfaces); out.printSerial(); @@ -2367,12 +2458,17 @@ public class JavaGenerator extends AbstractGenerator { /** * Subclasses may override this method to provide routine class footer code. - * - * @param routine The routine - * @param out The writer */ + @SuppressWarnings("unused") protected void generateRoutineClassFooter(RoutineDefinition routine, JavaWriter out) {} + /** + * Subclasses may override this method to provide their own Javadoc. + */ + protected void generateRoutineClassJavadoc(RoutineDefinition routine, JavaWriter out) { + printClassJavadoc(out, routine); + } + protected void printConvenienceMethodFunctionAsField(JavaWriter out, RoutineDefinition function, boolean parametersAsField) { // [#281] - Java can't handle more than 255 method parameters if (function.getInParameters().size() > 254) { @@ -2683,7 +2779,9 @@ public class JavaGenerator extends AbstractGenerator { } out.println(" */"); + } + protected void printClassAnnotations(JavaWriter out) { if (generateGeneratedAnnotation()) { out.println("@javax.annotation.Generated(value = { \"http://www.jooq.org\", \"%s\" },", Constants.VERSION); out.println(" comments = \"This class is generated by jOOQ\")"); diff --git a/jOOQ-test-utils/src/main/java/org/jooq/test/utils/h2/H2Generator.java b/jOOQ-test-utils/src/main/java/org/jooq/test/utils/h2/H2Generator.java index 95438d2a27..ee8a509773 100644 --- a/jOOQ-test-utils/src/main/java/org/jooq/test/utils/h2/H2Generator.java +++ b/jOOQ-test-utils/src/main/java/org/jooq/test/utils/h2/H2Generator.java @@ -53,4 +53,17 @@ public class H2Generator extends JavaGenerator { out.println(); out.tab(1).println("// Here, a toString() method could be generated"); } + + @Override + protected void generatePojoClassJavadoc(TableDefinition table, JavaWriter out) { + out.println("/**"); + out.println(" * This is a POJO for table " + table.getOutputName() + "."); + + if (table.getComment() != null && !"".equals(table.getComment())) { + out.println(" *

"); + out.println(" * " + table.getComment()); + } + + out.println(" */"); + } } diff --git a/jOOQ-test/pom.xml b/jOOQ-test/pom.xml index c97015ca6e..5e2458c9bb 100644 --- a/jOOQ-test/pom.xml +++ b/jOOQ-test/pom.xml @@ -32,7 +32,7 @@ UTF-8 3.2.6.RELEASE - + 9.2.0.0155 10.10.2.0 2.2.5 @@ -42,7 +42,7 @@ 5.1.30 9.3-1101-jdbc41 3.7.15-M1 - + - - + + org.jooq @@ -72,7 +72,7 @@ jooq-test-utils ${project.version} - + log4j log4j @@ -98,8 +98,8 @@ guava 17.0 - - + + org.hamcrest hamcrest-core @@ -120,8 +120,8 @@ jmock-junit4 2.6.0 - - + + javax.persistence persistence-api @@ -137,8 +137,8 @@ connector-api 1.5 - - + + org.apache.derby @@ -219,7 +219,7 @@ sqlite-jdbc ${db.sqlite.version} - + - + @@ -286,11 +286,11 @@ - + - + org.codehaus.mojo properties-maven-plugin @@ -311,13 +311,13 @@ - - + + - + start-hsqldb @@ -334,7 +334,7 @@ - + org.hsqldb.server.Server @@ -342,7 +342,7 @@ file:${project.build.directory}/databases/hsqld - + org.hsqldb @@ -354,7 +354,7 @@ - + start-derby @@ -370,7 +370,7 @@ - + org.apache.derby.iapi.tools.run @@ -378,7 +378,7 @@ start - + org.apache.derby @@ -392,8 +392,8 @@ - - + + codegen-cubrid @@ -403,7 +403,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-cubrid @@ -428,7 +428,7 @@ t_book_details false true - + org.jooq.test.all.converters.Boolean_10 @@ -459,7 +459,7 @@ org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter - + BOOLEAN @@ -469,7 +469,7 @@ UUID (?i:(.*?.)?T_EXOTIC_TYPES.UU) - + TINYINTUNSIGNED @@ -487,7 +487,7 @@ BIGINTUNSIGNED (?i:(.*?.)?T_UNSIGNED.U_LONG) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -547,9 +547,9 @@ - - - + + + codegen-cubrid-dba @@ -558,7 +558,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-cubrid @@ -609,8 +609,8 @@ - - + + codegen-derby @@ -619,7 +619,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-derby @@ -646,7 +646,7 @@ REC_VERSION REC_TIMESTAMP true - + org.jooq.test.all.converters.Boolean_10 @@ -677,7 +677,7 @@ org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter - + BOOLEAN @@ -687,7 +687,7 @@ UUID (?i:(.*?.)?T_EXOTIC_TYPES.UU) - + TINYINTUNSIGNED @@ -705,7 +705,7 @@ BIGINTUNSIGNED (?i:(.*?.)?T_UNSIGNED.U_LONG) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -764,8 +764,8 @@ - - + + codegen-derby-sys @@ -774,7 +774,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-derby-sys @@ -844,7 +844,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-firebird @@ -895,7 +895,7 @@ org.jooq.test.all.converters.OrdinalEnum1 org.jooq.test.all.converters.OrdinalEnum1Converter - + java.util.Date org.jooq.test.all.converters.DateConverter @@ -904,7 +904,7 @@ java.util.GregorianCalendar org.jooq.test.all.converters.CalendarConverter - + org.jooq.test.all.converters.Boolean_10 org.jooq.test.all.converters.Boolean_10_Converter @@ -934,7 +934,7 @@ org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter - + org.jooq.test.all.converters.StringEnum @@ -960,7 +960,7 @@ java.util.GregorianCalendar (?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_CALENDAR) - + BOOLEAN (?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN) @@ -969,7 +969,7 @@ UUID (?i:(.*?.)?T_EXOTIC_TYPES.UU) - + TINYINTUNSIGNED @@ -987,7 +987,7 @@ BIGINTUNSIGNED (?i:(.*?.)?T_UNSIGNED.U_LONG) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -1058,7 +1058,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-firebird-rdb @@ -1125,8 +1125,8 @@ - - + + codegen-h2 @@ -1135,7 +1135,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-h2 @@ -1151,7 +1151,7 @@ ${db.h2.password} - org.jooq.util.DefaultGenerator + org.jooq.test.utils.h2.H2Generator .* @@ -1180,12 +1180,12 @@ false true ${db.h2.schema} - + - + org.jooq.test.all.converters.Boolean_10 org.jooq.test.all.converters.Boolean_10_Converter @@ -1215,13 +1215,13 @@ org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter - + BOOLEAN (?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN) - + TINYINTUNSIGNED @@ -1239,7 +1239,7 @@ BIGINTUNSIGNED (?i:(.*?.)?T_UNSIGNED.U_LONG) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -1274,11 +1274,11 @@ false true - - + + false false - + true @@ -1306,7 +1306,7 @@ h2 ${db.h2.version} - + org.jooq @@ -1318,8 +1318,8 @@ - - + + codegen-h2-jdbc @@ -1328,7 +1328,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-h2-jdbc @@ -1354,7 +1354,7 @@ false true ${db.h2.schema} - + org.jooq.test.all.converters.Boolean_10 @@ -1385,7 +1385,7 @@ org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter - + BOOLEAN @@ -1395,7 +1395,7 @@ UUID (?i:(.*?.)?T_EXOTIC_TYPES.UU) - + TINYINTUNSIGNED @@ -1413,7 +1413,7 @@ BIGINTUNSIGNED (?i:(.*?.)?T_UNSIGNED.U_LONG) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -1469,7 +1469,7 @@ h2 ${db.h2.version} - + org.jooq @@ -1481,8 +1481,8 @@ - - + + codegen-h2-matchers @@ -1491,7 +1491,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-h2-matchers @@ -1522,7 +1522,7 @@ java.lang.Cloneable - + @@ -1531,12 +1531,12 @@ THE_BOOK
- + - +
^(.*?)BOOK(.*)$ - + $1BUCH$2 @@ -1545,26 +1545,26 @@ $1BUCH$2java.io.Serializable, java.lang.Cloneable - + PASCAL $1BUCH$2_RECORD java.io.Serializable, java.lang.Cloneable - + UPPER $1BUCH$2 java.io.Serializable, java.lang.Cloneable - + UPPER $1BUCH$2_DAO java.lang.Objectjava.io.Serializable, java.lang.Cloneable - + LOWER I_$1BUCH$2 @@ -1572,14 +1572,14 @@ java.io.Serializable, java.lang.Cloneable
- - + + TITLE - + - THE_TITLE + THE_TITLE the__title @@ -1592,14 +1592,14 @@ - + F_ONE - + F_ONE_FUNCTION @@ -1609,7 +1609,7 @@ java.io.Serializable, java.lang.Cloneable - + @@ -1629,7 +1629,7 @@ false true PUBLIC - + org.jooq.test.all.converters.Boolean_10 @@ -1660,13 +1660,13 @@ org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter - + BOOLEAN (?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN) - + TINYINTUNSIGNED @@ -1684,7 +1684,7 @@ BIGINTUNSIGNED (?i:(.*?.)?T_UNSIGNED.U_LONG) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -1719,11 +1719,11 @@ false true - - + + false false - + true @@ -1753,7 +1753,7 @@ h2 ${db.h2.version} - + org.jooq @@ -1765,8 +1765,8 @@ - - + + codegen-h2-information-schema @@ -1775,7 +1775,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-h2-information-schema @@ -1829,7 +1829,7 @@ h2 ${db.h2.version} - + org.jooq @@ -1841,8 +1841,8 @@ - - + + codegen-hsqldb @@ -1851,7 +1851,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-hsqldb @@ -1902,7 +1902,7 @@ org.jooq.test.all.converters.OrdinalEnum1 org.jooq.test.all.converters.OrdinalEnum1Converter - + java.util.Date org.jooq.test.all.converters.DateConverter @@ -1911,7 +1911,7 @@ java.util.GregorianCalendar org.jooq.test.all.converters.CalendarConverter - + org.jooq.test.all.converters.Boolean_10 org.jooq.test.all.converters.Boolean_10_Converter @@ -1941,7 +1941,7 @@ org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter - + org.jooq.test.all.converters.StringEnum @@ -1967,7 +1967,7 @@ java.util.GregorianCalendar (?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_CALENDAR) - + BOOLEAN (?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN) @@ -1976,7 +1976,7 @@ UUID (?i:(.*?.)?T_EXOTIC_TYPES.UU) - + TINYINTUNSIGNED @@ -1994,7 +1994,7 @@ BIGINTUNSIGNED (?i:(.*?.)?T_UNSIGNED.U_LONG) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -2054,8 +2054,8 @@ - - + + codegen-hsqldb-information-schema @@ -2064,7 +2064,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-hsqldb-information-schema @@ -2131,8 +2131,8 @@ - - + + codegen-mysql @@ -2141,7 +2141,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-mysql @@ -2165,7 +2165,7 @@ t_book_details false true - + org.jooq.test.all.converters.Boolean_10 @@ -2200,7 +2200,7 @@ org.jooq.test.all.converters.UUIDBinaryConverter - + BOOLEAN @@ -2210,7 +2210,7 @@ java.util.UUID (?i:(.*?.)?T_EXOTIC_TYPES.UU) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -2271,8 +2271,8 @@ - - + + codegen-mysql-schema-rewrite @@ -2281,7 +2281,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-mysql-schema-rewrite @@ -2307,7 +2307,7 @@ true ${db.mysql.schema} ${db.mysql.schema}2 - + org.jooq.test.all.converters.Boolean_10 @@ -2342,7 +2342,7 @@ org.jooq.test.all.converters.UUIDBinaryConverter - + BOOLEAN @@ -2352,7 +2352,7 @@ java.util.UUID (?i:(.*?.)?T_EXOTIC_TYPES.UU) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -2411,8 +2411,8 @@ - - + + codegen-mysql-information-schema @@ -2421,7 +2421,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-mysql-information-schema @@ -2480,8 +2480,8 @@ - - + + codegen-mysql-mysql @@ -2490,7 +2490,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-mysql-mysql @@ -2549,8 +2549,8 @@ - - + + codegen-mariadb @@ -2559,7 +2559,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-mariadb @@ -2583,7 +2583,7 @@ t_book_details false true - + org.jooq.test.all.converters.Boolean_10 @@ -2618,7 +2618,7 @@ org.jooq.test.all.converters.UUIDBinaryConverter - + BOOLEAN @@ -2628,7 +2628,7 @@ java.util.UUID (?i:(.*?.)?T_EXOTIC_TYPES.UU) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -2689,8 +2689,8 @@ - - + + codegen-postgres @@ -2699,7 +2699,7 @@ org.jooq jooq-codegen-maven ${jooq.version} - + generate-postgres @@ -2723,14 +2723,14 @@ (?i:(.*?.)?T_2781\.(.*)) - + LOWER $2 - + org.jooq.util.postgres.PostgresDatabase @@ -2754,7 +2754,7 @@ java.lang.Integer org.jooq.test.all.converters.T_3111_Bool2Converter - + B10 org.jooq.test.all.converters.Boolean_10 @@ -2784,7 +2784,7 @@ org.jooq.test.all.converters.Boolean_YES_NO_UC org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter - + StringArrayToStringList java.util.List<java.lang.String> @@ -2801,9 +2801,9 @@ org.jooq.test.all.converters.StringArrayToDateListConverter - + - + 3111_INVERSE @@ -2817,13 +2817,13 @@ 3111_BOOL2 (?i:(.*?\.)?T_3111\.BOOL2) - - + + BOOLEAN (?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN) - + TINYINTUNSIGNED @@ -2841,7 +2841,7 @@ BIGINTUNSIGNED (?i:(.*?.)?T_UNSIGNED.U_LONG) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -2870,8 +2870,8 @@ B10 (?i:(.*?.)?T_BOOLEANS.ONE_ZERO) - - TINYINTUNSIGNED @@ -3151,7 +3151,7 @@ BIGINTUNSIGNED (?i:(.*?.)?T_UNSIGNED.U_LONG) - + org.jooq.test.all.converters.Boolean_YES_NO_LC (?i:(.*?.)?T_BOOLEANS.YES_NO_LC) @@ -3210,13 +3210,13 @@ - - + + - + \ No newline at end of file