Fix only panic, leave other bug for now

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
vitessio · Jan 20, 2025 · 1d32f2f · 1d32f2f
1 parent d65ccb3
commit 1d32f2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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",
 		},
 		{