diff --git a/go/libraries/doltcore/sqle/index/dolt_index.go b/go/libraries/doltcore/sqle/index/dolt_index.go index 32459490de..40a87b6083 100644 --- a/go/libraries/doltcore/sqle/index/dolt_index.go +++ b/go/libraries/doltcore/sqle/index/dolt_index.go @@ -218,7 +218,7 @@ func DoltToFromCommitIndexes(tbl string, sch schema.Schema) (indexes []sql.Index order: sql.IndexOrderNone, constrainedToLookupExpression: false, // We pass a nil ValueStore into the key builder, because we don't have one. This would cause an issue - // if any of the columns uss Adaptive encoding, but that shouldn't be possible in the primary key. + // if any of the columns use Adaptive encoding, but that shouldn't be possible in the primary key. keyBld: val.NewTupleBuilder(sch.GetKeyDescriptor(nil), nil), }) } diff --git a/integration-tests/bats/sql-commit-diff.bats b/integration-tests/bats/sql-commit-diff.bats index d91e38b6a7..f6a34b5771 100644 --- a/integration-tests/bats/sql-commit-diff.bats +++ b/integration-tests/bats/sql-commit-diff.bats @@ -80,7 +80,6 @@ teardown() { run dolt sql -q "select from_pk1, from_pk2, to_pk1, to_pk2, diff_type from dolt_commit_diff_test_two_pk where from_commit = DOLT_HASHOF('initial') and to_commit = DOLT_HASHOF('update') and from_pk1 = 2;" [ $status -eq 0 ] - echo "$output" [[ "${#lines[@]}" = "6" ]] # 2 rows + 4 formatting lines [[ "$output" =~ "| 2 | 21 | 2 | 21 | modified |" ]] || false [[ "$output" =~ "| 2 | 20 | NULL | NULL | removed |" ]] || false