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
10 changes: 5 additions & 5 deletions conn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,7 @@ func TestStmtCacheInvalidationConn(t *testing.T) {
// It is up to the application to determine if it wants to try again. We punt to
// the application because there is no clear recovery path in the case of failed transactions
// or batch operations and because automatic retry is tricky and we don't want to get
// it wrong at such an importaint layer of the stack.
// it wrong at such an important layer of the stack.
rows, err = conn.Query(ctx, getSQL, 1)
require.NoError(t, err)
rows.Next()
Expand Down Expand Up @@ -1321,7 +1321,7 @@ func TestStmtCacheInvalidationTx(t *testing.T) {
// It is up to the application to determine if it wants to try again. We punt to
// the application because there is no clear recovery path in the case of failed transactions
// or batch operations and because automatic retry is tricky and we don't want to get
// it wrong at such an importaint layer of the stack.
// it wrong at such an important layer of the stack.
rows, err = tx.Query(ctx, getSQL, 1)
require.NoError(t, err)
rows.Next()
Expand Down Expand Up @@ -1397,7 +1397,7 @@ func TestStmtCacheInvalidationConnWithBatch(t *testing.T) {
// It is up to the application to determine if it wants to try again. We punt to
// the application because there is no clear recovery path in the case of failed transactions
// or batch operations and because automatic retry is tricky and we don't want to get
// it wrong at such an importaint layer of the stack.
// it wrong at such an important layer of the stack.
batch := &pgx.Batch{}
batch.Queue(getSQL, 1)
br := conn.SendBatch(ctx, batch)
Expand Down Expand Up @@ -1476,7 +1476,7 @@ func TestStmtCacheInvalidationTxWithBatch(t *testing.T) {
// It is up to the application to determine if it wants to try again. We punt to
// the application because there is no clear recovery path in the case of failed transactions
// or batch operations and because automatic retry is tricky and we don't want to get
// it wrong at such an importaint layer of the stack.
// it wrong at such an important layer of the stack.
batch := &pgx.Batch{}
batch.Queue(getSQL, 1)
br := tx.SendBatch(ctx, batch)
Expand Down Expand Up @@ -1564,7 +1564,7 @@ func TestStmtCacheInvalidationExec(t *testing.T) {
// It is up to the application to determine if it wants to try again. We punt to
// the application because there is no clear recovery path in the case of failed transactions
// or batch operations and because automatic retry is tricky and we don't want to get
// it wrong at such an importaint layer of the stack.
// it wrong at such an important layer of the stack.
_, err = conn.Exec(ctx, insertSQL, true, 2)
require.ErrorContains(t, err, "failed to encode args[0]")

Expand Down
2 changes: 1 addition & 1 deletion derived_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func (c *Conn) LoadTypes(ctx context.Context, typeNames []string) ([]*pgtype.Typ
return nil, fmt.Errorf("Unknown typtype %q was found while registering %q", ti.Typtype, ti.TypeName)
}

// the type_ is imposible to be null
// the type_ is impossible to be null
m.RegisterType(type_)
if ti.NspName != "" {
nspType := &pgtype.Type{Name: ti.NspName + "." + type_.Name, OID: type_.OID, Codec: type_.Codec}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ for i in "${!commits[@]}"; do
exit 1
}

# Sanitized commmit message
# Sanitized commit message
commit_message=$(git log -1 --pretty=format:"%s" | tr -c '[:alnum:]-_' '_')

# Benchmark data will go there
Expand Down
4 changes: 2 additions & 2 deletions pgconn/pgconn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ func TestConnDeallocateSucceedsInAbortedTransaction(t *testing.T) {
ensureConnValid(t, pgConn)
}

func TestConnDeallocateNonExistantStatementSucceeds(t *testing.T) {
func TestConnDeallocateNonExistentStatementSucceeds(t *testing.T) {
t.Parallel()

ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
Expand Down Expand Up @@ -3700,7 +3700,7 @@ func TestConnOnPgError(t *testing.T) {
assert.Error(t, err)
assert.False(t, pgConn.IsClosed())

_, err = pgConn.Exec(ctx, "select * from non_existant_table").ReadAll()
_, err = pgConn.Exec(ctx, "select * from non_existent_table").ReadAll()
assert.Error(t, err)
assert.True(t, pgConn.IsClosed())
}
Expand Down
2 changes: 1 addition & 1 deletion pgtype/composite.go
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ type CompositeBinaryScanner struct {
err error
}

// NewCompositeBinaryScanner a scanner over a binary encoded composite balue.
// NewCompositeBinaryScanner a scanner over a binary encoded composite value.
func NewCompositeBinaryScanner(m *Map, src []byte) *CompositeBinaryScanner {
rp := 0
if len(src[rp:]) < 4 {
Expand Down
4 changes: 2 additions & 2 deletions pgtype/timestamp.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ func (ts *Timestamp) UnmarshalJSON(b []byte) error {
case "-infinity":
*ts = Timestamp{Valid: true, InfinityModifier: -Infinity}
default:
// Parse time with or without timezonr
// Parse time with or without timezone
tss := *s
// PostgreSQL uses ISO 8601 without timezone for to_json function and casting from a string to timestampt
// PostgreSQL uses ISO 8601 without timezone for to_json function and casting from a string to timestamp
tim, err := time.Parse(time.RFC3339Nano, tss)
if err == nil {
*ts = Timestamp{Time: tim, Valid: true}
Expand Down