From 3f3b58a98363a191c0cfdc4fbd1ba7504c705efe Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Wed, 22 May 2024 16:43:24 -0700 Subject: [PATCH] Fixed test --- .../doltcore/diff/table_deltas_test.go | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/go/libraries/doltcore/diff/table_deltas_test.go b/go/libraries/doltcore/diff/table_deltas_test.go index f6b2870784..22533b7581 100644 --- a/go/libraries/doltcore/diff/table_deltas_test.go +++ b/go/libraries/doltcore/diff/table_deltas_test.go @@ -17,6 +17,7 @@ package diff import ( "testing" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" "github.com/stretchr/testify/require" "github.com/dolthub/dolt/go/libraries/doltcore/schema" @@ -41,24 +42,24 @@ var sch5 = schema.MustSchemaFromCols(schema.NewColCollection( func TestMatchTableDeltas(t *testing.T) { var fromDeltas = []TableDelta{ - {FromName: "should_match_on_name", FromSch: sch}, - {FromName: "dropped", FromSch: sch}, - {FromName: "dropped2", FromSch: sch3}, - {FromName: "renamed_before", FromSch: sch5}, + {FromName: doltdb.TableName{Name: "should_match_on_name"}, FromSch: sch}, + {FromName: doltdb.TableName{Name: "dropped"}, FromSch: sch}, + {FromName: doltdb.TableName{Name: "dropped2"}, FromSch: sch3}, + {FromName: doltdb.TableName{Name: "renamed_before"}, FromSch: sch5}, } var toDeltas = []TableDelta{ - {ToName: "should_match_on_name", ToSch: sch}, - {ToName: "added", ToSch: sch2}, - {ToName: "added2", ToSch: sch4}, - {ToName: "renamed_after", ToSch: sch5}, + {ToName: doltdb.TableName{Name: "should_match_on_name"}, ToSch: sch}, + {ToName: doltdb.TableName{Name: "added"}, ToSch: sch2}, + {ToName: doltdb.TableName{Name: "added2"}, ToSch: sch4}, + {ToName: doltdb.TableName{Name: "renamed_after"}, ToSch: sch5}, } expected := []TableDelta{ - {FromName: "should_match_on_name", ToName: "should_match_on_name", FromSch: sch, ToSch: sch}, - {FromName: "renamed_before", ToName: "renamed_after", FromSch: sch5, ToSch: sch5}, - {FromName: "dropped", FromSch: sch}, - {FromName: "dropped2", FromSch: sch3}, - {ToName: "added", ToSch: sch2}, - {ToName: "added2", ToSch: sch4}, + {FromName: doltdb.TableName{Name: "should_match_on_name"}, ToName: doltdb.TableName{Name: "should_match_on_name"}, FromSch: sch, ToSch: sch}, + {FromName: doltdb.TableName{Name: "renamed_before"}, ToName: doltdb.TableName{Name: "renamed_after"}, FromSch: sch5, ToSch: sch5}, + {FromName: doltdb.TableName{Name: "dropped"}, FromSch: sch}, + {FromName: doltdb.TableName{Name: "dropped2"}, FromSch: sch3}, + {ToName: doltdb.TableName{Name: "added"}, ToSch: sch2}, + {ToName: doltdb.TableName{Name: "added2"}, ToSch: sch4}, } for i := 0; i < 100; i++ {