From 8070268deffab2eab80810ed3995dfce0150f2a3 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sat, 4 Aug 2012 12:49:22 +0200
Subject: [PATCH] [#1664] By default, activate <relations/> in the code
 generator

---
 jOOQ-codegen-maven-example/pom.xml                          | 6 +-----
 .../src/main/java/org/jooq/util/AbstractGenerator.java      | 2 +-
 jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.5.0.xsd     | 2 +-
 .../org/jooq/configuration/lukas/ase/library.xml            | 1 -
 .../org/jooq/configuration/lukas/cubrid/demodb.xml          | 1 -
 .../org/jooq/configuration/lukas/cubrid/library.xml         | 1 -
 .../org/jooq/configuration/lukas/db2/library.xml            | 1 -
 .../org/jooq/configuration/lukas/derby/library.xml          | 1 -
 8 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/jOOQ-codegen-maven-example/pom.xml b/jOOQ-codegen-maven-example/pom.xml
index 6d2ec7cd94..f85916a99d 100644
--- a/jOOQ-codegen-maven-example/pom.xml
+++ b/jOOQ-codegen-maven-example/pom.xml
@@ -8,7 +8,7 @@
 		<artifactId>jooq-parent</artifactId>
 		<version>2.5.0-SNAPSHOT</version>
 	</parent>
-	
+
     <groupId>org.jooq</groupId>
     <artifactId>jooq-codegen-maven-example</artifactId>
     <name>jOOQ Codegen Maven (Example)</name>
@@ -133,7 +133,6 @@
                                     <inputSchema>PUBLIC</inputSchema>
                                 </database>
                                 <generate>
-                                    <relations>true</relations>
                                     <deprecated>false</deprecated>
                                 </generate>
                                 <target>
@@ -166,7 +165,6 @@
                                     <dateAsTimestamp>true</dateAsTimestamp>
                                 </database>
                                 <generate>
-                                    <relations>true</relations>
                                     <deprecated>false</deprecated>
                                     <instanceFields>false</instanceFields>
                                     <pojos>true</pojos>
@@ -202,7 +200,6 @@
                                     <excludes></excludes>
                                 </database>
                                 <generate>
-                                    <relations>true</relations>
                                     <deprecated>false</deprecated>
                                     <instanceFields>true</instanceFields>
                                     <jpaAnnotations>true</jpaAnnotations>
@@ -304,7 +301,6 @@
                                     </forcedTypes>
                                 </database>
                                 <generate>
-                                    <relations>true</relations>
                                     <deprecated>false</deprecated>
                                     <instanceFields>true</instanceFields>
                                     <generatedAnnotation>false</generatedAnnotation>
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 8d89d126f6..dda6d931cb 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java
@@ -44,7 +44,7 @@ package org.jooq.util;
 abstract class AbstractGenerator implements Generator {
 
     boolean                            generateDeprecated            = true;
-    boolean                            generateRelations             = false;
+    boolean                            generateRelations             = true;
     boolean                            generateNavigationMethods     = true;
     boolean                            generateInstanceFields        = true;
     boolean                            generateGeneratedAnnotation   = true;
diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.5.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.5.0.xsd
index fd4371d19c..d27dc9b7e3 100644
--- a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.5.0.xsd
+++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.5.0.xsd
@@ -319,7 +319,7 @@
         Primary key / foreign key relations should be generated and used.
         This is a prerequisite for various advanced features
         -->
-      <element name="relations" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+      <element name="relations" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
 
       <!--
         Generate navigation methods to navigate foreign key relationships
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.xml
index 763fc55533..4da6ada96c 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/library.xml
@@ -112,7 +112,6 @@
             </forcedTypes>
         </database>
         <generate>
-            <relations>true</relations>
             <navigationMethods>true</navigationMethods>
             <deprecated>true</deprecated>
             <instanceFields>false</instanceFields>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/demodb.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/demodb.xml
index 3950bc75bc..8aca9b1482 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/demodb.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/demodb.xml
@@ -17,7 +17,6 @@
             <unsignedTypes>true</unsignedTypes>
         </database>
         <generate>
-            <relations>true</relations>
             <navigationMethods>true</navigationMethods>
             <deprecated>false</deprecated>
             <instanceFields>true</instanceFields>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/library.xml
index d7e912ee63..0f640c0462 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/library.xml
@@ -112,7 +112,6 @@
             </forcedTypes>
         </database>
         <generate>
-            <relations>true</relations>
             <navigationMethods>true</navigationMethods>
             <deprecated>true</deprecated>
             <instanceFields>false</instanceFields>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.xml
index e7e917b779..f25bc24828 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/library.xml
@@ -112,7 +112,6 @@
             </forcedTypes>
         </database>
         <generate>
-            <relations>true</relations>
             <navigationMethods>true</navigationMethods>
             <deprecated>true</deprecated>
             <instanceFields>false</instanceFields>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml
index 45e8a682a7..d1708c7c76 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml
@@ -114,7 +114,6 @@
             </forcedTypes>
         </database>
         <generate>
-            <relations>true</relations>
             <navigationMethods>true</navigationMethods>
             <deprecated>true</deprecated>
             <instanceFields>false</instanceFields>