diff --git a/go/test/endtoend/vreplication/config_test.go b/go/test/endtoend/vreplication/config_test.go index a37ebe77b94..e3de0b5ab67 100644 --- a/go/test/endtoend/vreplication/config_test.go +++ b/go/test/endtoend/vreplication/config_test.go @@ -147,7 +147,7 @@ create table nopk (name varchar(128), age int unsigned); ], "auto_increment": { "column": "cid", - "sequence": "customer_seq" + "sequence": "` + "`customer_seq`" + `" } }, "customer_name": { diff --git a/go/vt/vtctl/workflow/traffic_switcher.go b/go/vt/vtctl/workflow/traffic_switcher.go index 2272d8de34f..a5e5086fd23 100644 --- a/go/vt/vtctl/workflow/traffic_switcher.go +++ b/go/vt/vtctl/workflow/traffic_switcher.go @@ -1387,6 +1387,7 @@ func (ts *trafficSwitcher) getTargetSequenceMetadata(ctx context.Context) (map[s } var err error for tableName, tableDef := range kvs.Tables { + // The table name can be escaped in the vschema definition. if tableName, err = sqlescape.UnescapeID(tableName); err != nil { return err } @@ -1433,6 +1434,7 @@ func (ts *trafficSwitcher) getTargetSequenceMetadata(ctx context.Context) (map[s searchGroup, gctx := errgroup.WithContext(ctx) searchCompleted := make(chan struct{}) for _, keyspace := range keyspaces { + // The keyspace name can be escaped in the vschema definition. keyspace, err := sqlescape.UnescapeID(keyspace) if err != nil { return nil, err diff --git a/go/vt/vtctl/workflow/traffic_switcher_test.go b/go/vt/vtctl/workflow/traffic_switcher_test.go index 6941fbd2ac9..9409edbd32a 100644 --- a/go/vt/vtctl/workflow/traffic_switcher_test.go +++ b/go/vt/vtctl/workflow/traffic_switcher_test.go @@ -142,8 +142,6 @@ func TestGetTargetSequenceMetadata(t *testing.T) { }, }, }, - // key: ```my-seq1```, value: &{```my-seq1``` ```source-ks``` vt_`source-ks` t1 vt_targetks 0x14000758640} - // column_vindexes:{column:"`my-col`" name:"xxhash"} auto_increment:{column:"`my-col`" sequence:"`source-ks`.`my-seq1`"} want: map[string]*sequenceMetadata{ "my-seq1": { backingTableName: "my-seq1", @@ -204,7 +202,6 @@ func TestGetTargetSequenceMetadata(t *testing.T) { sources: sources, targets: targets, } - //t.Logf("DEBUG: ts: %+v", ts) got, err := ts.getTargetSequenceMetadata(ctx) if tc.err != "" { require.EqualError(t, err, tc.err)