Version 3.9.6 - September 27, 2017

================================================================================

Features and Improvements
-------------------------
#6589 - Improve DSLContext.batchStore() Javadoc, indicating that it does not execute MERGE / UPSERT semantics

Bug Fixes
---------
#6424 - Compilation error in generated code when both SchemaVersionProvider and CatalogVersionProvider are applied
#6480 - Typo in DSLContext.fetchCount() and error in DSLContext.fetchExists() Javadoc
#6507 - XMLDatabase doesn't work when dialect is not a SQLDialect.family()
#6514 - ClobBinding and BlobBinding don't correctly inline their bind values
#6538 - NullPointerException in AbstractRecord.intern0()
#6558 - Error in Record.compareTo(...) Javadoc
#6572 - Trigger generated errors are not fetched through jOOQ's plain SQL API
#6596 - "Invalid column index" on Oracle stored procedure call when return type is converted to boolean and argument type is defaulted
#6600 - Exception thrown when creating table with SQLDataType.UUID in MySQL

jOOQ-checker/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.9.5</version>
+        <version>3.9.6</version>
     </parent>
 
     <groupId>org.jooq</groupId>

jOOQ-codegen-maven/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.9.5</version>
+        <version>3.9.6</version>
     </parent>
 
     <groupId>org.jooq</groupId>

jOOQ-codegen/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.9.5</version>
+        <version>3.9.6</version>
     </parent>
 
     <groupId>org.jooq</groupId>

jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java

@@ -4957,18 +4957,12 @@ protected void printClassAnnotations(JavaWriter out, SchemaDefinition schema, Ca
             	    out.tab(1).println("value = {");
 
                 out.tab(2).println("\"http://www.jooq.org\",");
+                out.tab(2).println("\"jOOQ version:%s\"%s", Constants.VERSION, (hasCatalogVersion || hasSchemaVersion ? "," : ""));
 
-                if (hasCatalogVersion || hasSchemaVersion) {
-                    out.tab(2).println("\"jOOQ version:%s\",", Constants.VERSION);
-
-                    if (hasCatalogVersion)
-                        out.tab(2).println("\"catalog version:%s\"", catalogVersions.get(catalog).replace("\"", "\\\""));
-                    if (hasSchemaVersion)
-                        out.tab(2).println("\"schema version:%s\"", schemaVersions.get(schema).replace("\"", "\\\""));
-                }
-                else {
-                    out.tab(2).println("\"jOOQ version:%s\"", Constants.VERSION);
-                }
+                if (hasCatalogVersion)
+                    out.tab(2).println("\"catalog version:%s\"%s", catalogVersions.get(catalog).replace("\"", "\\\""), (hasSchemaVersion ? "," : ""));
+                if (hasSchemaVersion)
+                    out.tab(2).println("\"schema version:%s\"", schemaVersions.get(schema).replace("\"", "\\\""));
 
                 if (scala)
                     out.tab(1).println("),");

jOOQ-examples/jOOQ-academy/pom.xml

@@ -18,7 +18,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <h2.version>1.4.195</h2.version>
     </properties>
 

jOOQ-examples/jOOQ-checker-framework-example/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-checker-framework-example</artifactId>
-    <version>3.9.5</version>
+    <version>3.9.6</version>
     <name>jOOQ Checker Framework Example</name>
 
     <licenses>
@@ -18,7 +18,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
     </properties>
 
     <dependencies>

jOOQ-examples/jOOQ-codegen-gradle/build.gradle

@@ -49,7 +49,7 @@ repositories {
 }
 
 dependencies {
-    compile 'org.jooq:jooq:3.9.5'
+    compile 'org.jooq:jooq:3.9.6'
 
     runtime 'com.h2database:h2:1.4.177'
     testCompile 'junit:junit:4.11'
@@ -62,7 +62,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.jooq:jooq-codegen:3.9.5'
+        classpath 'org.jooq:jooq-codegen:3.9.6'
         classpath 'com.h2database:h2:1.4.177'
     }
 }

jOOQ-examples/jOOQ-flyway-example/pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <org.h2.version>1.4.195</org.h2.version>
         <scala.version>2.11.7</scala.version>
 
@@ -158,6 +158,7 @@
                                 <database>
                                     <includes>.*</includes>
                                     <inputSchema>FLYWAY_TEST</inputSchema>
+                                    <catalogVersionProvider>SELECT :schema_name || '_' || MAX("version") FROM "schema_version"</catalogVersionProvider>
                                     <schemaVersionProvider>SELECT :schema_name || '_' || MAX("version") FROM "schema_version"</schemaVersionProvider>
                                 </database>
                                 <target>

jOOQ-examples/jOOQ-javaee-example/pom.xml

@@ -19,7 +19,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <org.h2.version>1.4.195</org.h2.version>
         <java.version>1.8</java.version>
 

