Cherry-pick 5468f5d with conflicts

go/vt/vtgate/engine/fake_vcursor_test.go

@@ -140,7 +140,7 @@ func (t *noopVCursor) Environment() *vtenv.Environment {
 }
 
 func (t *noopVCursor) TimeZone() *time.Location {
-	return nil
+	return time.Local
 }
 
 func (t *noopVCursor) SQLMode() string {

go/vt/vtgate/evalengine/fn_time.go

@@ -232,7 +232,7 @@ func (call *builtinNow) constant() bool {
 
 func (call *builtinSysdate) eval(env *ExpressionEnv) (eval, error) {
 	now := SystemTime()
-	if tz := env.currentTimezone(); tz != nil {
+	if tz := env.currentTimezone(); tz != time.Local {
 		now = now.In(tz)
 	}
 	return newEvalDateTime(datetime.NewDateTimeFromStd(now), int(call.prec), false), nil
@@ -673,7 +673,7 @@ func (b *builtinFromUnixtime) eval(env *ExpressionEnv) (eval, error) {
 	}
 
 	t := time.Unix(sec, frac)
-	if tz := env.currentTimezone(); tz != nil {
+	if tz := env.currentTimezone(); tz != time.Local {
 		t = t.In(tz)
 	}
 

go/vt/vtgate/executorcontext/safe_session_test.go

@@ -0,0 +1,207 @@
+/*
+Copyright 2020 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package executorcontext
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	querypb "vitess.io/vitess/go/vt/proto/query"
+	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
+	vtgatepb "vitess.io/vitess/go/vt/proto/vtgate"
+)
+
+type fakeInfo struct {
+	transactionID int64
+	alias         *topodatapb.TabletAlias
+}
+
+func (s *fakeInfo) TransactionID() int64 {
+	return s.transactionID
+}
+
+func (s *fakeInfo) ReservedID() int64 {
+	return 0
+}
+
+func (s *fakeInfo) RowsAffected() bool {
+	return false
+}
+
+func (s *fakeInfo) Alias() *topodatapb.TabletAlias {
+	return s.alias
+}
+
+func info(txId, uid int) ShardActionInfo {
+	return &fakeInfo{transactionID: int64(txId), alias: &topodatapb.TabletAlias{Cell: "cell", Uid: uint32(uid)}}
+}
+
+// TestFailToMultiShardWhenSetToSingleDb tests that single db transactions fails on going multi shard.
+func TestFailToMultiShardWhenSetToSingleDb(t *testing.T) {
+	session := NewSafeSession(&vtgatepb.Session{
+		InTransaction: true, TransactionMode: vtgatepb.TransactionMode_SINGLE,
+	})
+
+	err := session.AppendOrUpdate(
+		&querypb.Target{Keyspace: "keyspace", Shard: "0"},
+		info(1, 0),
+		nil,
+		vtgatepb.TransactionMode_SINGLE)
+	require.NoError(t, err)
+	err = session.AppendOrUpdate(
+		&querypb.Target{Keyspace: "keyspace", Shard: "1"},
+		info(1, 1),
+		nil,
+		vtgatepb.TransactionMode_SINGLE)
+	require.Error(t, err)
+}
+
+// TestSingleDbUpdateToMultiShard tests that a single db transaction cannot be updated to multi shard.
+func TestSingleDbUpdateToMultiShard(t *testing.T) {
+	session := NewSafeSession(&vtgatepb.Session{
+		InTransaction: true, TransactionMode: vtgatepb.TransactionMode_SINGLE,
+	})
+
+	// shard session s0 due to a vindex query
+	session.queryFromVindex = true
+	err := session.AppendOrUpdate(
+		&querypb.Target{Keyspace: "keyspace", Shard: "0"},
+		info(1, 0),
+		nil,
+		vtgatepb.TransactionMode_SINGLE)
+	require.NoError(t, err)
+	session.queryFromVindex = false
+
+	// shard session s1
+	err = session.AppendOrUpdate(
+		&querypb.Target{Keyspace: "keyspace", Shard: "1"},
+		info(1, 1),
+		nil,
+		vtgatepb.TransactionMode_SINGLE)
+	require.NoError(t, err)
+
+	// shard session s0 with normal query
+	err = session.AppendOrUpdate(
+		&querypb.Target{Keyspace: "keyspace", Shard: "0"},
+		info(1, 1),
+		session.ShardSessions[0],
+		vtgatepb.TransactionMode_SINGLE)
+	require.Error(t, err)
+}
+
+// TestSingleDbPreFailOnFind tests that finding a shard session fails
+// if already shard session exists on another shard and the query is not from vindex.
+func TestSingleDbPreFailOnFind(t *testing.T) {
+	session := NewSafeSession(&vtgatepb.Session{
+		InTransaction: true, TransactionMode: vtgatepb.TransactionMode_SINGLE,
+	})
+
+	// shard session s0 due to a vindex query
+	session.queryFromVindex = true
+	err := session.AppendOrUpdate(
+		&querypb.Target{Keyspace: "keyspace", Shard: "0"},
+		info(1, 0),
+		nil,
+		vtgatepb.TransactionMode_SINGLE)
+	require.NoError(t, err)
+	session.queryFromVindex = false
+
+	// shard session s1
+	err = session.AppendOrUpdate(
+		&querypb.Target{Keyspace: "keyspace", Shard: "1"},
+		info(1, 1),
+		nil,
+		vtgatepb.TransactionMode_SINGLE)
+	require.NoError(t, err)
+
+	// shard session s1 for normal query again - should not fail as already part of the session.
+	ss, err := session.FindAndChangeSessionIfInSingleTxMode(
+		"keyspace",
+		"1",
+		topodatapb.TabletType_UNKNOWN,
+		vtgatepb.TransactionMode_SINGLE)
+	require.NoError(t, err)
+	require.NotNil(t, ss)
+	require.False(t, ss.VindexOnly)
+	require.EqualValues(t, 1, ss.TabletAlias.Uid)
+
+	// shard session s0 for normal query
+	_, err = session.FindAndChangeSessionIfInSingleTxMode(
+		"keyspace",
+		"0",
+		topodatapb.TabletType_UNKNOWN,
+		vtgatepb.TransactionMode_SINGLE)
+	require.Error(t, err)
+}
+
+func TestPrequeries(t *testing.T) {
+	session := NewSafeSession(&vtgatepb.Session{
+		SystemVariables: map[string]string{
+			"s1": "'apa'",
+			"s2": "42",
+		},
+	})
+
+	want := []string{"set s1 = 'apa', s2 = 42"}
+	preQueries := session.SetPreQueries()
+
+	if !reflect.DeepEqual(want, preQueries) {
+		t.Errorf("got %v but wanted %v", preQueries, want)
+	}
+}
+
+func TestTimeZone(t *testing.T) {
+	testCases := []struct {
+		tz   string
+		want string
+	}{
+		{
+			tz:   "",
+			want: time.Local.String(),
+		},
+		{
+			tz:   "'Europe/Amsterdam'",
+			want: "Europe/Amsterdam",
+		},
+		{
+			tz:   "'+02:00'",
+			want: "UTC+02:00",
+		},
+		{
+			tz:   "foo",
+			want: time.Local.String(),
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.tz, func(t *testing.T) {
+			sysvars := map[string]string{}
+			if tc.tz != "" {
+				sysvars["time_zone"] = tc.tz
+			}
+			session := NewSafeSession(&vtgatepb.Session{
+				SystemVariables: sysvars,
+			})
+
+			assert.Equal(t, tc.want, session.TimeZone().String())
+		})
+	}
+}

go/vt/vtgate/safe_session.go

@@ -567,9 +567,22 @@ func (session *SafeSession) TimeZone() *time.Location {
 	session.mu.Unlock()
 
 	if !ok {
-		return nil
+		return time.Local
 	}
+<<<<<<< HEAD:go/vt/vtgate/safe_session.go
 	loc, _ := datetime.ParseTimeZone(tz)
+=======
+
+	tz, err := sqltypes.DecodeStringSQL(zoneSQL)
+	if err != nil {
+		return time.Local
+	}
+
+	loc, err := datetime.ParseTimeZone(tz)
+	if err != nil {
+		return time.Local
+	}
+>>>>>>> 5468f5db7d (Always return a valid timezone in cursor (#17546)):go/vt/vtgate/executorcontext/safe_session.go
 	return loc
 }