mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-10 18:49:02 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

PR feedback: Update error msg wording

Browse Source
This commit is contained in:
Katie McCulloch
2021-06-30 14:58:59 -07:00
parent 6b7c47b88d
commit 75a69d115d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/cmd/dolt/commands/diff.go
View File

@@ -875,7 +875,7 @@ func createSplitter(ctx context.Context, vrw types.ValueReadWriter, fromSch sche
unionSch, err = untyped.UntypedSchemaUnion(dumbNewSch, dumbOldSch)
if err != nil {
return nil, nil, errhand.BuildDError("Cannot merge schemas with different primary key sets").AddCause(err).Build()
return nil, nil, errhand.BuildDError("Merge failed. Tables with different primary keys cannot be merged.").AddCause(err).Build()
}
} else {

2
integration-tests/bats/schema-changes.bats
View File

@@ -32,7 +32,7 @@ teardown() {
[ "$status" -eq 0 ]
[[ "$output" =~ "BIGINT" ]] || false
[[ "$output" =~ "LONGTEXT" ]] || false
[[ ! "$ouput" =~ "Cannot merge schemas with different primary key sets" ]] || false
[[ ! "$ouput" =~ "Merge failed" ]] || false
}
@test "schema-changes: dolt schema rename column" {