Fix for #128 - UUID stored as binary(16) rather than varchar(40)

This commit is contained in:
Rob Bygrave committed 2014-05-17 21:51:18 +12:00
1 parent 27afb9ee2e
commit 59b86d5b19
6 files changed
+80 -67

No files matched your search

@@ -8,6 +8,7 @@ import java.sql.Types;
import java.util.Calendar;
import java.util.UUID;
import com.avaje.ebeaninternal.server.type.ScalarTypeUUIDBinary;
/**
* Default implementation of TypeConverter.
@@ -192,6 +193,9 @@ public final class BasicTypeConverter implements Serializable {
if (value instanceof String) {
return UUID.fromString((String) value);
}
if (value instanceof byte[]) {
return ScalarTypeUUIDBinary.convertFromBytes((byte[])value);
}
return (UUID) value;
}
@@ -102,7 +102,6 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
private final ScalarType<?> timestampType = new ScalarTypeTimestamp();
private final ScalarType<?> uuidType = new ScalarTypeUUID();
private final ScalarType<?> urlType = new ScalarTypeURL();
private final ScalarType<?> uriType = new ScalarTypeURI();
private final ScalarType<?> localeType = new ScalarTypeLocale();
@@ -140,7 +139,7 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
this.extraTypeFactory = new DefaultTypeFactory(config);
initialiseStandard(clobType, blobType);
initialiseStandard(clobType, blobType, config.isUuidStoreAsBinary());
initialiseJodaTypes();
if (bootupClasses != null) {
@@ -613,7 +612,7 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
* Register all the standard types supported. This is the standard JDBC types
* plus some other common types such as java.util.Date and java.util.Calendar.
*/
protected void initialiseStandard(int platformClobType, int platformBlobType) {
protected void initialiseStandard(int platformClobType, int platformBlobType, boolean binaryUUID) {
ScalarType<?> utilDateType = extraTypeFactory.createUtilDate();
typeMap.put(java.util.Date.class, utilDateType);
@@ -637,13 +636,13 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
// boolean mapping to Types.Integer, Types.VARCHAR or Types.Boolean
}
// ScalarTypeScalaDouble scalaDoubleType = new ScalarTypeScalaDouble();
// typeMap.put(scala.Double.class, scalaDoubleType);
// Store UUID as binary(16) or varchar(40)
ScalarType<?> uuidType = (binaryUUID) ? new ScalarTypeUUIDBinary() : new ScalarTypeUUIDVarchar();
typeMap.put(UUID.class, uuidType);
typeMap.put(Locale.class, localeType);
typeMap.put(Currency.class, currencyType);
typeMap.put(TimeZone.class, timeZoneType);
typeMap.put(UUID.class, uuidType);
typeMap.put(URL.class, urlType);
typeMap.put(URI.class, uriType);
@@ -1,47 +0,0 @@
package com.avaje.ebeaninternal.server.type;
import java.util.UUID;
import com.avaje.ebeaninternal.server.core.BasicTypeConverter;
/**
* ScalarType for java.util.UUID which converts to and from a VARCHAR database column.
*/
public class ScalarTypeUUID extends ScalarTypeBaseVarchar<UUID> {
public ScalarTypeUUID() {
super(UUID.class);
}
@Override
public int getLength() {
return 40;
}
@Override
public UUID convertFromDbString(String dbValue) {
return UUID.fromString(dbValue);
}
@Override
public String convertToDbString(UUID beanValue) {
return formatValue(beanValue);
}
public UUID toBeanType(Object value) {
return BasicTypeConverter.toUUID(value);
}
public Object toJdbcType(Object value) {
return BasicTypeConverter.convert(value, jdbcType);
}
public String formatValue(UUID v) {
return v.toString();
}
public UUID parse(String value) {
return UUID.fromString(value);
}
}
@@ -0,0 +1,47 @@
package com.avaje.ebeaninternal.server.type;
import java.util.UUID;
import com.avaje.ebeaninternal.server.core.BasicTypeConverter;
/**
* ScalarType for java.util.UUID which converts to and from a VARCHAR database column.
*/
public class ScalarTypeUUIDVarchar extends ScalarTypeBaseVarchar<UUID> {
public ScalarTypeUUIDVarchar() {
super(UUID.class);
}
@Override
public int getLength() {
return 40;
}
@Override
public UUID convertFromDbString(String dbValue) {
return UUID.fromString(dbValue);
}
@Override
public String convertToDbString(UUID beanValue) {
return formatValue(beanValue);
}
public UUID toBeanType(Object value) {
return BasicTypeConverter.toUUID(value);
}
public Object toJdbcType(Object value) {
return BasicTypeConverter.convert(value, jdbcType);
}
public String formatValue(UUID v) {
return v.toString();
}
public UUID parse(String value) {
return UUID.fromString(value);
}
}