From 1d32f2f80d45b9c60a3e6e2f6d3c73f96134925c Mon Sep 17 00:00:00 2001 From: Dirkjan Bussink Date: Mon, 20 Jan 2025 11:28:44 +0100 Subject: [PATCH] Fix only panic, leave other bug for now Signed-off-by: Dirkjan Bussink --- go/vt/vtgate/safe_session.go | 8 +------- go/vt/vtgate/safe_session_test.go | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/go/vt/vtgate/safe_session.go b/go/vt/vtgate/safe_session.go index 9828d0a77d4..54aa3f752de 100644 --- a/go/vt/vtgate/safe_session.go +++ b/go/vt/vtgate/safe_session.go @@ -26,7 +26,6 @@ import ( "google.golang.org/protobuf/proto" "vitess.io/vitess/go/mysql/datetime" - "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/srvtopo" "vitess.io/vitess/go/vt/sysvars" @@ -563,18 +562,13 @@ func (session *SafeSession) HasSystemVariables() (found bool) { func (session *SafeSession) TimeZone() *time.Location { session.mu.Lock() - zoneSQL, ok := session.SystemVariables["time_zone"] + tz, ok := session.SystemVariables["time_zone"] session.mu.Unlock() if !ok { return time.Local } - tz, err := sqltypes.DecodeStringSQL(zoneSQL) - if err != nil { - return time.Local - } - loc, err := datetime.ParseTimeZone(tz) if err != nil { return time.Local diff --git a/go/vt/vtgate/safe_session_test.go b/go/vt/vtgate/safe_session_test.go index f3a78d7f497..199b9239bf2 100644 --- a/go/vt/vtgate/safe_session_test.go +++ b/go/vt/vtgate/safe_session_test.go @@ -77,11 +77,11 @@ func TestTimeZone(t *testing.T) { want: time.Local.String(), }, { - tz: "'Europe/Amsterdam'", + tz: "Europe/Amsterdam", want: "Europe/Amsterdam", }, { - tz: "'+02:00'", + tz: "+02:00", want: "UTC+02:00", }, {