Fix conflicts

Signed-off-by: Rohit Nayak <[email protected]>

go/mysql/json/marshal.go

@@ -173,14 +173,7 @@ func MarshalSQLValue(buf []byte) (*sqltypes.Value, error) {
 	if err != nil {
 		return nil, err
 	}
-<<<<<<< HEAD
-	newVal := sqltypes.MakeTrusted(querypb.Type_JSON, jsonVal.MarshalSQLTo(nil))
-	if err != nil {
-		return nil, err
-	}
-=======
 
 	newVal := sqltypes.MakeTrusted(querypb.Type_RAW, jsonVal.MarshalSQLTo(nil))
->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637))
 	return &newVal, nil
 }

go/test/endtoend/vtgate/queries/dml/insert_test.go

@@ -470,29 +470,6 @@ func TestMixedCases(t *testing.T) {
 	// final check count on the lookup vindex table.
 	utils.AssertMatches(t, mcmp.VtConn, "select count(*) from lkp_mixed_idx", "[[INT64(12)]]")
 }
-<<<<<<< HEAD
-=======
-
-// TestInsertAlias test the alias feature in insert statement.
-func TestInsertAlias(t *testing.T) {
-	mcmp, closer := start(t)
-	defer closer()
-
-	// initial record
-	mcmp.Exec("insert into user_tbl(id, region_id, name) values (1, 1,'foo'),(2, 2,'bar'),(3, 3,'baz'),(4, 4,'buzz')")
-
-	qr := mcmp.Exec("insert into user_tbl(id, region_id, name) values (2, 2, 'foo') as new on duplicate key update name = new.name")
-	assert.EqualValues(t, 2, qr.RowsAffected)
-
-	// this validates the record.
-	mcmp.Exec("select id, region_id, name from user_tbl order by id")
-
-	qr = mcmp.Exec("insert into user_tbl(id, region_id, name) values (3, 3, 'foo') as new(m, n, p) on duplicate key update name = p")
-	assert.EqualValues(t, 2, qr.RowsAffected)
-
-	// this validates the record.
-	mcmp.Exec("select id, region_id, name from user_tbl order by id")
-}
 
 // TestInsertJson tests that selected json values are encoded correctly.
 func TestInsertJson(t *testing.T) {
@@ -516,4 +493,3 @@ func TestInsertJson(t *testing.T) {
 	utils.AssertMatches(t, mcmp.VtConn, `select * from uks.j_utbl order by id`,
 		`[[INT64(1) JSON("{}")] [INT64(2) JSON("{\"a\": 1, \"b\": 2}")] [INT64(3) JSON("{\"k\": \"a\"}")] [INT64(4) JSON("{\"date\": 1629849600, \"keywordSourceId\": 930701976723823, \"keywordSourceVersionId\": 210825230433}")]]`)
 }
->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637))

go/vt/sqlparser/parsed_query_test.go

@@ -20,6 +20,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"vitess.io/vitess/go/sqltypes"
 	querypb "vitess.io/vitess/go/vt/proto/query"
 
@@ -86,7 +88,7 @@ func TestGenerateQuery(t *testing.T) {
 				"v1": sqltypes.ValueBindVariable(sqltypes.MakeTrusted(querypb.Type_JSON, []byte(`{"key": "value"}`))),
 				"v2": sqltypes.ValueBindVariable(sqltypes.MakeTrusted(querypb.Type_RAW, []byte(`json_object("k", "v")`))),
 			},
-			output: `insert into t values ('{"key": "value"}', json_object("k", "v"))`,
+			output: `insert into t values ('{\"key\": \"value\"}', json_object("k", "v"))`,
 		}, {
 			desc:  "list bind vars 0 arguments",
 			query: "select * from a where id in ::vals",
@@ -144,24 +146,8 @@ func TestGenerateQuery(t *testing.T) {
 	}
 
 	for _, tcase := range tcases {
-<<<<<<< HEAD
-		tree, err := Parse(tcase.query)
-		if err != nil {
-			t.Errorf("parse failed for %s: %v", tcase.desc, err)
-			continue
-		}
-		buf := NewTrackedBuffer(nil)
-		buf.Myprintf("%v", tree)
-		pq := buf.ParsedQuery()
-		bytes, err := pq.GenerateQuery(tcase.bindVars, tcase.extras)
-		if err != nil {
-			assert.Equal(t, tcase.output, err.Error())
-		} else {
-			assert.Equal(t, tcase.output, string(bytes))
-		}
-=======
 		t.Run(tcase.query, func(t *testing.T) {
-			tree, err := parser.Parse(tcase.query)
+			tree, err := Parse(tcase.query)
 			require.NoError(t, err)
 			buf := NewTrackedBuffer(nil)
 			buf.Myprintf("%v", tree)
@@ -173,7 +159,6 @@ func TestGenerateQuery(t *testing.T) {
 				assert.Equal(t, tcase.output, bytes)
 			}
 		})
->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637))
 	}
 }
 

proto/query.proto

@@ -215,14 +215,8 @@ enum Type {
   // BITNUM specifies a base 2 binary type (unquoted varbinary).
   // Properties: 34, IsText.
   BITNUM = 4130;
-<<<<<<< HEAD
-=======
-  // VECTOR specifies a VECTOR type
-  // Properties: 35, IsQuoted.
-  VECTOR = 2083;
   // RAW specifies a type which won't be quoted but the value used as-is while encoding.
   RAW = 2084;
->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637))
 }
 
 // Value represents a typed value.