Merge pull request #3 from drivergroup/column-type-mappingv0.9.18

More hygienic column type mapping implicits for slick

1 files changed, 6 insertions, 5 deletions

diff --git a/src/main/scala/xyz/driver/core/database.scala b/src/main/scala/xyz/driver/core/database.scala
index 85a8cc4..4af81f3 100644
--- a/src/main/scala/xyz/driver/core/database.scala
+++ b/src/main/scala/xyz/driver/core/database.scala
@@ -31,21 +31,22 @@ object database {
     def drop: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema]
   }
 
-  trait IdColumnTypes {
+  trait ColumnTypes {
     val database: Database
 
     import database.profile.api._
 
-    implicit def idColumnType[T] =
+    implicit def `xyz.driver.core.Id.columnType`[T] =
       MappedColumnType.base[Id[T], Long](id => id: Long, Id[T](_))
 
-    implicit def nameColumnType[T] =
+    implicit def `xyz.driver.core.Name.columnType`[T] =
       MappedColumnType.base[Name[T], String](name => name: String, Name[T](_))
 
-    implicit val timeColumnType = MappedColumnType.base[Time, Long](time => time.millis, Time(_))
+    implicit def `xyz.driver.core.time.Time.columnType` =
+      MappedColumnType.base[Time, Long](time => time.millis, Time(_))
   }
 
-  trait DatabaseObject extends IdColumnTypes {
+  trait DatabaseObject extends ColumnTypes {
 
 //    implicit val exec: ExecutionContext