pgwire: transmit 24:00 correctly for Time/TimeTZ

pkg/cli/dump.go

@@ -26,6 +26,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
 	"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
 	"github.com/cockroachdb/cockroach/pkg/util/timeofday"
+	"github.com/cockroachdb/cockroach/pkg/util/timetz"
 	"github.com/cockroachdb/cockroach/pkg/util/version"
 	"github.com/cockroachdb/errors"
 	"github.com/spf13/cobra"
@@ -683,9 +684,9 @@ func dumpTableData(w io.Writer, conn *sqlConn, clusterTS string, bmd basicMetada
 						}
 					case types.TimeFamily:
 						// pq awkwardly represents TIME as a time.Time with date 0000-01-01.
-						d = tree.MakeDTime(timeofday.FromTime(t))
+						d = tree.MakeDTime(timeofday.FromTimeAllow2400(t))
 					case types.TimeTZFamily:
-						d = tree.NewDTimeTZFromTime(t)
+						d = tree.NewDTimeTZ(timetz.MakeTimeTZFromTimeAllow2400(t))
 					case types.TimestampFamily:
 						d = tree.MakeDTimestamp(t, time.Nanosecond)
 					case types.TimestampTZFamily:

pkg/sql/copy_in_test.go

@@ -30,6 +30,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/timeofday"
+	"github.com/cockroachdb/cockroach/pkg/util/timetz"
 	"github.com/lib/pq"
 )
 
@@ -250,9 +251,9 @@ func TestCopyRandom(t *testing.T) {
 			case time.Time:
 				var dt tree.NodeFormatter
 				if typs[i].Family() == types.TimeFamily {
-					dt = tree.MakeDTime(timeofday.FromTime(d))
+					dt = tree.MakeDTime(timeofday.FromTimeAllow2400(d))
 				} else if typs[i].Family() == types.TimeTZFamily {
-					dt = tree.NewDTimeTZFromTime(d)
+					dt = tree.NewDTimeTZ(timetz.MakeTimeTZFromTimeAllow2400(d))
 				} else {
 					dt = tree.MakeDTimestamp(d, time.Microsecond)
 				}

pkg/sql/logictest/testdata/logic_test/alter_table

@@ -1058,4 +1058,3 @@ ALTER TABLE t43092 ALTER COLUMN x DROP NOT NULL
 
 statement ok
 DROP TABLE t43092
-

pkg/sql/logictest/testdata/logic_test/timetz

@@ -275,7 +275,7 @@ SELECT '23:59:59.999999-10':::TIMETZ;
 query T
 SELECT '24:00:00':::TIMETZ;
 ----
-0000-01-01 00:00:00 +0000 UTC
+0000-01-02 00:00:00 +0000 UTC
 
 query T
 SELECT TIMETZ '12:00:00-07';

pkg/sql/pgwire/types.go

@@ -499,12 +499,17 @@ const (
 	pgDateFormat              = "2006-01-02"
 	pgTimeStampFormatNoOffset = pgDateFormat + " " + pgTimeFormat
 	pgTimeStampFormat         = pgTimeStampFormatNoOffset + "-07:00"
+	pgTime2400Format          = "24:00:00"
 )
 
 // formatTime formats t into a format lib/pq understands, appending to the
 // provided tmp buffer and reallocating if needed. The function will then return
 // the resulting buffer.
 func formatTime(t timeofday.TimeOfDay, tmp []byte) []byte {
+	// time.Time's AppendFormat does not recognize 2400, so special case it accordingly.
+	if t == timeofday.Time2400 {
+		return []byte(pgTime2400Format)
+	}
 	return t.ToTime().AppendFormat(tmp, pgTimeFormat)
 }
 
@@ -514,7 +519,16 @@ func formatTime(t timeofday.TimeOfDay, tmp []byte) []byte {
 // Note it does not understand the "second" component of the offset as lib/pq
 // cannot parse it.
 func formatTimeTZ(t timetz.TimeTZ, tmp []byte) []byte {
-	return t.ToTime().AppendFormat(tmp, pgTimeTZFormat)
+	ret := t.ToTime().AppendFormat(tmp, pgTimeTZFormat)
+	// time.Time's AppendFormat does not recognize 2400, so special case it accordingly.
+	if t.TimeOfDay == timeofday.Time2400 {
+		// It instead reads 00:00:00. Replace that text.
+		var newRet []byte
+		newRet = append(newRet, pgTime2400Format...)
+		newRet = append(newRet, ret[len(pgTime2400Format):]...)
+		ret = newRet
+	}
+	return ret
 }
 
 func formatTs(t time.Time, offset *time.Location, tmp []byte) (b []byte) {

pkg/sql/sqlbase/testutils.go

@@ -485,11 +485,11 @@ var (
 		types.TimeFamily: {
 			tree.MakeDTime(timeofday.Min),
 			tree.MakeDTime(timeofday.Max),
+			tree.MakeDTime(timeofday.Time2400),
 		},
 		types.TimeTZFamily: {
 			tree.DMinTimeTZ,
-			// Uncomment this once #44548 has been resolved.
-			// tree.DMaxTimeTZ,
+			tree.DMaxTimeTZ,
 		},
 		types.TimestampFamily: func() []tree.Datum {
 			res := make([]tree.Datum, len(randTimestampSpecials))

pkg/util/timeofday/time_of_day.go

@@ -87,6 +87,16 @@ func FromTime(t time.Time) TimeOfDay {
 	return FromInt(nanos / nanosPerMicro)
 }
 
+// FromTimeAllow2400 assumes 24:00 time is possible from the given input,
+// otherwise falling back to FromTime.
+// It assumes time.Time is represented as lib/pq or as unix time.
+func FromTimeAllow2400(t time.Time) TimeOfDay {
+	if t.Day() != 1 {
+		return Time2400
+	}
+	return FromTime(t)
+}
+
 // ToTime converts a TimeOfDay to a time.Time, using the Unix epoch as the date.
 func (t TimeOfDay) ToTime() time.Time {
 	return timeutil.Unix(0, int64(t)*nanosPerMicro)

pkg/util/timetz/timetz.go

@@ -75,6 +75,16 @@ func MakeTimeTZFromTime(t time.Time) TimeTZ {
 	)
 }
 
+// MakeTimeTZFromTimeAllow2400 creates a TimeTZ from a time.Time,
+// but factors in that Time2400 may be possible.
+// This assumes either a lib/pq time or unix time is set.
+func MakeTimeTZFromTimeAllow2400(t time.Time) TimeTZ {
+	if t.Day() != 1 {
+		return MakeTimeTZFromLocation(timeofday.Time2400, t.Location())
+	}
+	return MakeTimeTZFromTime(t)
+}
+
 // Now returns the TimeTZ of the current location.
 func Now() TimeTZ {
 	return MakeTimeTZFromTime(timeutil.Now())