#906 JDBC 4.5 compat: use type code 2016 for DECFLOAT

Author: mrotteveel

src/docs/asciidoc/release_notes.adoc

@@ -37,7 +37,10 @@ For known issues, consult <<known-issues>>.
 
 The following was fixed or changed since Jaybird 6.0.4:
 
-* ...
+* JDBC 4.5 support: `JaybirdTypeCodes.DECFLOAT` and `JaybirdType.DECFLOAT` now use value `2015` instead of `-6001` (https://github.com/FirebirdSQL/jaybird/issues/906[#906])
++
+Applications referencing this constant may need to be recompiled to function correctly with Jaybird 6.0.5 and higher.
+If you use Java 26 or higher, we recommend using `java.sql.Type.DECFLOAT` and `java.sql.JDBCType.DECFLOAT` instead.
 
 === Jaybird 6.0.4
 
@@ -289,6 +292,10 @@ Jaybird supports the following specifications:
 [discrete#jdbc45-compat]
 ==== Incompatibilities with upcoming JDBC 4.5 Specification
 
+// TODO Revise/rename with state for Jaybird 6.0.5 once https://github.com/FirebirdSQL/jaybird/issues/907 is complete
+
+This section applies to Jaybird 6.0.4 and earlier.
+
 Java 26 (expected in March 2026) will introduce https://jcp.org/aboutJava/communityprocess/maintenance/jsr221/index5.html[JDBC 4.5^] (link to draft).
 Jaybird is not yet compatible with some of the specified changes.
 
@@ -298,6 +305,8 @@ Specifically affected are:
 +
 At this time, Jaybird still uses its own constants in `JaybirdType.DECFLOAT` and `JaybirdTypeCodes.DECFLOAT` with value `-6001`.
 This value will be changed to match the JDBC specified value, and the constants deprecated, in a future maintenance release of Jaybird.
++
+Addressed in Jaybird 6.0.5.
 * Introduction of new methods on `java.sql.Connection` -- `enquoteIdentifier`, `enquoteLiteral`, `enquoteNCharLiteral`, and `isSimpleIdentifier`
 +
 The default implementation provided is not sufficient for Firebird, especially not when connecting to a dialect 1 database.

src/main/org/firebirdsql/jdbc/JaybirdType.java

@@ -30,7 +30,14 @@
 @Volatile(reason = "Defined types may receive a different type number when standardized in JDBC")
 public enum JaybirdType implements SQLType {
 
-    @Volatile(reason = "To be standardized by future version of JDBC, will be deprecated")
+    /**
+     * Type for {@code DECFLOAT}.
+     * <p>
+     * When using Java 26 or higher, use {@code java.sql.JDBCType.DECFLOAT}. This constant might be deprecated and
+     * removed once Jaybird only supports versions after Java 26.
+     * </p>
+     */
+    @Volatile(reason = "Prefer java.sql.JDBCType.DECFLOAT when using Java 26 or higher")
     DECFLOAT(JaybirdTypeCodes.DECFLOAT);
 
     private final Integer type;

src/main/org/firebirdsql/jdbc/JaybirdTypeCodes.java

@@ -35,10 +35,15 @@
 @Volatile(reason = "Defined type codes may receive a different value when standardized in JDBC")
 public final class JaybirdTypeCodes {
 
-    // TODO Remove when standardized in JDBC
-
-    @Volatile(reason = "To be standardized by future version of JDBC, type code may change")
-    public static final int DECFLOAT = -6001;
+    /**
+     * Type code for {@code DECFLOAT}.
+     * <p>
+     * When using Java 26 or higher, use {@code java.sql.Types.DECFLOAT}. This constant might be deprecated and
+     * removed once Jaybird only supports versions after Java 26.
+     * </p>
+     */
+    @Volatile(reason = "Type code changed in 5.0.12/6.0.5/7.0.0 to match JDBC 4.5 value; prefer java.sql.Types.DECFLOAT when using Java 26 or higher")
+    public static final int DECFLOAT = 2015;
 
     private JaybirdTypeCodes() {
         // no instances