From 2ca698a3f4b6ff2d63030e5cdd5f9960e9ac9949 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Fri, 28 Jul 2017 17:00:52 +0200 Subject: [PATCH] [#6466] Regression after refactoring --- .../java/org/jooq/impl/DefaultDataType.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java index 9ab64ccbf0..5250804144 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java @@ -763,19 +763,17 @@ public class DefaultDataType implements DataType { result = TYPES_BY_NAME[SQLDialect.DEFAULT.ordinal()].get(normalised); // [#4065] PostgreSQL reports array types as _typename, e.g. _varchar - if (result == null && dialect.family() == SQLDialect.POSTGRES && normalised.charAt(0) == '_') { + if (result == null && dialect.family() == SQLDialect.POSTGRES && normalised.charAt(0) == '_') result = getDataType(dialect, normalised.substring(1)).getArrayDataType(); - // [#6466] HSQLDB reports array types as XYZARRAY - if (result == null && dialect.family() == SQLDialect.HSQLDB && upper.endsWith(" ARRAY")) { - result = getDataType(dialect, typeName.substring(0, typeName.length() - 6)).getArrayDataType(); + // [#6466] HSQLDB reports array types as XYZARRAY + if (result == null && dialect.family() == SQLDialect.HSQLDB && upper.endsWith(" ARRAY")) + result = getDataType(dialect, typeName.substring(0, typeName.length() - 6)).getArrayDataType(); - // [#366] Don't log a warning here. The warning is logged when - // catching the exception in jOOQ-codegen - if (result == null) - throw new SQLDialectNotSupportedException("Type " + typeName + " is not supported in dialect " + dialect, false); - } - } + // [#366] Don't log a warning here. The warning is logged when + // catching the exception in jOOQ-codegen + if (result == null) + throw new SQLDialectNotSupportedException("Type " + typeName + " is not supported in dialect " + dialect, false); } }