diff options
| author | Stewart Stewart <stewinsalot@gmail.com> | 2016-11-22 12:15:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 12:15:35 -0500 |
| commit | 66a01327a9b68d4756a9c61229027726e2f3d152 (patch) | |
| tree | 55b258071baa3dfa4424a985683ff3a14894adc9 | |
| parent | eea7df07092cebf7f0c4999d7cf926d56e3c6f19 (diff) | |
| parent | 12c860bda0afee241b580c0e04e1fd7c8955a569 (diff) | |
| download | driver-core-66a01327a9b68d4756a9c61229027726e2f3d152.tar.gz driver-core-66a01327a9b68d4756a9c61229027726e2f3d152.tar.bz2 driver-core-66a01327a9b68d4756a9c61229027726e2f3d152.zip | |
Merge pull request #3 from drivergroup/column-type-mappingv0.9.18
More hygienic column type mapping implicits for slick
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | scalastyle-config.xml | 1 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/core/database.scala | 11 |
3 files changed, 8 insertions, 6 deletions
diff --git a/project/plugins.sbt b/project/plugins.sbt index fe44c40..981c484 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases" credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "ANC-d8X-Whm-USS") -addSbtPlugin("xyz.driver" % "sbt-settings" % "0.5.43") +addSbtPlugin("xyz.driver" % "sbt-settings" % "0.5.47") diff --git a/scalastyle-config.xml b/scalastyle-config.xml index bba1e69..811d745 100644 --- a/scalastyle-config.xml +++ b/scalastyle-config.xml @@ -88,6 +88,7 @@ <check level="error" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="true"> <parameters> <parameter name="regex"><![CDATA[^[A-Za-z\\*][A-Za-z0-9]*$]]></parameter> + <parameter name="ignoreRegex">`.*`</parameter> </parameters> </check> <check level="error" class="org.scalastyle.scalariform.ClassTypeParameterChecker" enabled="false"> 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 |