jOOQ-examples/jOOQ-javafx-example/pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <org.h2.version>1.4.195</org.h2.version>
     </properties>
 

jOOQ-examples/jOOQ-jax-rs-example/pom.xml

@@ -10,7 +10,7 @@
     <version>1.0</version>
 
     <properties>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
     </properties>
 
     <build>

jOOQ-examples/jOOQ-kotlin-example/pom.xml

@@ -20,7 +20,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.version>1.0.0-rc-1036</kotlin.version>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <org.h2.version>1.4.195</org.h2.version>
         <java.version>1.8</java.version>
     </properties>

jOOQ-examples/jOOQ-nashorn-example/pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <org.h2.version>1.4.195</org.h2.version>
     </properties>
 

jOOQ-examples/jOOQ-oracle-example/pom.xml

@@ -18,7 +18,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <db.oracle.version>11</db.oracle.version>
     </properties>
 

jOOQ-examples/jOOQ-spark-chart-example/pom.xml

@@ -9,7 +9,7 @@
     <version>1.0</version>
 
     <properties>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
     </properties>
 
     <build>

jOOQ-examples/jOOQ-spark-example/pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <org.h2.version>1.4.195</org.h2.version>
     </properties>
 

jOOQ-examples/jOOQ-spring-boot-example/pom.xml

@@ -26,7 +26,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <start-class>org.jooq.example.spring.Application</start-class>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <java.version>1.8</java.version>
     </properties>
 

jOOQ-examples/jOOQ-spring-example/pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>4.2.4.RELEASE</org.springframework.version>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <org.h2.version>1.4.195</org.h2.version>
         <java.version>1.8</java.version>
     </properties>

jOOQ-examples/jOOQ-spring-guice-example/pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>4.2.4.RELEASE</org.springframework.version>
-        <org.jooq.version>3.9.5</org.jooq.version>
+        <org.jooq.version>3.9.6</org.jooq.version>
         <org.h2.version>1.4.195</org.h2.version>
     </properties>
 

jOOQ-meta-extensions/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.9.5</version>
+        <version>3.9.6</version>
     </parent>
 
     <groupId>org.jooq</groupId>

jOOQ-meta/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.9.5</version>
+        <version>3.9.6</version>
     </parent>
 
     <groupId>org.jooq</groupId>

jOOQ-meta/src/main/java/org/jooq/util/xml/XMLDatabase.java

@@ -189,7 +189,9 @@ protected DSLContext create0() {
         }
         catch (Exception ignore) {}
 
-        return DSL.using(dialect);
+        // [#6493] Data types are better discovered from the family, not the dialect. This affects the XMLDatabase,
+        //         for instance. Other databases are currently not affected by the family / dialect distinction
+        return DSL.using(dialect.family());
     }
 
     @Override

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-prefix" value="3.9.5"/>
+    <property name="version-prefix" value="3.9.6"/>
 
     <!-- Run a full mvn clean package install deploy first before this -->
     <target name="copy-lib-javadoc">

jOOQ-release/release/template/RELEASENOTES.txt

@@ -10,6 +10,25 @@ http://www.jooq.org/notes
 For a text version, see
 http://www.jooq.org/inc/RELEASENOTES.txt
 
+Version 3.9.6 - September 27, 2017
+================================================================================
+
+Features and Improvements
+-------------------------
+#6589 - Improve DSLContext.batchStore() Javadoc, indicating that it does not execute MERGE / UPSERT semantics
+
+Bug Fixes
+---------
+#6424 - Compilation error in generated code when both SchemaVersionProvider and CatalogVersionProvider are applied
+#6480 - Typo in DSLContext.fetchCount() and error in DSLContext.fetchExists() Javadoc
+#6507 - XMLDatabase doesn't work when dialect is not a SQLDialect.family()
+#6514 - ClobBinding and BlobBinding don't correctly inline their bind values
+#6538 - NullPointerException in AbstractRecord.intern0()
+#6558 - Error in Record.compareTo(...) Javadoc
+#6572 - Trigger generated errors are not fetched through jOOQ's plain SQL API
+#6596 - "Invalid column index" on Oracle stored procedure call when return type is converted to boolean and argument type is defaulted
+#6600 - Exception thrown when creating table with SQLDataType.UUID in MySQL
+
 Version 3.9.5 - July 28, 2017
 ================================================================================
 

jOOQ-release/release/template/maven-install.bat

@@ -1,5 +1,5 @@
 @echo off
