Release 2.2.2

digulla · Apr 22, 2012 · df49099 · df49099
1 parent 0af1f64
commit df49099
Show file tree

Hide file tree

Showing 21 changed files with 63 additions and 181 deletions.
diff --git a/jOOQ-codegen-maven-example/pom.xml b/jOOQ-codegen-maven-example/pom.xml
@@ -9,7 +9,7 @@
 
 	<groupId>org.jooq</groupId>
 	<artifactId>jooq-codegen-maven-example</artifactId>
-	<version>2.2.1</version>
+	<version>2.2.2</version>
 	<packaging>jar</packaging>
 
 	<name>jOOQ Codegen Maven</name>
@@ -51,7 +51,7 @@
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq</artifactId>
-			<version>2.2.1</version>
+			<version>2.2.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -106,7 +106,7 @@
 			<plugin>
 				<groupId>org.jooq</groupId>
 				<artifactId>jooq-codegen-maven</artifactId>
-				<version>2.2.1</version>
+				<version>2.2.2</version>
 				<executions>
 					<execution>
 						<id>exec1</id>

diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml
@@ -9,7 +9,7 @@
 
 	<groupId>org.jooq</groupId>
 	<artifactId>jooq-codegen-maven</artifactId>
-	<version>2.2.1</version>
+	<version>2.2.2</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>jOOQ Codegen Maven</name>
@@ -160,7 +160,7 @@
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq-codegen</artifactId>
-			<version>2.2.1</version>
+			<version>2.2.2</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>

diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.jooq</groupId>
 	<artifactId>jooq-codegen</artifactId>
-	<version>2.2.1</version>
+	<version>2.2.2</version>
 	<packaging>jar</packaging>
 
 	<name>jOOQ Codegen</name>
@@ -150,14 +150,14 @@
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq</artifactId>
-			<version>2.2.1</version>
+			<version>2.2.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq-meta</artifactId>
-			<version>2.2.1</version>
+			<version>2.2.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>

diff --git a/jOOQ-console/pom.xml b/jOOQ-console/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-console</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
     <packaging>jar</packaging>
 
     <name>jOOQ</name>
@@ -201,7 +201,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>2.2.1</version>
+            <version>2.2.2</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>

diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
@@ -9,7 +9,7 @@
 
 	<groupId>org.jooq</groupId>
 	<artifactId>jooq-meta</artifactId>
-	<version>2.2.1</version>
+	<version>2.2.2</version>
 	<packaging>jar</packaging>
 
 	<name>jOOQ Meta</name>
@@ -149,7 +149,7 @@
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq</artifactId>
-			<version>2.2.1</version>
+			<version>2.2.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>

diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
@@ -3,7 +3,7 @@
 	<property name="dir.workspace" value="${basedir}/.." />
 	<property name="dir.target" value="${basedir}/target" />
 	<property name="dir.release" value="${basedir}/release" />
-	<property name="version" value="2.2.1"/>
+	<property name="version" value="2.2.2"/>
 
 	<!-- Run a full mvn clean package install deploy first before this -->
 	<target name="release" description="Release a new version">

diff --git a/jOOQ-release/release/template/RELEASENOTES.txt b/jOOQ-release/release/template/RELEASENOTES.txt
@@ -9,6 +9,23 @@ http://www.jooq.org/notes.php
 For a text version, see
 http://www.jooq.org/inc/RELEASENOTES.txt
 
+Version 2.2.2 - April 22, 2012
+=================================================================
+
+This is a minor patch release, fixing some issues
+
+Bug fixes
+---------
+#1308 - Oracle's DataTypeDefinition reports the length of a BLOB
+        / CLOB data type to be 4000
+#1324 - Code generation error in Oracle 10g when generating
+        stored procedures
+#1329 - NullPointerException when passing null to
+        timestampDiff(Field, Field)
+#1343 - Regression in insertInto(...).values(...). Cannot pass
+        Field<?> to values()
+#1311 - NPE at org.jooq.util.AbstractDatabase.getOutputSchema()
+
 Version 2.2.1 - April 12, 2012
 =================================================================
 

diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VAuthor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VAuthor.java
@@ -10,7 +10,7 @@
 @javax.persistence.Table(name = "V_AUTHOR", schema = "TEST")
 public class VAuthor implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1538266874;
+	private static final long serialVersionUID = 1980522144;
 
 	private java.lang.Integer                                                         id;
 	private java.lang.String                                                          firstName;
@@ -64,7 +64,7 @@ public void setYearOfBirth(java.lang.Integer yearOfBirth) {
 		this.yearOfBirth = yearOfBirth;
 	}
 
-	@javax.persistence.Column(name = "ADDRESS", length = 40)
+	@javax.persistence.Column(name = "ADDRESS", length = 448)
 	public org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord getAddress() {
 		return this.address;
 	}

diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VAuthorRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VAuthorRecord.java
@@ -10,7 +10,7 @@
 @javax.persistence.Table(name = "V_AUTHOR", schema = "TEST")
 public class VAuthorRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.VAuthorRecord> {
 
-	private static final long serialVersionUID = 1750224359;
+	private static final long serialVersionUID = 1073715627;
 
 	/**
 	 * An uncommented item
@@ -97,7 +97,7 @@ public void setAddress(org.jooq.test.oracle.generatedclasses.test.udt.records.UA
 	/**
 	 * An uncommented item
 	 */
-	@javax.persistence.Column(name = "ADDRESS", length = 40)
+	@javax.persistence.Column(name = "ADDRESS", length = 448)
 	public org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord getAddress() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VAuthor.V_AUTHOR.ADDRESS);
 	}

diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/UAddressType.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/UAddressType.java
@@ -8,7 +8,7 @@
  */
 public class UAddressType extends org.jooq.impl.UDTImpl<org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord> {
 
-	private static final long serialVersionUID = -849475538;
+	private static final long serialVersionUID = 781413964;
 
 	/**
 	 * The singleton instance of TEST.U_ADDRESS_TYPE
@@ -58,16 +58,6 @@ public java.lang.Class<org.jooq.test.oracle.generatedclasses.test.udt.records.UA
 	 */
 	public static final org.jooq.UDTField<org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord, java.lang.Integer> CODE = createField("CODE", org.jooq.impl.SQLDataType.INTEGER, U_ADDRESS_TYPE);
 
-	/**
-	 * An uncommented item
-	 */
-	public static final org.jooq.UDTField<org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord, byte[]> F_1323 = createField("F_1323", org.jooq.impl.SQLDataType.BLOB, U_ADDRESS_TYPE);
-
-	/**
-	 * An uncommented item
-	 */
-	public static final org.jooq.UDTField<org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord, java.lang.String> F_1326 = createField("F_1326", org.jooq.impl.SQLDataType.CLOB, U_ADDRESS_TYPE);
-
 	/**
 	 * No further instances allowed
 	 */

diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/UStreetType.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/UStreetType.java
@@ -8,7 +8,7 @@
  */
 public class UStreetType extends org.jooq.impl.UDTImpl<org.jooq.test.oracle.generatedclasses.test.udt.records.UStreetTypeRecord> {
 
-	private static final long serialVersionUID = -948161688;
+	private static final long serialVersionUID = -1903797174;
 
 	/**
 	 * The singleton instance of TEST.U_STREET_TYPE
@@ -43,16 +43,6 @@ public java.lang.Class<org.jooq.test.oracle.generatedclasses.test.udt.records.US
 	 */
 	public static final org.jooq.UDTField<org.jooq.test.oracle.generatedclasses.test.udt.records.UStreetTypeRecord, org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord> FLOORS = createField("FLOORS", org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord.class), U_STREET_TYPE);
 
-	/**
-	 * An uncommented item
-	 */
-	public static final org.jooq.UDTField<org.jooq.test.oracle.generatedclasses.test.udt.records.UStreetTypeRecord, byte[]> F_1323 = createField("F_1323", org.jooq.impl.SQLDataType.BLOB, U_STREET_TYPE);
-
-	/**
-	 * An uncommented item
-	 */
-	public static final org.jooq.UDTField<org.jooq.test.oracle.generatedclasses.test.udt.records.UStreetTypeRecord, java.lang.String> F_1326 = createField("F_1326", org.jooq.impl.SQLDataType.CLOB, U_STREET_TYPE);
-
 	/**
 	 * No further instances allowed
 	 */

diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/records/UAddressTypeRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/records/UAddressTypeRecord.java
@@ -8,7 +8,7 @@
  */
 public class UAddressTypeRecord extends org.jooq.impl.UDTRecordImpl<org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord> {
 
-	private static final long serialVersionUID = -784892408;
+	private static final long serialVersionUID = 159216626;
 
 
 	/**
@@ -95,34 +95,6 @@ public java.lang.Integer getCode() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.udt.UAddressType.CODE);
 	}
 
-	/**
-	 * An uncommented item
-	 */
-	public void setF_1323(byte[] value) {
-		setValue(org.jooq.test.oracle.generatedclasses.test.udt.UAddressType.F_1323, value);
-	}
-
-	/**
-	 * An uncommented item
-	 */
-	public byte[] getF_1323() {
-		return getValue(org.jooq.test.oracle.generatedclasses.test.udt.UAddressType.F_1323);
-	}
-
-	/**
-	 * An uncommented item
-	 */
-	public void setF_1326(java.lang.String value) {
-		setValue(org.jooq.test.oracle.generatedclasses.test.udt.UAddressType.F_1326, value);
-	}
-
-	/**
-	 * An uncommented item
-	 */
-	public java.lang.String getF_1326() {
-		return getValue(org.jooq.test.oracle.generatedclasses.test.udt.UAddressType.F_1326);
-	}
-
 	public UAddressTypeRecord() {
 		super(org.jooq.test.oracle.generatedclasses.test.udt.UAddressType.U_ADDRESS_TYPE);
 	}

diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/records/UStreetTypeRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/records/UStreetTypeRecord.java
@@ -8,7 +8,7 @@
  */
 public class UStreetTypeRecord extends org.jooq.impl.UDTRecordImpl<org.jooq.test.oracle.generatedclasses.test.udt.records.UStreetTypeRecord> {
 
-	private static final long serialVersionUID = -615019899;
+	private static final long serialVersionUID = -838066655;
 
 
 	/**
@@ -53,34 +53,6 @@ public org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord
 		return getValue(org.jooq.test.oracle.generatedclasses.test.udt.UStreetType.FLOORS);
 	}
 
-	/**
-	 * An uncommented item
-	 */
-	public void setF_1323(byte[] value) {
-		setValue(org.jooq.test.oracle.generatedclasses.test.udt.UStreetType.F_1323, value);
-	}
-
-	/**
-	 * An uncommented item
-	 */
-	public byte[] getF_1323() {
-		return getValue(org.jooq.test.oracle.generatedclasses.test.udt.UStreetType.F_1323);
-	}
-
-	/**
-	 * An uncommented item
-	 */
-	public void setF_1326(java.lang.String value) {
-		setValue(org.jooq.test.oracle.generatedclasses.test.udt.UStreetType.F_1326, value);
-	}
-
-	/**
-	 * An uncommented item
-	 */
-	public java.lang.String getF_1326() {
-		return getValue(org.jooq.test.oracle.generatedclasses.test.udt.UStreetType.F_1326);
-	}
-
 	public UStreetTypeRecord() {
 		super(org.jooq.test.oracle.generatedclasses.test.udt.UStreetType.U_STREET_TYPE);
 	}

diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/tables/pojos/V_AUTHOR_POJO.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/tables/pojos/V_AUTHOR_POJO.java
@@ -10,7 +10,7 @@
 @javax.persistence.Table(name = "V_AUTHOR", schema = "TEST")
 public class V_AUTHOR_POJO extends java.lang.ThreadDeath implements java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1900821802;
+	private static final long serialVersionUID = 1369668504;
 
 	private java.lang.Integer                                                 ID;
 	private java.lang.String                                                  FIRST_NAME;
@@ -64,7 +64,7 @@ public void setYEAR_OF_BIRTH(java.lang.Integer YEAR_OF_BIRTH) {
 		this.YEAR_OF_BIRTH = YEAR_OF_BIRTH;
 	}
 
-	@javax.persistence.Column(name = "ADDRESS", length = 40)
+	@javax.persistence.Column(name = "ADDRESS", length = 448)
 	public org.jooq.test.oracle3.generatedclasses.udt.records.U_ADDRESS_TYPE getADDRESS() {
 		return this.ADDRESS;
 	}

diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/U_ADDRESS_TYPE.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/U_ADDRESS_TYPE.java
@@ -8,7 +8,7 @@
  */
 public class U_ADDRESS_TYPE extends org.jooq.impl.UDTImpl<org.jooq.test.oracle3.generatedclasses.udt.records.U_ADDRESS_TYPE> implements java.lang.Cloneable {
 
-	private static final long serialVersionUID = -805498140;
+	private static final long serialVersionUID = -1438599870;
 
 	/**
 	 * The singleton instance of TEST.U_ADDRESS_TYPE
@@ -58,16 +58,6 @@ public java.lang.Class<org.jooq.test.oracle3.generatedclasses.udt.records.U_ADDR
 	 */
 	public static final org.jooq.UDTField<org.jooq.test.oracle3.generatedclasses.udt.records.U_ADDRESS_TYPE, java.lang.Integer> CODE = createField("CODE", org.jooq.impl.SQLDataType.INTEGER, U_ADDRESS_TYPE);
 
-	/**
-	 * An uncommented item
-	 */
-	public static final org.jooq.UDTField<org.jooq.test.oracle3.generatedclasses.udt.records.U_ADDRESS_TYPE, byte[]> F_1323 = createField("F_1323", org.jooq.impl.SQLDataType.BLOB, U_ADDRESS_TYPE);
-
-	/**
-	 * An uncommented item
-	 */
-	public static final org.jooq.UDTField<org.jooq.test.oracle3.generatedclasses.udt.records.U_ADDRESS_TYPE, java.lang.String> F_1326 = createField("F_1326", org.jooq.impl.SQLDataType.CLOB, U_ADDRESS_TYPE);
-
 	/**
 	 * No further instances allowed
 	 */

diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/U_STREET_TYPE.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/U_STREET_TYPE.java
@@ -8,7 +8,7 @@
  */
 public class U_STREET_TYPE extends org.jooq.impl.UDTImpl<org.jooq.test.oracle3.generatedclasses.udt.records.U_STREET_TYPE> implements java.lang.Cloneable {
 
-	private static final long serialVersionUID = -598064775;
+	private static final long serialVersionUID = 1786177499;
 
 	/**
 	 * The singleton instance of TEST.U_STREET_TYPE
@@ -43,16 +43,6 @@ public java.lang.Class<org.jooq.test.oracle3.generatedclasses.udt.records.U_STRE
 	 */
 	public static final org.jooq.UDTField<org.jooq.test.oracle3.generatedclasses.udt.records.U_STREET_TYPE, org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_ARRAY> FLOORS = createField("FLOORS", org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_ARRAY.class), U_STREET_TYPE);
 
-	/**
-	 * An uncommented item
-	 */
-	public static final org.jooq.UDTField<org.jooq.test.oracle3.generatedclasses.udt.records.U_STREET_TYPE, byte[]> F_1323 = createField("F_1323", org.jooq.impl.SQLDataType.BLOB, U_STREET_TYPE);
-
-	/**
-	 * An uncommented item
-	 */
-	public static final org.jooq.UDTField<org.jooq.test.oracle3.generatedclasses.udt.records.U_STREET_TYPE, java.lang.String> F_1326 = createField("F_1326", org.jooq.impl.SQLDataType.CLOB, U_STREET_TYPE);
-
 	/**
 	 * No further instances allowed
 	 */