Merge pull request #12566 from jordanlewis/fix-second-interval-precision

sql: fix parsing of second-precise intervals
cockroachdb · Dec 24, 2016 · 0efe656 · 0efe656
2 parents fd729f0 + 1bc5527
commit 0efe656
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/pkg/sql/parser/sql.go b/pkg/sql/parser/sql.go
diff --git a/pkg/sql/parser/sql.y b/pkg/sql/parser/sql.y
@@ -3466,7 +3466,7 @@ opt_interval:
   }
 | interval_second
   {
-    $$.val = $1
+    $$.val = $1.durationField()
   }
 // Like Postgres, we ignore the left duration field. See explanation:
 // https://www.postgresql.org/message-id/20110510040219.GD5617%40tornado.gateway.2wire.net
@@ -3484,19 +3484,19 @@ opt_interval:
   }
 | DAY TO interval_second
   {
-    $$.val = $3
+    $$.val = $3.durationField()
   }
 | HOUR TO MINUTE
   {
     $$.val = minute
   }
 | HOUR TO interval_second
   {
-    $$.val = $3
+    $$.val = $3.durationField()
   }
 | MINUTE TO interval_second
   {
-    $$.val = $3
+    $$.val = $3.durationField()
   }
 | /* EMPTY */ {}
 

diff --git a/pkg/sql/testdata/datetime b/pkg/sql/testdata/datetime
@@ -686,6 +686,22 @@ SHOW TIME ZONE
 ----
 -5
 
+statement ok
+SET TIME ZONE INTERVAL '+04:00' HOUR TO MINUTE;
+
+query T
+SELECT '2015-08-24 21:45:45.53453'::timestamptz
+----
+2015-08-24 21:45:45.53453 +0400 +0400
+
+statement ok
+SET TIME ZONE INTERVAL '-04:00' MINUTE TO SECOND;
+
+query T
+SELECT '2015-08-24 21:45:45.53453'::timestamptz
+----
+2015-08-24 21:45:45.53453 -0400 -0400
+
 statement ok
 SET TIME ZONE 0