-set VERSION=3.9.5
+set VERSION=3.9.6
 
 if exist jOOQ-javadoc\jooq-%VERSION%-javadoc.jar (
   set JAVADOC_JOOQ=-Djavadoc=jOOQ-javadoc\jooq-%VERSION%-javadoc.jar

jOOQ-release/release/template/maven-install.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=3.9.5
+VERSION=3.9.6
 
 if [ -f jOOQ-javadoc/jooq-$VERSION-javadoc.jar ]; then
   JAVADOC_JOOQ=-Djavadoc=jOOQ-javadoc/jooq-$VERSION-javadoc.jar

jOOQ-scala/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.9.5</version>
+        <version>3.9.6</version>
     </parent>
 
     <groupId>org.jooq</groupId>

jOOQ/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.9.5</version>
+        <version>3.9.6</version>
     </parent>
 
     <groupId>org.jooq</groupId>

jOOQ/src/main/java/org/jooq/Constants.java

@@ -58,15 +58,15 @@ public final class Constants {
      * This is the same as {@link #MINOR_VERSION}, but it may include patch
      * version suffixes.
      */
-    public static final String VERSION        = "3.9.5";
+    public static final String VERSION        = "3.9.6";
 
     /**
      * The latest jOOQ full version.
      * <p>
      * This is the same as {@link #VERSION}, but it may include release
      * candidate and other suffixes.
      */
-    public static final String FULL_VERSION   = "3.9.5";
+    public static final String FULL_VERSION   = "3.9.6";
 
     /**
      * The current jooq-runtime XSD file name.

jOOQ/src/main/java/org/jooq/DSLContext.java

@@ -7040,6 +7040,15 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * This mode may be better for large and complex batch store operations, as
      * the order of records is preserved entirely, and jOOQ can guarantee that
      * only a single batch statement is serialised to the database.
+     * <p>
+     * <h5>A note on MERGE / UPSERT semantics</h5>
+     * <p>
+     * This method (just like {@link UpdatableRecord#store()}) does not
+     * implement the semantics of an actual <code>UPSERT</code> or
+     * <code>MERGE</code> statement, which delegates the decision of whether to
+     * <code>INSERT</code> or <code>UPDATE</code> a record to the database. The
+     * decision is made by the client (jOOQ) depending on whether each
+     * individual record has been fetched from the database prior to storing it.
      *
      * @see UpdatableRecord#store()
      * @see Statement#executeBatch()
@@ -9212,18 +9221,18 @@ <T, R extends Record1<T>> T fetchValue(ResultQuery<R> query)
      * This executes <code><pre>SELECT COUNT(*) FROM table</pre></code>
      *
      * @param table The table whose records to count
-     * @return The number or records in the table
+     * @return The number of records in the table
      * @throws DataAccessException if something went wrong executing the query
      */
     int fetchCount(Table<?> table) throws DataAccessException;
 
     /**
-     * Count the number of records in a table.
+     * Count the number of records in a table that satisfy a condition.
      * <p>
      * This executes <code><pre>SELECT COUNT(*) FROM table WHERE condition</pre></code>
      *
      * @param table The table whose records to count
-     * @return The number or records in the table
+     * @return The number of records in the table that satisfy a condition
      * @throws DataAccessException if something went wrong executing the query
      */
     int fetchCount(Table<?> table, Condition condition) throws DataAccessException;
@@ -9255,7 +9264,7 @@ <T, R extends Record1<T>> T fetchValue(ResultQuery<R> query)
      * This executes <code><pre>SELECT EXISTS(SELECT * FROM table)</pre></code>
      *
      * @param table The table whose records to count
-     * @return The number or records in the table
+     * @return Whether the table contains any records
      * @throws DataAccessException if something went wrong executing the query
      */
     boolean fetchExists(Table<?> table) throws DataAccessException;
@@ -9266,7 +9275,7 @@ <T, R extends Record1<T>> T fetchValue(ResultQuery<R> query)
      * This executes <code><pre>SELECT EXISTS(SELECT * FROM table WHERE condition)</pre></code>
      *
      * @param table The table whose records to count
-     * @return The number or records in the table
+     * @return Whether the table contains any records that satisfy a condition
      * @throws DataAccessException if something went wrong executing the query
      */
     boolean fetchExists(Table<?> table, Condition condition) throws DataAccessException;

jOOQ/src/main/java/org/jooq/Record.java

@@ -1400,7 +1400,7 @@ <T, U> U get(Field<T> field, Converter<? super T, ? extends U> converter) throws
      * <li><code>X = Y</code> means <code>X.compareTo(Y) == 0</code></li>
      * <li><code>X &lt; Y</code> means <code>X.compareTo(Y) &lt; 0</code></li>
      * <li><code>X[i] = Y[i]</code> means
-     * <code>(X[i] == null && Y[i] == null) || X[i].compareTo(Y[i]) &lt; 0</code>
+     * <code>(X[i] == null && Y[i] == null) || X[i].compareTo(Y[i]) == 0</code>
      * </li>
      * <li><code>X[i] &lt; Y[i]</code> means
      * <code>Y[i] == null || X[i].compareTo(Y[i]) &lt; 0</code>. This