diff options
author | 2024-03-08 11:45:15 +0100 | |
---|---|---|
committer | 2024-03-08 11:45:15 +0100 | |
commit | ebdee5aed862e88e26426b05e50f730c3049a0d7 (patch) | |
tree | b1b25919fb3afb4068f767213624e329ca31499c /vendor/modernc.org/sqlite/sqlite.go | |
parent | [docs] Add note about privileged ports (#2735) (diff) | |
download | gotosocial-ebdee5aed862e88e26426b05e50f730c3049a0d7.tar.xz |
[chore] Downgrade sqlite v1.29.2 -> v1.28.0 (#2736)
* [chore] Downgrade sqlite v1.29.2 -> v1.29.0
* go down to v1.28.0
Diffstat (limited to 'vendor/modernc.org/sqlite/sqlite.go')
-rw-r--r-- | vendor/modernc.org/sqlite/sqlite.go | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/vendor/modernc.org/sqlite/sqlite.go b/vendor/modernc.org/sqlite/sqlite.go index 86f5eddf6..9763713fa 100644 --- a/vendor/modernc.org/sqlite/sqlite.go +++ b/vendor/modernc.org/sqlite/sqlite.go @@ -492,23 +492,10 @@ func toNamedValues(vals []driver.Value) (r []driver.NamedValue) { func (s *stmt) exec(ctx context.Context, args []driver.NamedValue) (r driver.Result, err error) { var pstmt uintptr var done int32 - if ctx != nil { - if ctxDone := ctx.Done(); ctxDone != nil { - select { - case <-ctxDone: - return nil, ctx.Err() - default: - } - defer interruptOnDone(ctx, s.c, &done)() - } + if ctx != nil && ctx.Done() != nil { + defer interruptOnDone(ctx, s.c, &done)() } - defer func() { - if ctx != nil && atomic.LoadInt32(&done) != 0 { - r, err = nil, ctx.Err() - } - }() - for psql := s.psql; *(*byte)(unsafe.Pointer(psql)) != 0 && atomic.LoadInt32(&done) == 0; { if pstmt, err = s.c.prepareV2(&psql); err != nil { return nil, err @@ -545,7 +532,7 @@ func (s *stmt) exec(ctx context.Context, args []driver.NamedValue) (r driver.Res switch rc & 0xff { case sqlite3.SQLITE_DONE, sqlite3.SQLITE_ROW: - r, err = newResult(s.c) + // nop default: return s.c.errstr(int32(rc)) } @@ -561,7 +548,7 @@ func (s *stmt) exec(ctx context.Context, args []driver.NamedValue) (r driver.Res return nil, err } } - return r, err + return newResult(s.c) } // NumInput returns the number of placeholder parameters. @@ -589,23 +576,14 @@ func (s *stmt) Query(args []driver.Value) (driver.Rows, error) { //TODO StmtQuer func (s *stmt) query(ctx context.Context, args []driver.NamedValue) (r driver.Rows, err error) { var pstmt uintptr var done int32 - if ctx != nil { - if ctxDone := ctx.Done(); ctxDone != nil { - select { - case <-ctxDone: - return nil, ctx.Err() - default: - } - defer interruptOnDone(ctx, s.c, &done)() - } + if ctx != nil && ctx.Done() != nil { + defer interruptOnDone(ctx, s.c, &done)() } var allocs []uintptr defer func() { - if ctx != nil && atomic.LoadInt32(&done) != 0 { - r, err = nil, ctx.Err() - } else if r == nil && err == nil { + if r == nil && err == nil { r, err = newRows(s.c, pstmt, allocs, true) } }() |