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

[#858] SQLDataType.getSQLDataType() should return itself, instead of null

Browse Source
This commit is contained in:
Lukas Eder 2011-10-09 10:27:07 +00:00
parent df864a92c9
commit 746a4ff863
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
View File

@ -115,15 +115,22 @@ public abstract class AbstractDataType<T> implements DataType<T> {
this(dialect, sqldatatype, type, typeName, typeName, hasPrecisionAndScale);
}
protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqldatatype, Class<? extends T> type, String typeName, String castTypeName, boolean hasPrecisionAndScale) {
protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqlDataType, Class<? extends T> type, String typeName, String castTypeName, boolean hasPrecisionAndScale) {
this.dialect = dialect;
this.sqlDataType = sqldatatype;
// [#858] SQLDataTypes should reference themselves for more convenience
this.sqlDataType = (SQLDataType<T>) ((this instanceof SQLDataType) ? this : sqlDataType);
this.type = type;
this.typeName = typeName;
this.castTypeName = castTypeName;
this.hasPrecisionAndScale = hasPrecisionAndScale;
this.arrayType = (Class<? extends T[]>) Array.newInstance(type, 0).getClass();
init();
}
private final void init() {
// Dialect-specific data types
if (dialect != null) {
if (typesByTypeName[dialect.ordinal()].get(FieldTypeHelper.normalise(typeName)) == null) {
@ -134,8 +141,8 @@ public abstract class AbstractDataType<T> implements DataType<T> {
typesByType[dialect.ordinal()].put(type, this);
}
if (typesBySQLDataType[dialect.ordinal()].get(sqldatatype) == null) {
typesBySQLDataType[dialect.ordinal()].put(sqldatatype, this);
if (typesBySQLDataType[dialect.ordinal()].get(sqlDataType) == null) {
typesBySQLDataType[dialect.ordinal()].put(sqlDataType, this);
}
}