Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: typos #1026

Merged
merged 4 commits into from
Oct 9, 2024
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
12 changes: 6 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

### Features

* Allow overiding of Warn and Deprecated loggers ([#952](https://github.com/uptrace/bun/issues/952)) ([0e9d737](https://github.com/uptrace/bun/commit/0e9d737e4ca2deb86930237ee32a39cf3f7e8157))
* Allow overriding of Warn and Deprecated loggers ([#952](https://github.com/uptrace/bun/issues/952)) ([0e9d737](https://github.com/uptrace/bun/commit/0e9d737e4ca2deb86930237ee32a39cf3f7e8157))
* enable SNI ([#953](https://github.com/uptrace/bun/issues/953)) ([4071ffb](https://github.com/uptrace/bun/commit/4071ffb5bcb1b233cda239c92504d8139dcf1d2f))
* **idb:** add NewMerge method to IDB ([#966](https://github.com/uptrace/bun/issues/966)) ([664e2f1](https://github.com/uptrace/bun/commit/664e2f154f1153d2a80cd062a5074f1692edaee7))

Expand Down Expand Up @@ -119,7 +119,7 @@

### Bug Fixes

* add support for inserting values with unicode encoding for mssql dialect ([e98c6c0](https://github.com/uptrace/bun/commit/e98c6c0f033b553bea3bbc783aa56c2eaa17718f))
* add support for inserting values with Unicode encoding for mssql dialect ([e98c6c0](https://github.com/uptrace/bun/commit/e98c6c0f033b553bea3bbc783aa56c2eaa17718f))
* fix relation tag ([a3eedff](https://github.com/uptrace/bun/commit/a3eedff49700490d4998dcdcdc04f554d8f17166))


Expand Down Expand Up @@ -155,7 +155,7 @@

### Bug Fixes

* addng dialect override for append-bool ([#695](https://github.com/uptrace/bun/issues/695)) ([338f2f0](https://github.com/uptrace/bun/commit/338f2f04105ad89e64530db86aeb387e2ad4789e))
* adding dialect override for append-bool ([#695](https://github.com/uptrace/bun/issues/695)) ([338f2f0](https://github.com/uptrace/bun/commit/338f2f04105ad89e64530db86aeb387e2ad4789e))
* don't call hooks twice for whereExists ([9057857](https://github.com/uptrace/bun/commit/90578578e717f248e4b6eb114c5b495fd8d4ed41))
* don't lock migrations when running Migrate and Rollback ([69a7354](https://github.com/uptrace/bun/commit/69a7354d987ff2ed5338c9ef5f4ce320724299ab))
* **query:** make WhereDeleted compatible with ForceDelete ([299c3fd](https://github.com/uptrace/bun/commit/299c3fd57866aaecd127a8f219c95332898475db)), closes [#673](https://github.com/uptrace/bun/issues/673)
Expand Down Expand Up @@ -323,7 +323,7 @@ recommended to upgrade to v1.0.24 before upgrading to v1.1.x.

- append slice values
([4a65129](https://github.com/uptrace/bun/commit/4a651294fb0f1e73079553024810c3ead9777311))
- check for nils when appeding driver.Value
- check for nils when appending driver.Value
([7bb1640](https://github.com/uptrace/bun/commit/7bb1640a00fceca1e1075fe6544b9a4842ab2b26))
- cleanup soft deletes for mssql
([e72e2c5](https://github.com/uptrace/bun/commit/e72e2c5d0a85f3d26c3fa22c7284c2de1dcfda8e))
Expand All @@ -342,7 +342,7 @@ recommended to upgrade to v1.0.24 before upgrading to v1.1.x.

### Deprecated

In the comming v1.1.x release, Bun will stop automatically adding `,pk,autoincrement` options on
In the coming v1.1.x release, Bun will stop automatically adding `,pk,autoincrement` options on
`ID int64/int32` fields. This version (v1.0.23) only prints a warning when it encounters such
fields, but the code will continue working as before.

Expand Down Expand Up @@ -460,7 +460,7 @@ In v1.1.x, such options as `,nopk` and `,allowzero` will not be necessary and wi
([693f1e1](https://github.com/uptrace/bun/commit/693f1e135999fc31cf83b99a2530a695b20f4e1b))
- add model embedding via embed:prefix\_
([9a2cedc](https://github.com/uptrace/bun/commit/9a2cedc8b08fa8585d4bfced338bd0a40d736b1d))
- change the default logoutput to stderr
- change the default log output to stderr
([4bf5773](https://github.com/uptrace/bun/commit/4bf577382f19c64457cbf0d64490401450954654)),
closes [#349](https://github.com/uptrace/bun/issues/349)

Expand Down
2 changes: 1 addition & 1 deletion bun.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ type AfterDropTableHook interface {
AfterDropTable(ctx context.Context, query *DropTableQuery) error
}

// SetLogger overwriters default Bun logger.
// SetLogger overwrites default Bun logger.
func SetLogger(logger internal.Logging) {
internal.SetLogger(logger)
}
Expand Down
2 changes: 1 addition & 1 deletion dialect/mssqldialect/dialect.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (*Dialect) AppendBool(b []byte, v bool) []byte {
}

func (d *Dialect) AppendString(b []byte, s string) []byte {
// 'N' prefix means the string uses unicode encoding.
// 'N' prefix means the string uses Unicode encoding.
b = append(b, 'N')
return d.BaseDialect.AppendString(b, s)
}
Expand Down
2 changes: 1 addition & 1 deletion driver/pgdriver/column.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func readColumnValue(rd *reader, dataType int32, dataLen int) (interface{}, erro
case pgTimestamptz:
return readTimeCol(rd, dataLen)
case pgDate:
// Return a string and let the scanner to convert string to time.Time if necessary.
// Return a string and let the scanner convert the string to time.Time if necessary.
return readStringCol(rd, dataLen)
case pgText, pgVarchar:
return readStringCol(rd, dataLen)
Expand Down
2 changes: 1 addition & 1 deletion example/fixture/fixture.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
created_at: '{{ now }}'
updated_at: '{{ now }}'
- _id: doe
name: Jonh Doe
name: John Doe
email: [email protected]
created_at: '{{ now }}'

Expand Down
2 changes: 1 addition & 1 deletion example/opentelemetry/uptrace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ smtp_mailer:
password: mailhog
# Uncomment to disable opportunistic TLS.
#tls: { disabled: true }
# Emails will be send from this address.
# Emails will be sent from this address.
from: 'uptrace@localhost'

##
Expand Down
2 changes: 1 addition & 1 deletion extra/bunbig/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ let we have x , y as two bigint.Bigint numbers in buntypes.
y:= bunbig.FromInt64(90)
```

For comparing the above numbers, we can do as follow:
For comparing the above numbers, we can do as follows:

```
cmp:=x.Cmp(y)
Expand Down
6 changes: 3 additions & 3 deletions internal/dbtest/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ func testFKViolation(t *testing.T, db *bun.DB) {
_, err = db.NewInsert().Model(new(Deck)).Exec(ctx)
require.Error(t, err)

// Create a deck that violates the user_id FK contraint
// Create a deck that violates the user_id FK constraint
deck := &Deck{UserID: 42}

_, err = db.NewInsert().Model(deck).Exec(ctx)
Expand Down Expand Up @@ -927,7 +927,7 @@ func testWithForeignKeysAndRules(t *testing.T, db *bun.DB) {
_, err = db.NewInsert().Model(new(Deck)).Exec(ctx)
require.Error(t, err)

// Create a deck that violates the user_id FK contraint
// Create a deck that violates the user_id FK constraint
deck := &Deck{UserID: 42}

_, err = db.NewInsert().Model(deck).Exec(ctx)
Expand Down Expand Up @@ -1012,7 +1012,7 @@ func testWithForeignKeys(t *testing.T, db *bun.DB) {
_, err = db.NewInsert().Model(new(Deck)).Exec(ctx)
require.Error(t, err)

// Create a deck that violates the user_id FK contraint
// Create a deck that violates the user_id FK constraint
deck := &Deck{UserID: 42}

_, err = db.NewInsert().Model(deck).Exec(ctx)
Expand Down
Loading
Loading