From ba7c34db69c619244a231ab23dd3e75c54652c75 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sun, 26 May 2013 08:50:08 +0200 Subject: [PATCH] [#2404] Cannot combine with if both match - Regenerated schema --- .../generatedclasses/DateAsTimestampTest.java | 4 ++-- .../test/oracle2/generatedclasses/Keys.java | 2 +- .../oracle2/generatedclasses/Routines.java | 2 +- .../test/oracle2/generatedclasses/Tables.java | 2 +- .../test/oracle2/generatedclasses/UDTs.java | 2 +- .../packages/DateAsTimestampPkg_976.java | 4 ++-- .../DateAsTimestampF_976.java | 4 ++-- .../DateAsTimestampP_976.java | 4 ++-- .../routines/DateAsTimestampF_976.java | 4 ++-- .../routines/DateAsTimestampP_976.java | 4 ++-- .../tables/DateAsTimestampTDates.java | 6 +++--- .../tables/DateAsTimestampT_976.java | 4 ++-- .../records/DateAsTimestampTDatesRecord.java | 20 +++++++++---------- .../records/DateAsTimestampT_976Record.java | 4 ++-- .../udt/DateAsTimestampT_976ObjectType.java | 4 ++-- .../DateAsTimestampT_976ObjectTypeRecord.java | 4 ++-- .../DateAsTimestampT_976VarrayTypeRecord.java | 4 ++-- 17 files changed, 39 insertions(+), 39 deletions(-) diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/DateAsTimestampTest.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/DateAsTimestampTest.java index 8dc684a34f..00e130b1dc 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/DateAsTimestampTest.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/DateAsTimestampTest.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampTest extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = 761142164; + private static final long serialVersionUID = 337796401; /** * The singleton instance of TEST diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Keys.java index d9ddca1a1d..4e4730ff68 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Keys.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Keys.java @@ -9,7 +9,7 @@ package org.jooq.test.oracle2.generatedclasses; * A class modelling foreign key relationships between tables of the TEST * schema */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Keys { // ------------------------------------------------------------------------- diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Routines.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Routines.java index 43a1d8d4a9..5c49db95fb 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Routines.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Routines.java @@ -8,7 +8,7 @@ package org.jooq.test.oracle2.generatedclasses; * * Convenience access to all stored procedures and functions in TEST */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Routines { /** diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Tables.java index 8bd344eb50..c4ff65aa8f 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Tables.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/Tables.java @@ -8,7 +8,7 @@ package org.jooq.test.oracle2.generatedclasses; * * Convenience access to all tables in TEST */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { /** diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/UDTs.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/UDTs.java index fc5901053d..2b3ae6860a 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/UDTs.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/UDTs.java @@ -8,7 +8,7 @@ package org.jooq.test.oracle2.generatedclasses; * * Convenience access to all UDTs in TEST */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class UDTs { /** diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/DateAsTimestampPkg_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/DateAsTimestampPkg_976.java index a7446ad14a..0207e9cf05 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/DateAsTimestampPkg_976.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/DateAsTimestampPkg_976.java @@ -8,10 +8,10 @@ package org.jooq.test.oracle2.generatedclasses.packages; * * Convenience access to all stored procedures and functions in PKG_976 */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampPkg_976 extends org.jooq.impl.PackageImpl { - private static final long serialVersionUID = -1753174149; + private static final long serialVersionUID = -1740116418; /** * The singleton instance of TEST.PKG_976 diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampF_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampF_976.java index 126fd375a6..812badaa5f 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampF_976.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampF_976.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.packages.date_as_timestamp_pkg_97 /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampF_976 extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = -434309456; + private static final long serialVersionUID = -1435207091; /** * The parameter TEST.PKG_976.F_976.RETURN_VALUE. diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampP_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampP_976.java index 25fe30f2b7..c995e02e4e 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampP_976.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampP_976.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.packages.date_as_timestamp_pkg_97 /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampP_976 extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = -523945874; + private static final long serialVersionUID = -1356961039; /** * The parameter TEST.PKG_976.P_976.I. diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampF_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampF_976.java index 20f627eec1..fcfd43b739 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampF_976.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampF_976.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.routines; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampF_976 extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = 268147128; + private static final long serialVersionUID = -1290979115; /** * The parameter TEST.F_976.RETURN_VALUE. diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampP_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampP_976.java index 770136a2c2..a3f9fd5a03 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampP_976.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampP_976.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.routines; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampP_976 extends org.jooq.impl.AbstractRoutine { - private static final long serialVersionUID = 1170253380; + private static final long serialVersionUID = 975105351; /** * The parameter TEST.P_976.I. diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/DateAsTimestampTDates.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/DateAsTimestampTDates.java index 6dc01bf15d..3a2feea492 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/DateAsTimestampTDates.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/DateAsTimestampTDates.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.tables; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampTDates extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -1134785180; + private static final long serialVersionUID = -277934348; /** * The singleton instance of TEST.T_DATES @@ -32,7 +32,7 @@ public class DateAsTimestampTDates extends org.jooq.impl.TableImplTEST.T_DATES.D. */ - public final org.jooq.TableField DATE_AS_TIMESTAMP_D = createField("D", org.jooq.impl.SQLDataType.TIMESTAMP, this); + public final org.jooq.TableField DATE_AS_TIMESTAMP_D = createField("D", org.jooq.impl.SQLDataType.TIMESTAMP.asConvertedDataType(new org.jooq.test._.converters.CalendarConverter()), this); /** * The column TEST.T_DATES.T. diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/DateAsTimestampT_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/DateAsTimestampT_976.java index 059e3de8ef..9732835017 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/DateAsTimestampT_976.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/DateAsTimestampT_976.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.tables; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampT_976 extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1172748183; + private static final long serialVersionUID = -640719270; /** * The singleton instance of TEST.T_976 diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/records/DateAsTimestampTDatesRecord.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/records/DateAsTimestampTDatesRecord.java index a7ff151dbc..05b73f1147 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/records/DateAsTimestampTDatesRecord.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/records/DateAsTimestampTDatesRecord.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.tables.records; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) -public class DateAsTimestampTDatesRecord extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record8 { +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class DateAsTimestampTDatesRecord extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record8 { - private static final long serialVersionUID = -191039278; + private static final long serialVersionUID = 2128670099; /** * Setter for TEST.T_DATES.ID. @@ -28,15 +28,15 @@ public class DateAsTimestampTDatesRecord extends org.jooq.impl.UpdatableRecordIm /** * Setter for TEST.T_DATES.D. */ - public void setD(java.sql.Timestamp value) { + public void setD(java.util.GregorianCalendar value) { setValue(1, value); } /** * Getter for TEST.T_DATES.D. */ - public java.sql.Timestamp getD() { - return (java.sql.Timestamp) getValue(1); + public java.util.GregorianCalendar getD() { + return (java.util.GregorianCalendar) getValue(1); } /** @@ -143,7 +143,7 @@ public class DateAsTimestampTDatesRecord extends org.jooq.impl.UpdatableRecordIm * {@inheritDoc} */ @Override - public org.jooq.Row8 fieldsRow() { + public org.jooq.Row8 fieldsRow() { return (org.jooq.Row8) super.fieldsRow(); } @@ -151,7 +151,7 @@ public class DateAsTimestampTDatesRecord extends org.jooq.impl.UpdatableRecordIm * {@inheritDoc} */ @Override - public org.jooq.Row8 valuesRow() { + public org.jooq.Row8 valuesRow() { return (org.jooq.Row8) super.valuesRow(); } @@ -167,7 +167,7 @@ public class DateAsTimestampTDatesRecord extends org.jooq.impl.UpdatableRecordIm * {@inheritDoc} */ @Override - public org.jooq.Field field2() { + public org.jooq.Field field2() { return org.jooq.test.oracle2.generatedclasses.tables.DateAsTimestampTDates.DATE_AS_TIMESTAMP_T_DATES.DATE_AS_TIMESTAMP_D; } @@ -231,7 +231,7 @@ public class DateAsTimestampTDatesRecord extends org.jooq.impl.UpdatableRecordIm * {@inheritDoc} */ @Override - public java.sql.Timestamp value2() { + public java.util.GregorianCalendar value2() { return getD(); } diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/records/DateAsTimestampT_976Record.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/records/DateAsTimestampT_976Record.java index 24d96e018b..17cf7a0bfb 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/records/DateAsTimestampT_976Record.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/tables/records/DateAsTimestampT_976Record.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.tables.records; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampT_976Record extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record4 { - private static final long serialVersionUID = 2028730375; + private static final long serialVersionUID = -1321705974; /** * Setter for TEST.T_976.ID. diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/DateAsTimestampT_976ObjectType.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/DateAsTimestampT_976ObjectType.java index 7abf0cccf3..62e885cdb9 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/DateAsTimestampT_976ObjectType.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/DateAsTimestampT_976ObjectType.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.udt; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampT_976ObjectType extends org.jooq.impl.UDTImpl { - private static final long serialVersionUID = 241682827; + private static final long serialVersionUID = -1351783730; /** * The singleton instance of TEST.T_976_OBJECT_TYPE diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/records/DateAsTimestampT_976ObjectTypeRecord.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/records/DateAsTimestampT_976ObjectTypeRecord.java index 55a30b15f7..9d82ae2714 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/records/DateAsTimestampT_976ObjectTypeRecord.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/records/DateAsTimestampT_976ObjectTypeRecord.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.udt.records; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampT_976ObjectTypeRecord extends org.jooq.impl.UDTRecordImpl { - private static final long serialVersionUID = -1732285404; + private static final long serialVersionUID = -1231870041; /** diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/records/DateAsTimestampT_976VarrayTypeRecord.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/records/DateAsTimestampT_976VarrayTypeRecord.java index 893efb9d7f..06f44e73b2 100644 --- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/records/DateAsTimestampT_976VarrayTypeRecord.java +++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/udt/records/DateAsTimestampT_976VarrayTypeRecord.java @@ -6,10 +6,10 @@ package org.jooq.test.oracle2.generatedclasses.udt.records; /** * This class is generated by jOOQ. */ -@java.lang.SuppressWarnings({ "all", "unchecked" }) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DateAsTimestampT_976VarrayTypeRecord extends org.jooq.impl.ArrayRecordImpl { - private static final long serialVersionUID = -1709208423; + private static final long serialVersionUID = 508709148; /** * Create a new TEST.T_976_VARRAY_TYPE record