Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go/libraries/doltcore/dbfactory/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ func awsConfigFromParams(ctx context.Context, params map[string]interface{}) (aw
cfg, err := config.LoadDefaultConfig(ctx, opts...)
var profileErr config.SharedConfigProfileNotExistError
if errors.As(err, &profileErr) {
// XXX: Dolt was originaly using aws-sdk-go, which was
// XXX: Dolt was originally using aws-sdk-go, which was
// happy to load the specified shared profile from
// places like AWS_CONFIG_FILE or $HOME/.aws/config,
// but did not complain if it could not find it.
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/writer/noms_write_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (s *nomsWriteSession) GetWorkingSet() *doltdb.WorkingSet {
func (s *nomsWriteSession) GetTableWriter(ctx *sql.Context, table doltdb.TableName, db string, setter dsess.SessionRootSetter, targetStaging bool) (dsess.TableWriter, error) {
if targetStaging {
// This would be fairly easy to implement, but we gotta stop luggin around the legacy storage format.
return nil, fmt.Errorf("Feature not suppported in legacy storage format")
return nil, fmt.Errorf("Feature not supported in legacy storage format")
}

s.mut.Lock()
Expand Down
2 changes: 1 addition & 1 deletion go/store/nbs/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ type NomsBlockStore struct {
cond *sync.Cond
// |true| after BeginGC is called, and false once the corresponding EndGC call returns.
gcInProgress bool
// When unlocked read operations are occuring against the
// When unlocked read operations are occurring against the
// block store, and they started when |gcInProgress == true|,
// this variable is incremented. EndGC will not return until
// no outstanding reads are in progress.
Expand Down
6 changes: 3 additions & 3 deletions integration-tests/bats/checkout.bats
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ SQL
[ "$status" -eq 0 ]
[[ "$output" =~ "new table" ]] || false

# Now check the table into main and make additonal changes
# Now check the table into main and make additional changes
dolt add . && dolt commit -m "new table"
dolt sql -q "insert into t2 values (2);"

Expand Down Expand Up @@ -444,7 +444,7 @@ SQL
dolt checkout -b test-branch
dolt sql -q 'insert into test (id, id2) values (0, 2);'
dolt add .
dolt commit -m "conclicting commit message"
dolt commit -m "conflicting commit message"

shaparent1=$(dolt log --oneline --decorate=no | head -n 1 | cut -d ' ' -f 1)
# remove special characters (color)
Expand Down Expand Up @@ -478,7 +478,7 @@ SQL
dolt checkout -b test-branch
dolt sql -q 'insert into test (id, id2) values (0, 2);'
dolt add .
dolt commit -m "conclicting commit message"
dolt commit -m "conflicting commit message"

shaparent1=$(dolt log --oneline --decorate=no | head -n 1 | cut -d ' ' -f 1)
# remove special characters (color)
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/bats/foreign-keys.bats
Original file line number Diff line number Diff line change
Expand Up @@ -1720,7 +1720,7 @@ SQL
dolt commit -m "committed"
}

@test "foreign-keys: deleting and readding" {
@test "foreign-keys: deleting and reading" {
dolt sql <<SQL
CREATE TABLE parent2 (
pk BIGINT PRIMARY KEY
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/bats/keyless-foreign-keys.bats
Original file line number Diff line number Diff line change
Expand Up @@ -1557,7 +1557,7 @@ SQL
dolt commit -m "committed"
}

@test "keyless-foreign-keys: deleting and readding" {
@test "keyless-foreign-keys: deleting and reading" {
dolt sql <<SQL
CREATE TABLE parent2 (
pk BIGINT,
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/bats/sql-mysqldb-privs.bats
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env bats
load $BATS_TEST_DIRNAME/helper/common.bash

# This suite of tests is for testing the sql server's presentation of privledges, priviledge persisteance between
# This suite of tests is for testing the sql server's presentation of privileges, privilege persistence between
# CLI and server instances.
#
# Caring about privledges on the CLI isn't really the point, but working in both modes ensures that persistance
# Caring about privileges on the CLI isn't really the point, but working in both modes ensures that persistence
# is working correctly. You won't see mention of working with servers in these tests because it's handled by
# running tests in this file using helper/local-remote.bash

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static void QueryTest(MySqlConnection conn)
int r = Convert.ToInt32(result);
if (r != 1)
{
TestException ex = new TestException($"Expected 1, Recieved {r}");
TestException ex = new TestException($"Expected 1, Received {r}");
throw ex;
}
}
Expand Down Expand Up @@ -156,7 +156,7 @@ public static void DoltSqlTest(MySqlConnection conn)
int r = Convert.ToInt32(result);
if (r != 3)
{
TestException ex = new TestException($"Expected 3, Recieved {r}");
TestException ex = new TestException($"Expected 3, Received {r}");
throw ex;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static void QueryTest(MySqlConnection conn)
int r = Convert.ToInt32(result);
if (r != 1)
{
TestException ex = new TestException($"Expected 1, Recieved {r}");
TestException ex = new TestException($"Expected 1, Received {r}");
throw ex;
}
}
Expand Down Expand Up @@ -117,7 +117,7 @@ public static void DoltSqlTest(MySqlConnection conn)
int r = Convert.ToInt32(result);
if (r != 3)
{
TestException ex = new TestException($"Expected 3, Recieved {r}");
TestException ex = new TestException($"Expected 3, Received {r}");
throw ex;
}
}
Expand Down
Loading