Add support for simple negative HMS intervals

dylex · dylex · commit 71514d5b389f · 2013-11-01T23:31:42.000-04:00
diff --git a/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/column/PostgreSQLIntervalEncoderDecoder.scala b/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/column/PostgreSQLIntervalEncoderDecoder.scala
@@ -54,12 +54,12 @@ object PostgreSQLIntervalEncoderDecoder extends ColumnEncoderDecoder {
   private def postgresHMSBuilder(builder : PeriodFormatterBuilder) = builder
     // .printZeroAlways // really all-or-nothing
     .rejectSignedValues(true) // XXX: sign should apply to all
-    .appendHours  .appendSeparator(":")
-    .appendMinutes.appendSeparator(":")
+    .appendHours  .appendSuffix(":")
+    .appendMinutes.appendSuffix(":")
     .appendSecondsWithOptionalMillis
 
-  private val secsParser = new PeriodFormatterBuilder()
-    .appendSecondsWithOptionalMillis
+  private val hmsParser =
+    postgresHMSBuilder(new PeriodFormatterBuilder())
     .toFormatter
 
   private val postgresParser = 
@@ -100,8 +100,8 @@ object PostgreSQLIntervalEncoderDecoder extends ColumnEncoderDecoder {
         else {
           /* try to guess based on what comes after the first number */
           val i = value.indexWhere(!_.isDigit, if ("-+".contains(value(0))) 1 else 0)
-          if (i <= 0 || value(i).equals('.')) /* just a number */
-            secsParser /* postgres treats this as seconds */
+          if (i < 0 || ":.".contains(value(i))) /* simple HMS (to support group negation) */
+            hmsParser
           else if (value(i).equals('-')) /* sql_standard: Y-M */
             sqlParser
           else if (value(i).equals(' ') && i+1 < value.length && value(i+1).isDigit) /* sql_standard: D H:M:S */
@@ -110,7 +110,9 @@ object PostgreSQLIntervalEncoderDecoder extends ColumnEncoderDecoder {
             postgresParser
         }
       )
-      if (value.endsWith(" ago")) /* only really applies to postgres_verbose, but shouldn't hurt */
+      if ((format eq hmsParser) && value(0).equals('-'))
+        format.parsePeriod(value.substring(1)).negated
+      else if (value.endsWith(" ago")) /* only really applies to postgres_verbose, but shouldn't hurt */
         format.parsePeriod(value.stripSuffix(" ago")).negated
       else
         format.parsePeriod(value)
diff --git a/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/column/IntervalSpec.scala b/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/column/IntervalSpec.scala
@@ -40,6 +40,8 @@ class IntervalSpec extends Specification {
       Seq("@ 1 year 2 mons -3 days 4 hours 5 mins 6 secs ago", "P-1Y-2M3DT-4H-5M-6S") forall {
         both(_) === "P-1Y-2M3DT-4H-5M-6S"
       }
+      both("-1.234") === "PT-1.234S"
+      both("-4:05:06") === "PT-4H-5M-6S"
     }
 
     "parse and encode example intervals" in {

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ class IntervalSpec extends Specification {`
`40`	`40`	`Seq("@ 1 year 2 mons -3 days 4 hours 5 mins 6 secs ago", "P-1Y-2M3DT-4H-5M-6S") forall {`
`41`	`41`	`both(_) === "P-1Y-2M3DT-4H-5M-6S"`
`42`	`42`	`}`
	`43`	`+ both("-1.234") === "PT-1.234S"`
	`44`	`+ both("-4:05:06") === "PT-4H-5M-6S"`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`"parse and encode example intervals" in {`