diff --git a/jOOQ-codegen-maven-example/.classpath b/jOOQ-codegen-maven-example/.classpath index 480b7e99fc..235c9efceb 100644 --- a/jOOQ-codegen-maven-example/.classpath +++ b/jOOQ-codegen-maven-example/.classpath @@ -1,7 +1,7 @@ - + diff --git a/jOOQ-codegen-maven-example/pom.xml b/jOOQ-codegen-maven-example/pom.xml index 4897f9c1ab..630d21093c 100644 --- a/jOOQ-codegen-maven-example/pom.xml +++ b/jOOQ-codegen-maven-example/pom.xml @@ -71,16 +71,64 @@ - - UTF-8 - + + UTF-8 + deploy ${project.artifactId}-${project.version} - + + + + org.jooq + jooq-codegen-maven + 2.0.0-SNAPSHOT + + + + generate + + + + + + net.sourceforge.jtds + jtds + 1.2.4 + + + + + net.sourceforge.jtds.jdbc.Driver + jdbc:jtds:sybase://lukas-hp:5000/TEST + dbo + sa + + + + org.jooq.util.DefaultGenerator + + org.jooq.util.ase.ASEDatabase + t_.*,x_.*,v_.*,V_.*,p_.*,f_.*,(f|p)[0-9]+,s_.* + + + + true + false + true + + + org.jooq.util.maven.example.ase + target/generated-sources/jooq-ase + + + + + + org.jooq jooq-codegen-maven @@ -120,8 +168,8 @@ false - org.jooq.util.maven.example - target/generated-sources/jooq + org.jooq.util.maven.example.postgres + target/generated-sources/jooq-postgres diff --git a/jOOQ-codegen-maven-example/src/test/java/org/jooq/test/util/maven/TestGeneratedSources.java b/jOOQ-codegen-maven-example/src/test/java/org/jooq/test/util/maven/TestGeneratedSources.java index 5ec4cdc662..25e48ed0a2 100644 --- a/jOOQ-codegen-maven-example/src/test/java/org/jooq/test/util/maven/TestGeneratedSources.java +++ b/jOOQ-codegen-maven-example/src/test/java/org/jooq/test/util/maven/TestGeneratedSources.java @@ -44,9 +44,9 @@ import java.util.List; import org.jooq.Record; import org.jooq.Result; -import org.jooq.util.maven.example.PublicFactory; -import org.jooq.util.maven.example.tables.TBook; -import org.jooq.util.maven.example.tables.records.TBookRecord; +import org.jooq.util.maven.example.postgres.PublicFactory; +import org.jooq.util.maven.example.postgres.tables.TBook; +import org.jooq.util.maven.example.postgres.tables.records.TBookRecord; import org.junit.Test; diff --git a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Jdbc.java b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Jdbc.java index 8f98d217d0..10f3a5ab40 100644 --- a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Jdbc.java +++ b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Jdbc.java @@ -43,8 +43,8 @@ public class Jdbc { private String driver; private String url; private String schema = ""; - private String user; - private String password; + private String user = ""; + private String password = ""; String getDriver() { return driver; diff --git a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Plugin.java b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Plugin.java index 4bacbaaf45..0e466c61c8 100644 --- a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Plugin.java +++ b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Plugin.java @@ -35,6 +35,8 @@ */ package org.jooq.util.maven; +import static org.jooq.tools.StringUtils.defaultString; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Properties; @@ -83,16 +85,19 @@ public class Plugin extends AbstractMojo { props.put("jdbc.Driver", jdbc.getDriver()); props.put("jdbc.URL", jdbc.getUrl()); - props.put("jdbc.Schema", jdbc.getSchema()); - props.put("jdbc.User", jdbc.getUser()); - props.put("jdbc.Password", jdbc.getPassword()); + props.put("jdbc.Schema", defaultString(jdbc.getSchema())); + props.put("jdbc.User", defaultString(jdbc.getUser())); + props.put("jdbc.Password", defaultString(jdbc.getPassword())); + props.put("generator", generator.getName()); props.put("generator.database", generator.getDatabase().getName()); props.put("generator.database.includes", generator.getDatabase().getIncludes()); props.put("generator.database.excludes", generator.getDatabase().getExcludes()); + props.put("generator.generate.relations", generator.getGenerate().getRelations()); props.put("generator.generate.deprecated", generator.getGenerate().getDeprecated()); props.put("generator.generate.instance-fields", generator.getGenerate().getInstanceFields()); + props.put("generator.target.package", generator.getTarget().getPackageName()); props.put("generator.target.directory", generator.getTarget().getDirectory()); 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 2685cef5db..a8d947c88c 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java @@ -109,9 +109,9 @@ public class GenerationTool { try { connection = DriverManager.getConnection( - properties.getProperty("jdbc.URL"), - properties.getProperty("jdbc.User"), - properties.getProperty("jdbc.Password")); + defaultString(properties.getProperty("jdbc.URL")), + defaultString(properties.getProperty("jdbc.User")), + defaultString(properties.getProperty("jdbc.Password"))); Class generatorClass = (Class) (properties.containsKey("generator") ? Class.forName(properties.getProperty("generator"))