From 5b1a91290035cb71dde82d10f1f6ee173d24273b Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Mon, 12 Dec 2016 17:31:30 -0800 Subject: simplify key mapper trait names --- src/main/scala/xyz/driver/core/database.scala | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/scala/xyz') diff --git a/src/main/scala/xyz/driver/core/database.scala b/src/main/scala/xyz/driver/core/database.scala index 80348d8..a82e345 100644 --- a/src/main/scala/xyz/driver/core/database.scala +++ b/src/main/scala/xyz/driver/core/database.scala @@ -46,23 +46,23 @@ object database { } object ColumnTypes { - trait UUIDPrimaryKey extends ColumnTypes { - import java.util.UUID + trait UUID extends ColumnTypes { import profile.api._ - override implicit def `xyz.driver.core.Id.columnType`[T]: BaseColumnType[Id[T]] = - MappedColumnType.base[Id[T], UUID](id => UUID.fromString(id.value), uuid => Id[T](uuid.toString)) + override implicit def `xyz.driver.core.Id.columnType`[T] = + MappedColumnType + .base[Id[T], java.util.UUID](id => java.util.UUID.fromString(id.value), uuid => Id[T](uuid.toString)) } - trait SerialIdPrimaryKey extends ColumnTypes { + trait SerialId extends ColumnTypes { import profile.api._ - override implicit def `xyz.driver.core.Id.columnType`[T]: BaseColumnType[Id[T]] = + override implicit def `xyz.driver.core.Id.columnType`[T] = MappedColumnType.base[Id[T], Long](_.value.toLong, serialId => Id[T](serialId.toString)) } - trait NaturalPrimaryKey extends ColumnTypes { + trait NaturalId extends ColumnTypes { import profile.api._ - override implicit def `xyz.driver.core.Id.columnType`[T]: BaseColumnType[Id[T]] = + override implicit def `xyz.driver.core.Id.columnType`[T] = MappedColumnType.base[Id[T], String](_.value, Id[T](_)) } } -- cgit v1.2.3