summaryrefslogtreecommitdiff
path: root/vendor/github.com/ncruces/go-sqlite3/driver/driver.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2025-02-13 08:53:40 +0000
committerLibravatar GitHub <noreply@github.com>2025-02-13 09:53:40 +0100
commit24f6760c0e355903458f71e539201c8bf37cfac6 (patch)
treec5f43e72ba452fddceb3c2531a64d4b835246927 /vendor/github.com/ncruces/go-sqlite3/driver/driver.go
parent[feature] Implement backfilling statuses thru scheduled_at (#3685) (diff)
downloadgotosocial-24f6760c0e355903458f71e539201c8bf37cfac6.tar.xz
[chore] bump ncruces go-sqlite3 => v0.23.0 (#3785)
* bump ncruces go-sqlite3 => v0.23.0 * whoops, add missing vendor changes...
Diffstat (limited to 'vendor/github.com/ncruces/go-sqlite3/driver/driver.go')
-rw-r--r--vendor/github.com/ncruces/go-sqlite3/driver/driver.go28
1 files changed, 15 insertions, 13 deletions
diff --git a/vendor/github.com/ncruces/go-sqlite3/driver/driver.go b/vendor/github.com/ncruces/go-sqlite3/driver/driver.go
index 742f308af..21799aeb2 100644
--- a/vendor/github.com/ncruces/go-sqlite3/driver/driver.go
+++ b/vendor/github.com/ncruces/go-sqlite3/driver/driver.go
@@ -201,7 +201,7 @@ func (n *connector) Driver() driver.Driver {
return &SQLite{}
}
-func (n *connector) Connect(ctx context.Context) (res driver.Conn, err error) {
+func (n *connector) Connect(ctx context.Context) (ret driver.Conn, err error) {
c := &conn{
txLock: n.txLock,
tmRead: n.tmRead,
@@ -213,7 +213,7 @@ func (n *connector) Connect(ctx context.Context) (res driver.Conn, err error) {
return nil, err
}
defer func() {
- if res == nil {
+ if ret == nil {
c.Close()
}
}()
@@ -466,8 +466,9 @@ func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (drive
old := s.Stmt.Conn().SetInterrupt(ctx)
defer s.Stmt.Conn().SetInterrupt(old)
- err = s.Stmt.Exec()
- s.Stmt.ClearBindings()
+ err = errors.Join(
+ s.Stmt.Exec(),
+ s.Stmt.ClearBindings())
if err != nil {
return nil, err
}
@@ -604,8 +605,9 @@ var (
)
func (r *rows) Close() error {
- r.Stmt.ClearBindings()
- return r.Stmt.Reset()
+ return errors.Join(
+ r.Stmt.Reset(),
+ r.Stmt.ClearBindings())
}
func (r *rows) Columns() []string {
@@ -718,19 +720,19 @@ func (r *rows) ColumnTypeScanType(index int) (typ reflect.Type) {
switch scan {
case _INT:
- return reflect.TypeOf(int64(0))
+ return reflect.TypeFor[int64]()
case _REAL:
- return reflect.TypeOf(float64(0))
+ return reflect.TypeFor[float64]()
case _TEXT:
- return reflect.TypeOf("")
+ return reflect.TypeFor[string]()
case _BLOB:
- return reflect.TypeOf([]byte{})
+ return reflect.TypeFor[[]byte]()
case _BOOL:
- return reflect.TypeOf(false)
+ return reflect.TypeFor[bool]()
case _TIME:
- return reflect.TypeOf(time.Time{})
+ return reflect.TypeFor[time.Time]()
default:
- return reflect.TypeOf((*any)(nil)).Elem()
+ return reflect.TypeFor[any]()
}
}