From 0d4a45707fd4554722496f3370abe6f0f11eefcb Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Wed, 7 Dec 2016 07:18:06 -0800 Subject: make column mapper names more consistent --- src/main/scala/xyz/driver/core/database.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/scala/xyz/driver/core/database.scala b/src/main/scala/xyz/driver/core/database.scala index 91c2305..d337b8b 100644 --- a/src/main/scala/xyz/driver/core/database.scala +++ b/src/main/scala/xyz/driver/core/database.scala @@ -38,7 +38,7 @@ object database { val profile: JdbcProfile import profile.api._ - implicit def `xyz.driver.core.Id.columnType`[T]: BaseColumnType[Id[T]] = + implicit def `xyz.driver.core.Id.columnTypeFromLong`[T]: BaseColumnType[Id[T]] = MappedColumnType.base[Id[T], Long](_.value.toLong, serialId => Id[T](serialId.toString)) implicit def `xyz.driver.core.Name.columnType`[T]: BaseColumnType[Name[T]] = @@ -47,7 +47,7 @@ object database { implicit def `xyz.driver.core.time.Time.columnType`: BaseColumnType[Time] = MappedColumnType.base[Time, Long](_.millis, Time(_)) - implicit def `java.util.UUID.columnType`[T]: BaseColumnType[Id[T]] = + implicit def `xyz.driver.core.Id.columnTypeFromUUID`[T]: BaseColumnType[Id[T]] = MappedColumnType.base[Id[T], UUID](id => UUID.fromString(id.value), uuid => Id[T](uuid.toString)) } -- cgit v1.2.3