From c5c720f71c893d9fc18aaf72307d72e30cfceb8a Mon Sep 17 00:00:00 2001 From: Minglei Tu Date: Fri, 20 Oct 2017 08:45:40 +0800 Subject: [PATCH] Fix naming conflicts with PgDateSupportJoda and PgDate2Support classes --- .../com/github/tminglei/slickpg/PgDateSupportJoda.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/joda-time/src/main/scala/com/github/tminglei/slickpg/PgDateSupportJoda.scala b/addons/joda-time/src/main/scala/com/github/tminglei/slickpg/PgDateSupportJoda.scala index 687c8f46..cd1ee3c6 100644 --- a/addons/joda-time/src/main/scala/com/github/tminglei/slickpg/PgDateSupportJoda.scala +++ b/addons/joda-time/src/main/scala/com/github/tminglei/slickpg/PgDateSupportJoda.scala @@ -52,7 +52,7 @@ trait PgDateSupportJoda extends date.PgDateExtensions with utils.PgCommonJdbcTyp fnFromString = (s) => DateTime.parse(s, tzDateTimeFormatter(s)), fnToString = (v) => v.toString(jodaTzDateTimeFormatter), hasLiteralForm = false) - implicit val date2InstantTypeMapper: JdbcType[Instant] = new GenericJdbcType[Instant]("timestamptz", + implicit val jodaInstantTypeMapper: JdbcType[Instant] = new GenericJdbcType[Instant]("timestamptz", fnFromString = (s) => Instant.parse(s, tzDateTimeFormatter(s)), fnToString = (v) => v.toString(jodaTzDateTimeFormatter), hasLiteralForm = false) @@ -83,9 +83,9 @@ trait PgDateSupportJoda extends date.PgDateExtensions with utils.PgCommonJdbcTyp implicit def jodaTzTimestampOptColumnExtensionMethods(c: Rep[Option[DateTime]]) = new TimestampColumnExtensionMethods[LocalDate, LocalTime, DateTime, LocalDateTime, Period, Option[DateTime]](c) - implicit def date2Timestamp1ColumnExtensionMethods(c: Rep[Instant]) = + implicit def jodaTimestamp1ColumnExtensionMethods(c: Rep[Instant]) = new TimestampColumnExtensionMethods[LocalDate, LocalTime, Instant, LocalDateTime, Period, Instant](c) - implicit def date2Timestamp1OptColumnExtensionMethods(c: Rep[Option[Instant]]) = + implicit def jodaTimestamp1OptColumnExtensionMethods(c: Rep[Option[Instant]]) = new TimestampColumnExtensionMethods[LocalDate, LocalTime, Instant, LocalDateTime, Period, Option[Instant]](c) } @@ -107,7 +107,7 @@ trait PgDateSupportJoda extends date.PgDateExtensions with utils.PgCommonJdbcTyp // driver.asInstanceOf[ExPostgresDriver].bindPgTypeToScala("interval", classTag[Period]) } - implicit class PgDate2TimePositionedResult(r: PositionedResult) { + implicit class PgJodaTimePositionedResult(r: PositionedResult) { def nextLocalDate() = nextLocalDateOption().orNull def nextLocalDateOption() = r.nextStringOption().map(LocalDate.parse(_, jodaDateFormatter)) def nextLocalTime() = nextLocalTimeOption().orNull