From 61dca9fb03dd6e0d4f131f35c031a0aca4156899 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 16 Jul 2014 11:31:19 +0200 Subject: [PATCH] [#3402] Wrong character length generated by jOOQ for Firebird --- .../jooq/util/firebird/FirebirdTableDefinition.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdTableDefinition.java index c8c9cbf9bc..dc50ac622d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdTableDefinition.java @@ -87,8 +87,8 @@ public class FirebirdTableDefinition extends AbstractTableDefinition { // [#3342] FIELD_LENGTH should be ignored for LOBs decode().value(f.RDB$FIELD_TYPE) .when((short) 261, (short) 0) - .otherwise(f.RDB$FIELD_LENGTH) - .as("FIELD_LENGTH"), + .otherwise(f.RDB$CHARACTER_LENGTH) + .as("CHARACTER_LENGTH"), f.RDB$FIELD_PRECISION, f.RDB$FIELD_SCALE.neg().as("FIELD_SCALE"), @@ -129,8 +129,8 @@ public class FirebirdTableDefinition extends AbstractTableDefinition { .otherwise("UNKNOWN").as("FIELD_TYPE"), f.RDB$FIELD_SUB_TYPE) .from(r) - .leftOuterJoin(f).on(r.RDB$FIELD_SOURCE.equal(f.RDB$FIELD_NAME)) - .where(r.RDB$RELATION_NAME.equal(getName())) + .leftOuterJoin(f).on(r.RDB$FIELD_SOURCE.eq(f.RDB$FIELD_NAME)) + .where(r.RDB$RELATION_NAME.eq(getName())) .orderBy(r.RDB$FIELD_POSITION) .fetch()) { @@ -138,7 +138,7 @@ public class FirebirdTableDefinition extends AbstractTableDefinition { getDatabase(), getSchema(), record.getValue("FIELD_TYPE", String.class), - record.getValue("FIELD_LENGTH", short.class), + record.getValue("CHARACTER_LENGTH", short.class), record.getValue(f.RDB$FIELD_PRECISION), record.getValue("FIELD_SCALE", Integer.class), record.getValue(r.RDB$NULL_FLAG) == 0,