From ac5ec261be7d4b8d4aeb7280cda1a9b6aac3d5b8 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Tue, 6 Sep 2016 11:12:44 +0200 Subject: [PATCH] [#5528] Add code generator flag to turn off generation of sequences --- .../main/java/org/jooq/util/AbstractGenerator.java | 11 +++++++++++ .../src/main/java/org/jooq/util/GenerationTool.java | 2 ++ .../src/main/java/org/jooq/util/Generator.java | 10 ++++++++++ .../src/main/java/org/jooq/util/JavaGenerator.java | 3 ++- .../src/main/resources/xsd/jooq-codegen-3.9.0.xsd | 5 +++++ 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java index 0538a763e3..312efff54b 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java @@ -66,6 +66,7 @@ abstract class AbstractGenerator implements Generator { boolean useSchemaVersionProvider = false; boolean useCatalogVersionProvider = false; boolean generateRoutines = true; + boolean generateSequences = true; boolean generateTables = true; boolean generateRecords = true; boolean generatePojos = false; @@ -250,6 +251,16 @@ abstract class AbstractGenerator implements Generator { this.generateRoutines = generateRoutines; } + @Override + public boolean generateSequences() { + return generateSequences; + } + + @Override + public void setGenerateSequences(boolean generateSequences) { + this.generateSequences = generateSequences; + } + @Override public boolean generateTables() { 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 d44c6773e8..ee5506e4af 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java @@ -463,6 +463,8 @@ public class GenerationTool { generator.setGenerateGeneratedAnnotation(g.getGenerate().isGeneratedAnnotation()); if (g.getGenerate().isRoutines() != null) generator.setGenerateRoutines(g.getGenerate().isRoutines()); + if (g.getGenerate().isSequences() != null) + generator.setGenerateSequences(g.getGenerate().isSequences()); if (g.getGenerate().isTables() != null) generator.setGenerateTables(g.getGenerate().isTables()); if (g.getGenerate().isRecords() != null) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java b/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java index ebb71fbf8a..ec235092a9 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java @@ -130,6 +130,16 @@ public interface Generator { */ void setGenerateRoutines(boolean generateRoutines); + /** + * Whether Sequences should be generated. + */ + boolean generateSequences(); + + /** + * Whether Sequences should be generated. + */ + void setGenerateSequences(boolean generateSequences); + /** * Whether Tables should be generated */ 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 f8ead7b1f8..89a8233bef 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java @@ -217,6 +217,7 @@ public class JavaGenerator extends AbstractGenerator { log.info(" JPA annotations", generateJPAAnnotations()); log.info(" validation annotations", generateValidationAnnotations()); log.info(" instance fields", generateInstanceFields()); + log.info(" sequences", generateSequences()); log.info(" routines", generateRoutines()); log.info(" tables", generateTables() + ((!generateTables && generateRecords) ? " (forced to true because of )" : @@ -363,7 +364,7 @@ public class JavaGenerator extends AbstractGenerator { // ---------------------------------------------------------------------- generateSchema(schema); - if (generateGlobalObjectReferences() && generateGlobalSequenceReferences() && database.getSequences(schema).size() > 0) { + if (generateSequences() && generateGlobalObjectReferences() && generateGlobalSequenceReferences() && database.getSequences(schema).size() > 0) { generateSequences(schema); } diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.9.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.9.0.xsd index 0f3e775057..57ec39d962 100644 --- a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.9.0.xsd +++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.9.0.xsd @@ -730,6 +730,11 @@ --> + + +