Skip to content

Commit 760de7d

Browse files
authored
fix: typos (#1026)
* fix: typos * fix: parser unit tests * chore: consistent line endings * chore: migrate deprecated function
1 parent c070026 commit 760de7d

File tree

15 files changed

+537
-536
lines changed

15 files changed

+537
-536
lines changed

CHANGELOG.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
### Features
3535

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

@@ -119,7 +119,7 @@
119119

120120
### Bug Fixes
121121

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

125125

@@ -155,7 +155,7 @@
155155

156156
### Bug Fixes
157157

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

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

343343
### Deprecated
344344

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

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

bun.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ type AfterDropTableHook interface {
7474
AfterDropTable(ctx context.Context, query *DropTableQuery) error
7575
}
7676

77-
// SetLogger overwriters default Bun logger.
77+
// SetLogger overwrites default Bun logger.
7878
func SetLogger(logger internal.Logging) {
7979
internal.SetLogger(logger)
8080
}

dialect/mssqldialect/dialect.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (*Dialect) AppendBool(b []byte, v bool) []byte {
128128
}
129129

130130
func (d *Dialect) AppendString(b []byte, s string) []byte {
131-
// 'N' prefix means the string uses unicode encoding.
131+
// 'N' prefix means the string uses Unicode encoding.
132132
b = append(b, 'N')
133133
return d.BaseDialect.AppendString(b, s)
134134
}

driver/pgdriver/column.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func readColumnValue(rd *reader, dataType int32, dataLen int) (interface{}, erro
5151
case pgTimestamptz:
5252
return readTimeCol(rd, dataLen)
5353
case pgDate:
54-
// Return a string and let the scanner to convert string to time.Time if necessary.
54+
// Return a string and let the scanner convert the string to time.Time if necessary.
5555
return readStringCol(rd, dataLen)
5656
case pgText, pgVarchar:
5757
return readStringCol(rd, dataLen)

example/fixture/fixture.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
created_at: '{{ now }}'
88
updated_at: '{{ now }}'
99
- _id: doe
10-
name: Jonh Doe
10+
name: John Doe
1111
1212
created_at: '{{ now }}'
1313

example/opentelemetry/uptrace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ smtp_mailer:
207207
password: mailhog
208208
# Uncomment to disable opportunistic TLS.
209209
#tls: { disabled: true }
210-
# Emails will be send from this address.
210+
# Emails will be sent from this address.
211211
from: 'uptrace@localhost'
212212

213213
##

extra/bunbig/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ let we have x , y as two bigint.Bigint numbers in buntypes.
6666
y:= bunbig.FromInt64(90)
6767
```
6868

69-
For comparing the above numbers, we can do as follow:
69+
For comparing the above numbers, we can do as follows:
7070

7171
```
7272
cmp:=x.Cmp(y)

internal/dbtest/db_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ func testFKViolation(t *testing.T, db *bun.DB) {
876876
_, err = db.NewInsert().Model(new(Deck)).Exec(ctx)
877877
require.Error(t, err)
878878

879-
// Create a deck that violates the user_id FK contraint
879+
// Create a deck that violates the user_id FK constraint
880880
deck := &Deck{UserID: 42}
881881

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

930-
// Create a deck that violates the user_id FK contraint
930+
// Create a deck that violates the user_id FK constraint
931931
deck := &Deck{UserID: 42}
932932

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

1015-
// Create a deck that violates the user_id FK contraint
1015+
// Create a deck that violates the user_id FK constraint
10161016
deck := &Deck{UserID: 42}
10171017

10181018
_, err = db.NewInsert().Model(deck).Exec(ctx)

0 commit comments

Comments
 (0)