mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 18:32:26 -05:00
[chore] update dependencies (#4422)
- github.com/jackc/pgx/v5 v5.7.5 -> v5.7.6 - github.com/ncruces/go-sqlite3 v0.28.0 -> v0.29.0 - github.com/tdewolff/minify/v2 v2.24.2 -> v2.24.3 - golang.org/x/oauth2 v0.30.0 -> v0.31.0 - golang.org/x/sys v0.35.0 -> v0.36.0 - golang.org/x/text v0.28.0 -> v0.29.0 Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4422 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
This commit is contained in:
parent
9b7db51436
commit
a6429b5410
78 changed files with 1439 additions and 1189 deletions
30
vendor/github.com/jackc/pgx/v5/stdlib/sql.go
generated
vendored
30
vendor/github.com/jackc/pgx/v5/stdlib/sql.go
generated
vendored
|
|
@ -471,7 +471,8 @@ func (c *Conn) ExecContext(ctx context.Context, query string, argsV []driver.Nam
|
|||
return nil, driver.ErrBadConn
|
||||
}
|
||||
|
||||
args := namedValueToInterface(argsV)
|
||||
args := make([]any, len(argsV))
|
||||
convertNamedArguments(args, argsV)
|
||||
|
||||
commandTag, err := c.conn.Exec(ctx, query, args...)
|
||||
// if we got a network error before we had a chance to send the query, retry
|
||||
|
|
@ -488,8 +489,9 @@ func (c *Conn) QueryContext(ctx context.Context, query string, argsV []driver.Na
|
|||
return nil, driver.ErrBadConn
|
||||
}
|
||||
|
||||
args := []any{databaseSQLResultFormats}
|
||||
args = append(args, namedValueToInterface(argsV)...)
|
||||
args := make([]any, 1+len(argsV))
|
||||
args[0] = databaseSQLResultFormats
|
||||
convertNamedArguments(args[1:], argsV)
|
||||
|
||||
rows, err := c.conn.Query(ctx, query, args...)
|
||||
if err != nil {
|
||||
|
|
@ -848,28 +850,14 @@ func (r *Rows) Next(dest []driver.Value) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func valueToInterface(argsV []driver.Value) []any {
|
||||
args := make([]any, 0, len(argsV))
|
||||
for _, v := range argsV {
|
||||
if v != nil {
|
||||
args = append(args, v.(any))
|
||||
} else {
|
||||
args = append(args, nil)
|
||||
}
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
func namedValueToInterface(argsV []driver.NamedValue) []any {
|
||||
args := make([]any, 0, len(argsV))
|
||||
for _, v := range argsV {
|
||||
func convertNamedArguments(args []any, argsV []driver.NamedValue) {
|
||||
for i, v := range argsV {
|
||||
if v.Value != nil {
|
||||
args = append(args, v.Value.(any))
|
||||
args[i] = v.Value.(any)
|
||||
} else {
|
||||
args = append(args, nil)
|
||||
args[i] = nil
|
||||
}
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
type wrapTx struct {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue