From 50075f1d16710a6e2566a82b3ebeeb3a13cda3be Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 24 Feb 2014 14:06:49 +0100 Subject: [PATCH] [#3081] Let generated POJOs reference generated UDT POJOs instead of UDT Records - Regenerate databases --- .../tables/interfaces/ITAuthor.java | 2 +- .../tables/interfaces/IVAuthor.java | 2 +- .../tables/pojos/TAuthor.java | 28 ++++++++-------- .../tables/pojos/VAuthor.java | 28 ++++++++-------- .../udt/interfaces/IUAddressType.java | 2 +- .../udt/pojos/UAddressType.java | 32 +++++++++---------- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/interfaces/ITAuthor.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/interfaces/ITAuthor.java index 7bc38b3713..0322009b03 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/interfaces/ITAuthor.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/interfaces/ITAuthor.java @@ -37,5 +37,5 @@ public interface ITAuthor extends java.io.Serializable { /** * Getter for public.t_author.address. */ - public org.jooq.test.postgres.generatedclasses.udt.records.UAddressTypeRecord getAddress(); + public org.jooq.test.postgres.generatedclasses.udt.interfaces.IUAddressType getAddress(); } diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/interfaces/IVAuthor.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/interfaces/IVAuthor.java index a0c05bc757..c213512b31 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/interfaces/IVAuthor.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/interfaces/IVAuthor.java @@ -37,5 +37,5 @@ public interface IVAuthor extends java.io.Serializable { /** * Getter for public.v_author.address. */ - public org.jooq.test.postgres.generatedclasses.udt.records.UAddressTypeRecord getAddress(); + public org.jooq.test.postgres.generatedclasses.udt.interfaces.IUAddressType getAddress(); } diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/pojos/TAuthor.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/pojos/TAuthor.java index fd8f4433a9..19cb690486 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/pojos/TAuthor.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/pojos/TAuthor.java @@ -9,22 +9,22 @@ package org.jooq.test.postgres.generatedclasses.tables.pojos; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TAuthor implements org.jooq.test.postgres.generatedclasses.tables.interfaces.ITAuthor { - private static final long serialVersionUID = 1496330061; + private static final long serialVersionUID = 979289363; - private final java.lang.Integer id; - private final java.lang.String firstName; - private final java.lang.String lastName; - private final java.sql.Date dateOfBirth; - private final java.lang.Integer yearOfBirth; - private final org.jooq.test.postgres.generatedclasses.udt.records.UAddressTypeRecord address; + private final java.lang.Integer id; + private final java.lang.String firstName; + private final java.lang.String lastName; + private final java.sql.Date dateOfBirth; + private final java.lang.Integer yearOfBirth; + private final org.jooq.test.postgres.generatedclasses.udt.pojos.UAddressType address; public TAuthor( - java.lang.Integer id, - java.lang.String firstName, - java.lang.String lastName, - java.sql.Date dateOfBirth, - java.lang.Integer yearOfBirth, - org.jooq.test.postgres.generatedclasses.udt.records.UAddressTypeRecord address + java.lang.Integer id, + java.lang.String firstName, + java.lang.String lastName, + java.sql.Date dateOfBirth, + java.lang.Integer yearOfBirth, + org.jooq.test.postgres.generatedclasses.udt.pojos.UAddressType address ) { this.id = id; this.firstName = firstName; @@ -60,7 +60,7 @@ public class TAuthor implements org.jooq.test.postgres.generatedclasses.tables.i } @Override - public org.jooq.test.postgres.generatedclasses.udt.records.UAddressTypeRecord getAddress() { + public org.jooq.test.postgres.generatedclasses.udt.pojos.UAddressType getAddress() { return this.address; } } diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/pojos/VAuthor.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/pojos/VAuthor.java index 49eceab0d9..a9ae4b5839 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/pojos/VAuthor.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/pojos/VAuthor.java @@ -9,22 +9,22 @@ package org.jooq.test.postgres.generatedclasses.tables.pojos; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VAuthor implements org.jooq.test.postgres.generatedclasses.tables.interfaces.IVAuthor { - private static final long serialVersionUID = -1592051893; + private static final long serialVersionUID = 1036404497; - private final java.lang.Integer id; - private final java.lang.String firstName; - private final java.lang.String lastName; - private final java.sql.Date dateOfBirth; - private final java.lang.Integer yearOfBirth; - private final org.jooq.test.postgres.generatedclasses.udt.records.UAddressTypeRecord address; + private final java.lang.Integer id; + private final java.lang.String firstName; + private final java.lang.String lastName; + private final java.sql.Date dateOfBirth; + private final java.lang.Integer yearOfBirth; + private final org.jooq.test.postgres.generatedclasses.udt.pojos.UAddressType address; public VAuthor( - java.lang.Integer id, - java.lang.String firstName, - java.lang.String lastName, - java.sql.Date dateOfBirth, - java.lang.Integer yearOfBirth, - org.jooq.test.postgres.generatedclasses.udt.records.UAddressTypeRecord address + java.lang.Integer id, + java.lang.String firstName, + java.lang.String lastName, + java.sql.Date dateOfBirth, + java.lang.Integer yearOfBirth, + org.jooq.test.postgres.generatedclasses.udt.pojos.UAddressType address ) { this.id = id; this.firstName = firstName; @@ -60,7 +60,7 @@ public class VAuthor implements org.jooq.test.postgres.generatedclasses.tables.i } @Override - public org.jooq.test.postgres.generatedclasses.udt.records.UAddressTypeRecord getAddress() { + public org.jooq.test.postgres.generatedclasses.udt.pojos.UAddressType getAddress() { return this.address; } } diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/udt/interfaces/IUAddressType.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/udt/interfaces/IUAddressType.java index 36431cf0aa..373dc814ca 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/udt/interfaces/IUAddressType.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/udt/interfaces/IUAddressType.java @@ -12,7 +12,7 @@ public interface IUAddressType extends java.io.Serializable { /** * Getter for public.u_address_type.street. */ - public org.jooq.test.postgres.generatedclasses.udt.records.UStreetTypeRecord getStreet(); + public org.jooq.test.postgres.generatedclasses.udt.interfaces.IUStreetType getStreet(); /** * Getter for public.u_address_type.zip. diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/udt/pojos/UAddressType.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/udt/pojos/UAddressType.java index c1436d6e73..9f9167f98c 100644 --- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/udt/pojos/UAddressType.java +++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/udt/pojos/UAddressType.java @@ -9,24 +9,24 @@ package org.jooq.test.postgres.generatedclasses.udt.pojos; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class UAddressType implements org.jooq.test.postgres.generatedclasses.udt.interfaces.IUAddressType { - private static final long serialVersionUID = 494346919; + private static final long serialVersionUID = 1062009819; - private final org.jooq.test.postgres.generatedclasses.udt.records.UStreetTypeRecord street; - private final java.lang.String zip; - private final java.lang.String city; - private final org.jooq.test.postgres.generatedclasses.enums.UCountry country; - private final java.sql.Date since; - private final java.lang.Integer code; - private final byte[] f_1323; + private final org.jooq.test.postgres.generatedclasses.udt.pojos.UStreetType street; + private final java.lang.String zip; + private final java.lang.String city; + private final org.jooq.test.postgres.generatedclasses.enums.UCountry country; + private final java.sql.Date since; + private final java.lang.Integer code; + private final byte[] f_1323; public UAddressType( - org.jooq.test.postgres.generatedclasses.udt.records.UStreetTypeRecord street, - java.lang.String zip, - java.lang.String city, - org.jooq.test.postgres.generatedclasses.enums.UCountry country, - java.sql.Date since, - java.lang.Integer code, - byte[] f_1323 + org.jooq.test.postgres.generatedclasses.udt.pojos.UStreetType street, + java.lang.String zip, + java.lang.String city, + org.jooq.test.postgres.generatedclasses.enums.UCountry country, + java.sql.Date since, + java.lang.Integer code, + byte[] f_1323 ) { this.street = street; this.zip = zip; @@ -38,7 +38,7 @@ public class UAddressType implements org.jooq.test.postgres.generatedclasses.udt } @Override - public org.jooq.test.postgres.generatedclasses.udt.records.UStreetTypeRecord getStreet() { + public org.jooq.test.postgres.generatedclasses.udt.pojos.UStreetType getStreet() { return this.street; }