From 56d7066d72779f49df82a35071af0554d0f41cb0 Mon Sep 17 00:00:00 2001 From: Stephanie You Date: Mon, 24 Jul 2023 15:47:01 -0700 Subject: [PATCH] update tests for go-sql-driver version bump --- .../binlog_replication_alltypes_test.go | 15 ++--- .../binlog_replication_filters_test.go | 12 ++-- .../binlog_replication_multidb_test.go | 56 +++++++++---------- .../binlog_replication_reconnect_test.go | 16 ++++-- .../binlog_replication_restart_test.go | 4 +- .../binlog_replication_test.go | 34 +++++------ 6 files changed, 71 insertions(+), 66 deletions(-) diff --git a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_alltypes_test.go b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_alltypes_test.go index 82bdaf5074..6e07cc4c95 100644 --- a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_alltypes_test.go +++ b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_alltypes_test.go @@ -48,13 +48,13 @@ func TestBinlogReplicationForAllTypes(t *testing.T) { waitForReplicaToCatchUp(t) rows, err := replicaDatabase.Queryx("select * from db01.alltypes order by pk asc;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "1", row["pk"]) assertValues(t, 0, row) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "2", row["pk"]) assertValues(t, 1, row) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "3", row["pk"]) assertNullValues(t, row) require.False(t, rows.Next()) @@ -70,13 +70,13 @@ func TestBinlogReplicationForAllTypes(t *testing.T) { replicaDatabase.MustExec("use db01;") rows, err = replicaDatabase.Queryx("select * from db01.alltypes order by pk asc;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "1", row["pk"]) assertNullValues(t, row) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "2", row["pk"]) assertValues(t, 0, row) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "3", row["pk"]) assertValues(t, 1, row) require.False(t, rows.Next()) @@ -516,7 +516,8 @@ func assertValues(t *testing.T, assertionIndex int, row map[string]interface{}) actualValue := "" if row[typeDesc.ColumnName()] != nil { - actualValue = row[typeDesc.ColumnName()].(string) + actualValue = fmt.Sprintf("%v", row[typeDesc.ColumnName()]) + //actualValue = row[typeDesc.ColumnName()].(string) } if typeDesc.TypeDefinition == "json" { // LD_1 and DOLT storage formats return JSON strings slightly differently; DOLT removes spaces diff --git a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_filters_test.go b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_filters_test.go index 21bf8c4768..ce129172e5 100644 --- a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_filters_test.go +++ b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_filters_test.go @@ -56,7 +56,7 @@ func TestBinlogReplicationFilters_ignoreTablesOnly(t *testing.T) { // Verify that all changes from t1 were applied on the replica rows, err := replicaDatabase.Queryx("SELECT COUNT(pk) as count, MIN(pk) as min, MAX(pk) as max from db01.t1;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "10", row["count"]) require.Equal(t, "0", row["min"]) require.Equal(t, "9", row["max"]) @@ -65,7 +65,7 @@ func TestBinlogReplicationFilters_ignoreTablesOnly(t *testing.T) { // Verify that no changes from t2 were applied on the replica rows, err = replicaDatabase.Queryx("SELECT COUNT(pk) as count, MIN(pk) as min, MAX(pk) as max from db01.t2;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "0", row["count"]) require.Equal(t, nil, row["min"]) require.Equal(t, nil, row["max"]) @@ -107,7 +107,7 @@ func TestBinlogReplicationFilters_doTablesOnly(t *testing.T) { // Verify that all changes from t1 were applied on the replica rows, err := replicaDatabase.Queryx("SELECT COUNT(pk) as count, MIN(pk) as min, MAX(pk) as max from db01.t1;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "10", row["count"]) require.Equal(t, "0", row["min"]) require.Equal(t, "9", row["max"]) @@ -116,7 +116,7 @@ func TestBinlogReplicationFilters_doTablesOnly(t *testing.T) { // Verify that no changes from t2 were applied on the replica rows, err = replicaDatabase.Queryx("SELECT COUNT(pk) as count, MIN(pk) as min, MAX(pk) as max from db01.t2;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "0", row["count"]) require.Equal(t, nil, row["min"]) require.Equal(t, nil, row["max"]) @@ -159,7 +159,7 @@ func TestBinlogReplicationFilters_doTablesAndIgnoreTables(t *testing.T) { // Verify that all changes from t1 were applied on the replica rows, err := replicaDatabase.Queryx("SELECT COUNT(pk) as count, MIN(pk) as min, MAX(pk) as max from db01.t1;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "10", row["count"]) require.Equal(t, "0", row["min"]) require.Equal(t, "9", row["max"]) @@ -168,7 +168,7 @@ func TestBinlogReplicationFilters_doTablesAndIgnoreTables(t *testing.T) { // Verify that no changes from t2 were applied on the replica rows, err = replicaDatabase.Queryx("SELECT COUNT(pk) as count, MIN(pk) as min, MAX(pk) as max from db01.t2;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "0", row["count"]) require.Equal(t, nil, row["min"]) require.Equal(t, nil, row["max"]) diff --git a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_multidb_test.go b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_multidb_test.go index 804d680d37..b148676dd2 100644 --- a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_multidb_test.go +++ b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_multidb_test.go @@ -48,13 +48,13 @@ func TestBinlogReplicationMultiDb(t *testing.T) { waitForReplicaToCatchUp(t) rows, err := replicaDatabase.Queryx("select * from db01.t01 order by pk asc;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "1", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "3", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "5", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "7", row["pk"]) require.False(t, rows.Next()) require.NoError(t, rows.Close()) @@ -64,19 +64,19 @@ func TestBinlogReplicationMultiDb(t *testing.T) { replicaDatabase.MustExec("use db01;") rows, err = replicaDatabase.Queryx("select * from db01.dolt_diff;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t01", row["table_name"]) require.EqualValues(t, "1", row["data_change"]) require.EqualValues(t, "0", row["schema_change"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t01", row["table_name"]) require.EqualValues(t, "1", row["data_change"]) require.EqualValues(t, "0", row["schema_change"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t01", row["table_name"]) require.EqualValues(t, "1", row["data_change"]) require.EqualValues(t, "0", row["schema_change"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t01", row["table_name"]) require.EqualValues(t, "0", row["data_change"]) require.EqualValues(t, "1", row["schema_change"]) @@ -88,13 +88,13 @@ func TestBinlogReplicationMultiDb(t *testing.T) { replicaDatabase.MustExec("use db02;") rows, err = replicaDatabase.Queryx("select * from db02.t02 order by pk asc;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "2", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "4", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "6", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "8", row["pk"]) require.False(t, rows.Next()) require.NoError(t, rows.Close()) @@ -102,19 +102,19 @@ func TestBinlogReplicationMultiDb(t *testing.T) { // Verify db02.dolt_diff rows, err = replicaDatabase.Queryx("select * from db02.dolt_diff;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t02", row["table_name"]) require.Equal(t, "1", row["data_change"]) require.Equal(t, "0", row["schema_change"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t02", row["table_name"]) require.Equal(t, "1", row["data_change"]) require.Equal(t, "0", row["schema_change"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t02", row["table_name"]) require.Equal(t, "1", row["data_change"]) require.Equal(t, "0", row["schema_change"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t02", row["table_name"]) require.Equal(t, "0", row["data_change"]) require.Equal(t, "1", row["schema_change"]) @@ -148,13 +148,13 @@ func TestBinlogReplicationMultiDbTransactions(t *testing.T) { waitForReplicaToCatchUp(t) rows, err := replicaDatabase.Queryx("select * from db01.t01 order by pk asc;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "1", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "3", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "5", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "7", row["pk"]) require.False(t, rows.Next()) require.NoError(t, rows.Close()) @@ -163,11 +163,11 @@ func TestBinlogReplicationMultiDbTransactions(t *testing.T) { replicaDatabase.MustExec("use db01;") rows, err = replicaDatabase.Queryx("select * from db01.dolt_diff;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t01", row["table_name"]) require.EqualValues(t, "1", row["data_change"]) require.EqualValues(t, "0", row["schema_change"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t01", row["table_name"]) require.EqualValues(t, "0", row["data_change"]) require.EqualValues(t, "1", row["schema_change"]) @@ -179,13 +179,13 @@ func TestBinlogReplicationMultiDbTransactions(t *testing.T) { replicaDatabase.MustExec("use db02;") rows, err = replicaDatabase.Queryx("select * from db02.t02 order by pk asc;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "2", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "4", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "6", row["pk"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "8", row["pk"]) require.False(t, rows.Next()) require.NoError(t, rows.Close()) @@ -193,11 +193,11 @@ func TestBinlogReplicationMultiDbTransactions(t *testing.T) { // Verify db02.dolt_diff rows, err = replicaDatabase.Queryx("select * from db02.dolt_diff;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t02", row["table_name"]) require.Equal(t, "1", row["data_change"]) require.Equal(t, "0", row["schema_change"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "t02", row["table_name"]) require.Equal(t, "0", row["data_change"]) require.Equal(t, "1", row["schema_change"]) diff --git a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_reconnect_test.go b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_reconnect_test.go index d6d7e3c7cb..3ab5d62f8d 100644 --- a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_reconnect_test.go +++ b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_reconnect_test.go @@ -62,7 +62,7 @@ func TestBinlogReplicationAutoReconnect(t *testing.T) { rows, err := replicaDatabase.Queryx("select min(pk) as min, max(pk) as max, count(pk) as count from db01.reconnect_test;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "0", row["min"]) require.Equal(t, "999", row["max"]) require.Equal(t, "1000", row["count"]) @@ -145,7 +145,7 @@ func showReplicaStatus(t *testing.T) map[string]interface{} { rows, err := replicaDatabase.Queryx("show replica status;") require.NoError(t, err) defer rows.Close() - return convertByteArraysToStrings(readNextRow(t, rows)) + return convertMapScanResultToStrings(readNextRow(t, rows)) } func configureToxiProxy(t *testing.T) { @@ -184,15 +184,19 @@ func turnOnLimitDataToxic(t *testing.T) { t.Logf("Toxiproxy proxy with limit_data toxic (1KB) started on port %d", proxyPort) } -// convertByteArraysToStrings converts each []byte value in the specified map |m| into a string. +// convertMapScanResultToStrings converts each value in the specified map |m| into a string. // This is necessary because MapScan doesn't honor (or know about) the correct underlying SQL types – it -// gets all results back as strings, typed as []byte. +// gets results back as strings, typed as []byte. Results also get returned as int64, which are converted to strings +// for ease of testing. // More info at the end of this issue: https://github.com/jmoiron/sqlx/issues/225 -func convertByteArraysToStrings(m map[string]interface{}) map[string]interface{} { +func convertMapScanResultToStrings(m map[string]interface{}) map[string]interface{} { for key, value := range m { - if bytes, ok := value.([]byte); ok { + if bytes, ok := value.([]uint8); ok { m[key] = string(bytes) } + if i, ok := value.(int64); ok { + m[key] = strconv.FormatInt(i, 10) + } } return m diff --git a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_restart_test.go b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_restart_test.go index 285a5d7d0a..3c05a7bc45 100644 --- a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_restart_test.go +++ b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_restart_test.go @@ -75,8 +75,8 @@ func TestBinlogReplicationServerRestart(t *testing.T) { require.NoError(t, err) replicaRows, err := replicaDatabase.Queryx(countMaxQuery) require.NoError(t, err) - primaryRow := convertByteArraysToStrings(readNextRow(t, primaryRows)) - replicaRow := convertByteArraysToStrings(readNextRow(t, replicaRows)) + primaryRow := convertMapScanResultToStrings(readNextRow(t, primaryRows)) + replicaRow := convertMapScanResultToStrings(readNextRow(t, replicaRows)) require.Equal(t, primaryRow["count"], replicaRow["count"]) require.Equal(t, primaryRow["max"], replicaRow["max"]) require.NoError(t, replicaRows.Close()) diff --git a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_test.go b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_test.go index 5921d383b5..36b43df457 100644 --- a/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_test.go +++ b/go/libraries/doltcore/sqle/binlogreplication/binlog_replication_test.go @@ -169,7 +169,7 @@ func TestResetReplica(t *testing.T) { rows, err = replicaDatabase.Queryx("SHOW REPLICA STATUS;") require.NoError(t, err) - status := convertByteArraysToStrings(readNextRow(t, rows)) + status := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "0", status["Last_Errno"]) require.Equal(t, "", status["Last_Error"]) require.Equal(t, "0", status["Last_IO_Errno"]) @@ -320,7 +320,7 @@ func TestDoltCommits(t *testing.T) { waitForReplicaToCatchUp(t) rows, err := replicaDatabase.Queryx("select count(*) as count from db01.dolt_log;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "5", row["count"]) require.NoError(t, rows.Close()) @@ -331,31 +331,31 @@ func TestDoltCommits(t *testing.T) { require.NoError(t, err) // Fourth transaction - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "1", row["data_change"]) require.Equal(t, "0", row["schema_change"]) require.Equal(t, "t1", row["table_name"]) commitId := row["commit_hash"] - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "1", row["data_change"]) require.Equal(t, "0", row["schema_change"]) require.Equal(t, "t2", row["table_name"]) require.Equal(t, commitId, row["commit_hash"]) // Third transaction - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "1", row["data_change"]) require.Equal(t, "0", row["schema_change"]) require.Equal(t, "t2", row["table_name"]) // Second transaction - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "0", row["data_change"]) require.Equal(t, "1", row["schema_change"]) require.Equal(t, "t2", row["table_name"]) // First transaction - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "0", row["data_change"]) require.Equal(t, "1", row["schema_change"]) require.Equal(t, "t1", row["table_name"]) @@ -405,13 +405,13 @@ func TestForeignKeyChecks(t *testing.T) { waitForReplicaToCatchUp(t) rows, err := replicaDatabase.Queryx("select * from db01.t1 order by pk;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "1", row["pk"]) require.Equal(t, "red", row["color"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "2", row["pk"]) require.Equal(t, "still-not-a-color", row["color"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "3", row["pk"]) require.Equal(t, "not-a-color", row["color"]) require.False(t, rows.Next()) @@ -419,9 +419,9 @@ func TestForeignKeyChecks(t *testing.T) { rows, err = replicaDatabase.Queryx("select * from db01.colors order by name;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "blue", row["name"]) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "green", row["name"]) require.False(t, rows.Next()) require.NoError(t, rows.Close()) @@ -441,14 +441,14 @@ func TestCharsetsAndCollations(t *testing.T) { waitForReplicaToCatchUp(t) rows, err := replicaDatabase.Queryx("show create table db01.t1;") require.NoError(t, err) - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) require.Contains(t, row["Create Table"], "ascii_general_ci") require.Contains(t, row["Create Table"], "utf16_general_ci") require.NoError(t, rows.Close()) rows, err = replicaDatabase.Queryx("select * from db01.t1;") require.NoError(t, err) - row = convertByteArraysToStrings(readNextRow(t, rows)) + row = convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, "one", row["c1"]) require.Equal(t, "\x00o\x00n\x00e", row["c2"]) require.NoError(t, rows.Close()) @@ -515,7 +515,7 @@ func waitForReplicaToReachGtid(t *testing.T, target int) { func assertWarning(t *testing.T, database *sqlx.DB, code int, message string) { rows, err := database.Queryx("SHOW WARNINGS;") require.NoError(t, err) - warning := convertByteArraysToStrings(readNextRow(t, rows)) + warning := convertMapScanResultToStrings(readNextRow(t, rows)) require.Equal(t, strconv.Itoa(code), warning["Code"]) require.Equal(t, message, warning["Message"]) require.False(t, rows.Next()) @@ -526,7 +526,7 @@ func queryGtid(t *testing.T, database *sqlx.DB) string { rows, err := database.Queryx("SELECT @@global.gtid_executed as gtid_executed;") require.NoError(t, err) defer rows.Close() - row := convertByteArraysToStrings(readNextRow(t, rows)) + row := convertMapScanResultToStrings(readNextRow(t, rows)) if row["gtid_executed"] == nil { t.Fatal("no value for @@GLOBAL.gtid_executed") } @@ -550,7 +550,7 @@ func readAllRows(t *testing.T, rows *sqlx.Rows) []map[string]interface{} { } err := rows.MapScan(row) require.NoError(t, err) - row = convertByteArraysToStrings(row) + row = convertMapScanResultToStrings(row) result = append(result, row) } }