github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#7504] [#7505] DefaultDataType.getDataType(SQLDialect) should use family

Browse Source 
- [#7504] DefaultDataType.getDataType(SQLDialect) should use family
- [#7505] JDBCDatabase doesn't recognise vendor-specific data types
This commit is contained in:
lukaseder 2018-05-24 14:16:45 +02:00
parent 4a18ba32f1
commit 1ae9313b65
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
View File

@ -783,7 +783,8 @@ public class DefaultDataType<T> implements DataType<T> {
}
public static final DataType<?> getDataType(SQLDialect dialect, String typeName) {
int ordinal = dialect.ordinal();
SQLDialect family = dialect.family();
int ordinal = family.ordinal();
String upper = typeName.toUpperCase();
String normalised = typeName;
DataType<?> result = TYPES_BY_NAME[ordinal].get(upper);
@ -797,11 +798,11 @@ public class DefaultDataType<T> implements DataType<T> {
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 && 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"))
if (result == null && 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