Merge remote-tracking branch 'upstream/main' into mhamza/pool-reuse

Signed-off-by: Mohamed Hamza <[email protected]>

Author: mhamza15

go/test/endtoend/preparestmt/stmt_methods_test.go

@@ -444,6 +444,23 @@ func TestBinaryColumn(t *testing.T) {
 	require.NoError(t, err)
 }
 
+// TestInsertTest inserts a row with empty json array.
+func TestInsertTest(t *testing.T) {
+	dbo := Connect(t, "interpolateParams=false")
+	defer dbo.Close()
+
+	stmt, err := dbo.Prepare(`insert into vt_prepare_stmt_test(id, keyspace_id, json_col) values( null, ?, ?)`)
+	require.NoError(t, err)
+
+	res, err := stmt.Exec(1, "[]")
+	require.NoError(t, err)
+
+	ra, err := res.RowsAffected()
+	require.NoError(t, err)
+
+	assert.Equal(t, int64(1), ra)
+}
+
 // TestSpecializedPlan tests the specialized plan generation for the query.
 func TestSpecializedPlan(t *testing.T) {
 	dbInfo.KeyspaceName = sks

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

@@ -517,6 +517,8 @@ func TestInsertJson(t *testing.T) {
 	utils.Exec(t, mcmp.VtConn, `insert into uks.j_utbl(id, jdoc) select * from sks.j_tbl`)
 	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}")]]`)
+
+	mcmp.Exec(`insert into j_tbl(id, jdoc) values (10, '{}'), (20, "[]")`)
 }
 
 func TestInsertIgnoreNullAndInsertNull(t *testing.T) {

test/config.json

@@ -197,7 +197,7 @@
 			"Manual": false,
 			"Shard": "12",
 			"RetryMax": 1,
-			"Tags": []
+			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"mysql_server": {
 			"File": "unused.go",