diff options
31 files changed, 274 insertions, 171 deletions
@@ -44,7 +44,7 @@ require ( github.com/miekg/dns v1.1.62 github.com/minio/minio-go/v7 v7.0.77 github.com/mitchellh/mapstructure v1.5.0 - github.com/ncruces/go-sqlite3 v0.18.4 + github.com/ncruces/go-sqlite3 v0.19.0 github.com/oklog/ulid v1.3.1 github.com/prometheus/client_golang v1.20.4 github.com/spf13/cobra v1.8.1 @@ -434,8 +434,8 @@ github.com/moul/http2curl v1.0.0 h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs= github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/ncruces/go-sqlite3 v0.18.4 h1:Je8o3y33MDwPYY/Cacas8yCsuoUzpNY/AgoSlN2ekyE= -github.com/ncruces/go-sqlite3 v0.18.4/go.mod h1:4HLag13gq1k10s4dfGBhMfRVsssJRT9/5hYqVM9RUYo= +github.com/ncruces/go-sqlite3 v0.19.0 h1:yebbD/cP8Gf+7nKoUin2ATjnqJK2VvyS30d3xsjRp5k= +github.com/ncruces/go-sqlite3 v0.19.0/go.mod h1:yL4ZNWGsr1/8pcLfpPW1RT1WFdvyeHonrgIwwi4rvkg= github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M= diff --git a/vendor/github.com/ncruces/go-sqlite3/blob.go b/vendor/github.com/ncruces/go-sqlite3/blob.go index 010948e88..268dfab0f 100644 --- a/vendor/github.com/ncruces/go-sqlite3/blob.go +++ b/vendor/github.com/ncruces/go-sqlite3/blob.go @@ -31,7 +31,6 @@ var _ io.ReadWriteSeeker = &Blob{} // // https://sqlite.org/c3ref/blob_open.html func (c *Conn) OpenBlob(db, table, column string, row int64, write bool) (*Blob, error) { - c.checkInterrupt() defer c.arena.mark()() blobPtr := c.arena.new(ptrlen) dbPtr := c.arena.string(db) @@ -43,6 +42,7 @@ func (c *Conn) OpenBlob(db, table, column string, row int64, write bool) (*Blob, flags = 1 } + c.checkInterrupt(c.handle) r := c.call("sqlite3_blob_open", uint64(c.handle), uint64(dbPtr), uint64(tablePtr), uint64(columnPtr), uint64(row), flags, uint64(blobPtr)) diff --git a/vendor/github.com/ncruces/go-sqlite3/config.go b/vendor/github.com/ncruces/go-sqlite3/config.go index 8a84bc91b..6876ba50c 100644 --- a/vendor/github.com/ncruces/go-sqlite3/config.go +++ b/vendor/github.com/ncruces/go-sqlite3/config.go @@ -284,7 +284,10 @@ func walCallback(ctx context.Context, mod api.Module, _, pDB, zSchema uint32, pa // // https://sqlite.org/c3ref/autovacuum_pages.html func (c *Conn) AutoVacuumPages(cb func(schema string, dbPages, freePages, bytesPerPage uint) uint) error { - funcPtr := util.AddHandle(c.ctx, cb) + var funcPtr uint32 + if cb != nil { + funcPtr = util.AddHandle(c.ctx, cb) + } r := c.call("sqlite3_autovacuum_pages_go", uint64(c.handle), uint64(funcPtr)) return c.error(r) } diff --git a/vendor/github.com/ncruces/go-sqlite3/conn.go b/vendor/github.com/ncruces/go-sqlite3/conn.go index 79b1dba9c..5dfaf9e5c 100644 --- a/vendor/github.com/ncruces/go-sqlite3/conn.go +++ b/vendor/github.com/ncruces/go-sqlite3/conn.go @@ -24,7 +24,7 @@ type Conn struct { pending *Stmt stmts []*Stmt timer *time.Timer - busy func(int) bool + busy func(context.Context, int) bool log func(xErrorCode, string) collation func(*Conn, string) wal func(*Conn, string, int) error @@ -38,14 +38,20 @@ type Conn struct { handle uint32 } -// Open calls [OpenFlags] with [OPEN_READWRITE], [OPEN_CREATE], [OPEN_URI] and [OPEN_NOFOLLOW]. +// Open calls [OpenFlags] with [OPEN_READWRITE], [OPEN_CREATE] and [OPEN_URI]. func Open(filename string) (*Conn, error) { - return newConn(filename, OPEN_READWRITE|OPEN_CREATE|OPEN_URI|OPEN_NOFOLLOW) + return newConn(context.Background(), filename, OPEN_READWRITE|OPEN_CREATE|OPEN_URI) +} + +// OpenContext is like [Open] but includes a context, +// which is used to interrupt the process of opening the connectiton. +func OpenContext(ctx context.Context, filename string) (*Conn, error) { + return newConn(ctx, filename, OPEN_READWRITE|OPEN_CREATE|OPEN_URI) } // OpenFlags opens an SQLite database file as specified by the filename argument. // -// If none of the required flags is used, a combination of [OPEN_READWRITE] and [OPEN_CREATE] is used. +// If none of the required flags are used, a combination of [OPEN_READWRITE] and [OPEN_CREATE] is used. // If a URI filename is used, PRAGMA statements to execute can be specified using "_pragma": // // sqlite3.Open("file:demo.db?_pragma=busy_timeout(10000)") @@ -55,25 +61,33 @@ func OpenFlags(filename string, flags OpenFlag) (*Conn, error) { if flags&(OPEN_READONLY|OPEN_READWRITE|OPEN_CREATE) == 0 { flags |= OPEN_READWRITE | OPEN_CREATE } - return newConn(filename, flags) + return newConn(context.Background(), filename, flags) } type connKey struct{} -func newConn(filename string, flags OpenFlag) (conn *Conn, err error) { - sqlite, err := instantiateSQLite() +func newConn(ctx context.Context, filename string, flags OpenFlag) (res *Conn, _ error) { + err := ctx.Err() + if err != nil { + return nil, err + } + + c := &Conn{interrupt: ctx} + c.sqlite, err = instantiateSQLite() if err != nil { return nil, err } defer func() { - if conn == nil { - sqlite.close() + if res == nil { + c.Close() + c.sqlite.close() + } else { + c.interrupt = context.Background() } }() - c := &Conn{sqlite: sqlite} - c.arena = c.newArena(1024) c.ctx = context.WithValue(c.ctx, connKey{}, c) + c.arena = c.newArena(1024) c.handle, err = c.openDB(filename, flags) if err == nil { err = initExtensions(c) @@ -98,6 +112,7 @@ func (c *Conn) openDB(filename string, flags OpenFlag) (uint32, error) { return 0, err } + c.call("sqlite3_progress_handler_go", uint64(handle), 100) if flags|OPEN_URI != 0 && strings.HasPrefix(filename, "file:") { var pragmas strings.Builder if _, after, ok := strings.Cut(filename, "?"); ok { @@ -109,6 +124,7 @@ func (c *Conn) openDB(filename string, flags OpenFlag) (uint32, error) { } } if pragmas.Len() != 0 { + c.checkInterrupt(handle) pragmaPtr := c.arena.string(pragmas.String()) r := c.call("sqlite3_exec", uint64(handle), uint64(pragmaPtr), 0, 0, 0) if err := c.sqlite.error(r, handle, pragmas.String()); err != nil { @@ -118,7 +134,6 @@ func (c *Conn) openDB(filename string, flags OpenFlag) (uint32, error) { } } } - c.call("sqlite3_progress_handler_go", uint64(handle), 100) return handle, nil } @@ -160,10 +175,10 @@ func (c *Conn) Close() error { // // https://sqlite.org/c3ref/exec.html func (c *Conn) Exec(sql string) error { - c.checkInterrupt() defer c.arena.mark()() sqlPtr := c.arena.string(sql) + c.checkInterrupt(c.handle) r := c.call("sqlite3_exec", uint64(c.handle), uint64(sqlPtr), 0, 0, 0) return c.error(r, sql) } @@ -301,8 +316,7 @@ func (c *Conn) ReleaseMemory() error { return c.error(r) } -// GetInterrupt gets the context set with [Conn.SetInterrupt], -// or nil if none was set. +// GetInterrupt gets the context set with [Conn.SetInterrupt]. func (c *Conn) GetInterrupt() context.Context { return c.interrupt } @@ -322,9 +336,11 @@ func (c *Conn) GetInterrupt() context.Context { // // https://sqlite.org/c3ref/interrupt.html func (c *Conn) SetInterrupt(ctx context.Context) (old context.Context) { - // Is it the same context? - if ctx == c.interrupt { - return ctx + old = c.interrupt + c.interrupt = ctx + + if ctx == old || ctx.Done() == old.Done() { + return old } // A busy SQL statement prevents SQLite from ignoring an interrupt @@ -333,32 +349,29 @@ func (c *Conn) SetInterrupt(ctx context.Context) (old context.Context) { defer c.arena.mark()() stmtPtr := c.arena.new(ptrlen) loopPtr := c.arena.string(`WITH RECURSIVE c(x) AS (VALUES(0) UNION ALL SELECT x FROM c) SELECT x FROM c`) - c.call("sqlite3_prepare_v3", uint64(c.handle), uint64(loopPtr), math.MaxUint64, 0, uint64(stmtPtr), 0) + c.call("sqlite3_prepare_v3", uint64(c.handle), uint64(loopPtr), math.MaxUint64, + uint64(PREPARE_PERSISTENT), uint64(stmtPtr), 0) c.pending = &Stmt{c: c} c.pending.handle = util.ReadUint32(c.mod, stmtPtr) } - old = c.interrupt - c.interrupt = ctx - - if old != nil && old.Done() != nil && (ctx == nil || ctx.Err() == nil) { + if old.Done() != nil && ctx.Err() == nil { c.pending.Reset() } - if ctx != nil && ctx.Done() != nil { + if ctx.Done() != nil { c.pending.Step() } return old } -func (c *Conn) checkInterrupt() { - if c.interrupt != nil && c.interrupt.Err() != nil { - c.call("sqlite3_interrupt", uint64(c.handle)) +func (c *Conn) checkInterrupt(handle uint32) { + if c.interrupt.Err() != nil { + c.call("sqlite3_interrupt", uint64(handle)) } } -func progressCallback(ctx context.Context, mod api.Module, pDB uint32) (interrupt uint32) { - if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.handle == pDB && - c.interrupt != nil && c.interrupt.Err() != nil { +func progressCallback(ctx context.Context, mod api.Module, _ uint32) (interrupt uint32) { + if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.interrupt.Err() != nil { interrupt = 1 } return interrupt @@ -373,9 +386,8 @@ func (c *Conn) BusyTimeout(timeout time.Duration) error { return c.error(r) } -func timeoutCallback(ctx context.Context, mod api.Module, pDB uint32, count, tmout int32) (retry uint32) { - if c, ok := ctx.Value(connKey{}).(*Conn); ok && - (c.interrupt == nil || c.interrupt.Err() == nil) { +func timeoutCallback(ctx context.Context, mod api.Module, count, tmout int32) (retry uint32) { + if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.interrupt.Err() == nil { const delays = "\x01\x02\x05\x0a\x0f\x14\x19\x19\x19\x32\x32\x64" const totals = "\x00\x01\x03\x08\x12\x21\x35\x4e\x67\x80\xb2\xe4" const ndelay = int32(len(delays) - 1) @@ -391,7 +403,7 @@ func timeoutCallback(ctx context.Context, mod api.Module, pDB uint32, count, tmo if delay = min(delay, tmout-prior); delay > 0 { delay := time.Duration(delay) * time.Millisecond - if c.interrupt == nil || c.interrupt.Done() == nil { + if c.interrupt.Done() == nil { time.Sleep(delay) return 1 } @@ -414,7 +426,7 @@ func timeoutCallback(ctx context.Context, mod api.Module, pDB uint32, count, tmo // BusyHandler registers a callback to handle [BUSY] errors. // // https://sqlite.org/c3ref/busy_handler.html -func (c *Conn) BusyHandler(cb func(count int) (retry bool)) error { +func (c *Conn) BusyHandler(cb func(ctx context.Context, count int) (retry bool)) error { var enable uint64 if cb != nil { enable = 1 @@ -428,9 +440,12 @@ func (c *Conn) BusyHandler(cb func(count int) (retry bool)) error { } func busyCallback(ctx context.Context, mod api.Module, pDB uint32, count int32) (retry uint32) { - if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.handle == pDB && c.busy != nil && - (c.interrupt == nil || c.interrupt.Err() == nil) { - if c.busy(int(count)) { + if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.handle == pDB && c.busy != nil { + interrupt := c.interrupt + if interrupt == nil { + interrupt = context.Background() + } + if interrupt.Err() == nil && c.busy(interrupt, int(count)) { retry = 1 } } diff --git a/vendor/github.com/ncruces/go-sqlite3/conn_iter.go b/vendor/github.com/ncruces/go-sqlite3/conn_iter.go index 81e2a720c..470f0ade2 100644 --- a/vendor/github.com/ncruces/go-sqlite3/conn_iter.go +++ b/vendor/github.com/ncruces/go-sqlite3/conn_iter.go @@ -1,4 +1,4 @@ -//go:build (go1.23 || goexperiment.rangefunc) && !vet +//go:build go1.23 package sqlite3 diff --git a/vendor/github.com/ncruces/go-sqlite3/conn_old.go b/vendor/github.com/ncruces/go-sqlite3/conn_old.go index 921011d80..4663fa04d 100644 --- a/vendor/github.com/ncruces/go-sqlite3/conn_old.go +++ b/vendor/github.com/ncruces/go-sqlite3/conn_old.go @@ -1,4 +1,4 @@ -//go:build !(go1.23 || goexperiment.rangefunc) || vet +//go:build !go1.23 package sqlite3 diff --git a/vendor/github.com/ncruces/go-sqlite3/driver/driver.go b/vendor/github.com/ncruces/go-sqlite3/driver/driver.go index 7e6fee9ea..88c4c50db 100644 --- a/vendor/github.com/ncruces/go-sqlite3/driver/driver.go +++ b/vendor/github.com/ncruces/go-sqlite3/driver/driver.go @@ -40,14 +40,14 @@ // When using a custom time struct, you'll have to implement // [database/sql/driver.Valuer] and [database/sql.Scanner]. // -// The Value method should ideally serialise to a time [format] supported by SQLite. +// The Value method should ideally encode to a time [format] supported by SQLite. // This ensures SQL date and time functions work as they should, // and that your schema works with other SQLite tools. // [sqlite3.TimeFormat.Encode] may help. // // The Scan method needs to take into account that the value it receives can be of differing types. // It can already be a [time.Time], if the driver decoded the value according to "_timefmt" rules. -// Or it can be a: string, int64, float64, []byte, nil, +// Or it can be a: string, int64, float64, []byte, or nil, // depending on the column type and what whoever wrote the value. // [sqlite3.TimeFormat.Decode] may help. // @@ -202,19 +202,19 @@ func (n *connector) Driver() driver.Driver { return n.driver } -func (n *connector) Connect(ctx context.Context) (_ driver.Conn, err error) { +func (n *connector) Connect(ctx context.Context) (res driver.Conn, err error) { c := &conn{ txLock: n.txLock, tmRead: n.tmRead, tmWrite: n.tmWrite, } - c.Conn, err = sqlite3.Open(n.name) + c.Conn, err = sqlite3.OpenContext(ctx, n.name) if err != nil { return nil, err } defer func() { - if err != nil { + if res == nil { c.Close() } }() @@ -239,6 +239,7 @@ func (n *connector) Connect(ctx context.Context) (_ driver.Conn, err error) { if err != nil { return nil, err } + defer s.Close() if s.Step() && s.ColumnBool(0) { c.readOnly = '1' } else { @@ -466,6 +467,7 @@ func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (drive defer s.Stmt.Conn().SetInterrupt(old) err = s.Stmt.Exec() + s.Stmt.ClearBindings() if err != nil { return nil, err } @@ -488,7 +490,7 @@ func (s *stmt) setupBindings(args []driver.NamedValue) (err error) { if arg.Name == "" { ids = append(ids, arg.Ordinal) } else { - for _, prefix := range []string{":", "@", "$"} { + for _, prefix := range [...]string{":", "@", "$"} { if id := s.Stmt.BindIndex(prefix + arg.Name); id != 0 { ids = append(ids, id) } @@ -522,9 +524,9 @@ func (s *stmt) setupBindings(args []driver.NamedValue) (err error) { default: panic(util.AssertErr()) } - } - if err != nil { - return err + if err != nil { + return err + } } } return nil @@ -595,10 +597,11 @@ func (r *rows) Close() error { func (r *rows) Columns() []string { if r.names == nil { count := r.Stmt.ColumnCount() - r.names = make([]string, count) - for i := range r.names { - r.names[i] = r.Stmt.ColumnName(i) + names := make([]string, count) + for i := range names { + names[i] = r.Stmt.ColumnName(i) } + r.names = names } return r.names } @@ -606,26 +609,29 @@ func (r *rows) Columns() []string { func (r *rows) loadTypes() { if r.nulls == nil { count := r.Stmt.ColumnCount() - r.nulls = make([]bool, count) - r.types = make([]string, count) - for i := range r.nulls { + nulls := make([]bool, count) + types := make([]string, count) + for i := range nulls { if col := r.Stmt.ColumnOriginName(i); col != "" { - r.types[i], _, r.nulls[i], _, _, _ = r.Stmt.Conn().TableColumnMetadata( + types[i], _, nulls[i], _, _, _ = r.Stmt.Conn().TableColumnMetadata( r.Stmt.ColumnDatabaseName(i), r.Stmt.ColumnTableName(i), col) } } + r.nulls = nulls + r.types = types } } func (r *rows) declType(index int) string { if r.types == nil { count := r.Stmt.ColumnCount() - r.types = make([]string, count) - for i := range r.types { - r.types[i] = strings.ToUpper(r.Stmt.ColumnDeclType(i)) + types := make([]string, count) + for i := range types { + types[i] = strings.ToUpper(r.Stmt.ColumnDeclType(i)) } + r.types = types } return r.types[index] } @@ -665,27 +671,23 @@ func (r *rows) Next(dest []driver.Value) error { for i := range dest { if t, ok := r.decodeTime(i, dest[i]); ok { dest[i] = t - continue - } - if s, ok := dest[i].(string); ok { - t, ok := maybeTime(s) - if ok { - dest[i] = t - } } } return err } func (r *rows) decodeTime(i int, v any) (_ time.Time, ok bool) { - switch r.tmRead { - case sqlite3.TimeFormatDefault, time.RFC3339Nano: - // handled by maybeTime - return - } - switch v.(type) { - case int64, float64, string: + switch v := v.(type) { + case int64, float64: // could be a time value + case string: + if r.tmWrite != "" && r.tmWrite != time.RFC3339 && r.tmWrite != time.RFC3339Nano { + break + } + t, ok := maybeTime(v) + if ok { + return t, true + } default: return } diff --git a/vendor/github.com/ncruces/go-sqlite3/embed/README.md b/vendor/github.com/ncruces/go-sqlite3/embed/README.md index fc56933b7..b2074a71c 100644 --- a/vendor/github.com/ncruces/go-sqlite3/embed/README.md +++ b/vendor/github.com/ncruces/go-sqlite3/embed/README.md @@ -9,6 +9,7 @@ The following optional features are compiled in: - [JSON](https://sqlite.org/json1.html) - [R*Tree](https://sqlite.org/rtree.html) - [GeoPoly](https://sqlite.org/geopoly.html) +- [Spellfix1](https://sqlite.org/spellfix1.html) - [soundex](https://sqlite.org/lang_corefunc.html#soundex) - [stat4](https://sqlite.org/compile.html#enable_stat4) - [base64](https://github.com/sqlite/sqlite/blob/master/ext/misc/base64.c) diff --git a/vendor/github.com/ncruces/go-sqlite3/embed/build.sh b/vendor/github.com/ncruces/go-sqlite3/embed/build.sh index 6141efd57..ed2aaec53 100644 --- a/vendor/github.com/ncruces/go-sqlite3/embed/build.sh +++ b/vendor/github.com/ncruces/go-sqlite3/embed/build.sh @@ -14,7 +14,7 @@ trap 'rm -f sqlite3.tmp' EXIT -o sqlite3.wasm "$ROOT/sqlite3/main.c" \ -I"$ROOT/sqlite3" \ -mexec-model=reactor \ - -matomics -msimd128 -mmutable-globals \ + -matomics -msimd128 -mmutable-globals -mmultivalue \ -mbulk-memory -mreference-types \ -mnontrapping-fptoint -msign-ext \ -fno-stack-protector -fno-stack-clash-protection \ diff --git a/vendor/github.com/ncruces/go-sqlite3/embed/exports.txt b/vendor/github.com/ncruces/go-sqlite3/embed/exports.txt index b624ee1f3..546019552 100644 --- a/vendor/github.com/ncruces/go-sqlite3/embed/exports.txt +++ b/vendor/github.com/ncruces/go-sqlite3/embed/exports.txt @@ -51,6 +51,7 @@ sqlite3_create_collation_go sqlite3_create_function_go sqlite3_create_module_go sqlite3_create_window_function_go +sqlite3_data_count sqlite3_database_file_object sqlite3_db_cacheflush sqlite3_db_config diff --git a/vendor/github.com/ncruces/go-sqlite3/embed/sqlite3.wasm b/vendor/github.com/ncruces/go-sqlite3/embed/sqlite3.wasm Binary files differindex 6b1805778..749a6edba 100644 --- a/vendor/github.com/ncruces/go-sqlite3/embed/sqlite3.wasm +++ b/vendor/github.com/ncruces/go-sqlite3/embed/sqlite3.wasm diff --git a/vendor/github.com/ncruces/go-sqlite3/func.go b/vendor/github.com/ncruces/go-sqlite3/func.go index ab486e79a..7ff740df2 100644 --- a/vendor/github.com/ncruces/go-sqlite3/func.go +++ b/vendor/github.com/ncruces/go-sqlite3/func.go @@ -33,16 +33,23 @@ func (c *Conn) CollationNeeded(cb func(db *Conn, name string)) error { // one or more unknown collating sequences. func (c Conn) AnyCollationNeeded() error { r := c.call("sqlite3_anycollseq_init", uint64(c.handle), 0, 0) - return c.error(r) + if err := c.error(r); err != nil { + return err + } + c.collation = nil + return nil } // CreateCollation defines a new collating sequence. // // https://sqlite.org/c3ref/create_collation.html func (c *Conn) CreateCollation(name string, fn func(a, b []byte) int) error { + var funcPtr uint32 defer c.arena.mark()() namePtr := c.arena.string(name) - funcPtr := util.AddHandle(c.ctx, fn) + if fn != nil { + funcPtr = util.AddHandle(c.ctx, fn) + } r := c.call("sqlite3_create_collation_go", uint64(c.handle), uint64(namePtr), uint64(funcPtr)) return c.error(r) @@ -52,9 +59,12 @@ func (c *Conn) CreateCollation(name string, fn func(a, b []byte) int) error { // // https://sqlite.org/c3ref/create_function.html func (c *Conn) CreateFunction(name string, nArg int, flag FunctionFlag, fn ScalarFunction) error { + var funcPtr uint32 defer c.arena.mark()() namePtr := c.arena.string(name) - funcPtr := util.AddHandle(c.ctx, fn) + if fn != nil { + funcPtr = util.AddHandle(c.ctx, fn) + } r := c.call("sqlite3_create_function_go", uint64(c.handle), uint64(namePtr), uint64(nArg), uint64(flag), uint64(funcPtr)) @@ -71,10 +81,13 @@ type ScalarFunction func(ctx Context, arg ...Value) // // https://sqlite.org/c3ref/create_function.html func (c *Conn) CreateWindowFunction(name string, nArg int, flag FunctionFlag, fn func() AggregateFunction) error { + var funcPtr uint32 defer c.arena.mark()() - call := "sqlite3_create_aggregate_function_go" namePtr := c.arena.string(name) - funcPtr := util.AddHandle(c.ctx, fn) + if fn != nil { + funcPtr = util.AddHandle(c.ctx, fn) + } + call := "sqlite3_create_aggregate_function_go" if _, ok := fn().(WindowFunction); ok { call = "sqlite3_create_window_function_go" } @@ -184,11 +197,12 @@ func callbackAggregate(db *Conn, pAgg, pApp uint32) (AggregateFunction, uint32) // We need to create the aggregate. fn := util.GetHandle(db.ctx, pApp).(func() AggregateFunction)() - handle := util.AddHandle(db.ctx, fn) if pAgg != 0 { + handle := util.AddHandle(db.ctx, fn) util.WriteUint32(db.mod, pAgg, handle) + return fn, handle } - return fn, handle + return fn, 0 } func callbackArgs(db *Conn, arg []Value, pArg uint32) { diff --git a/vendor/github.com/ncruces/go-sqlite3/go.work.sum b/vendor/github.com/ncruces/go-sqlite3/go.work.sum index 085f015b8..52265b555 100644 --- a/vendor/github.com/ncruces/go-sqlite3/go.work.sum +++ b/vendor/github.com/ncruces/go-sqlite3/go.work.sum @@ -1,10 +1,13 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= diff --git a/vendor/github.com/ncruces/go-sqlite3/internal/alloc/alloc_unix.go b/vendor/github.com/ncruces/go-sqlite3/internal/alloc/alloc_unix.go index 009cc1f0b..c05cfa735 100644 --- a/vendor/github.com/ncruces/go-sqlite3/internal/alloc/alloc_unix.go +++ b/vendor/github.com/ncruces/go-sqlite3/internal/alloc/alloc_unix.go @@ -47,7 +47,7 @@ func (m *mmappedMemory) Reallocate(size uint64) []byte { // Commit additional memory up to new bytes. err := unix.Mprotect(m.buf[com:new], unix.PROT_READ|unix.PROT_WRITE) if err != nil { - panic(err) + return nil } // Update committed memory. diff --git a/vendor/github.com/ncruces/go-sqlite3/internal/alloc/alloc_windows.go b/vendor/github.com/ncruces/go-sqlite3/internal/alloc/alloc_windows.go index 62d499649..46181b118 100644 --- a/vendor/github.com/ncruces/go-sqlite3/internal/alloc/alloc_windows.go +++ b/vendor/github.com/ncruces/go-sqlite3/internal/alloc/alloc_windows.go @@ -56,7 +56,7 @@ func (m *virtualMemory) Reallocate(size uint64) []byte { // Commit additional memory up to new bytes. _, err := windows.VirtualAlloc(m.addr, uintptr(new), windows.MEM_COMMIT, windows.PAGE_READWRITE) if err != nil { - panic(err) + return nil } // Update committed memory. diff --git a/vendor/github.com/ncruces/go-sqlite3/internal/util/func.go b/vendor/github.com/ncruces/go-sqlite3/internal/util/func.go index be7a47c2f..468ff741c 100644 --- a/vendor/github.com/ncruces/go-sqlite3/internal/util/func.go +++ b/vendor/github.com/ncruces/go-sqlite3/internal/util/func.go @@ -26,6 +26,7 @@ func ExportFuncVI[T0 i32](mod wazero.HostModuleBuilder, name string, fn func(con type funcVII[T0, T1 i32] func(context.Context, api.Module, T0, T1) func (fn funcVII[T0, T1]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[1] // prevent bounds check on every slice access fn(ctx, mod, T0(stack[0]), T1(stack[1])) } @@ -39,6 +40,7 @@ func ExportFuncVII[T0, T1 i32](mod wazero.HostModuleBuilder, name string, fn fun type funcVIII[T0, T1, T2 i32] func(context.Context, api.Module, T0, T1, T2) func (fn funcVIII[T0, T1, T2]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[2] // prevent bounds check on every slice access fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2])) } @@ -52,6 +54,7 @@ func ExportFuncVIII[T0, T1, T2 i32](mod wazero.HostModuleBuilder, name string, f type funcVIIII[T0, T1, T2, T3 i32] func(context.Context, api.Module, T0, T1, T2, T3) func (fn funcVIIII[T0, T1, T2, T3]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[3] // prevent bounds check on every slice access fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2]), T3(stack[3])) } @@ -65,6 +68,7 @@ func ExportFuncVIIII[T0, T1, T2, T3 i32](mod wazero.HostModuleBuilder, name stri type funcVIIIII[T0, T1, T2, T3, T4 i32] func(context.Context, api.Module, T0, T1, T2, T3, T4) func (fn funcVIIIII[T0, T1, T2, T3, T4]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[4] // prevent bounds check on every slice access fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2]), T3(stack[3]), T4(stack[4])) } @@ -78,6 +82,7 @@ func ExportFuncVIIIII[T0, T1, T2, T3, T4 i32](mod wazero.HostModuleBuilder, name type funcVIIIIJ[T0, T1, T2, T3 i32, T4 i64] func(context.Context, api.Module, T0, T1, T2, T3, T4) func (fn funcVIIIIJ[T0, T1, T2, T3, T4]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[4] // prevent bounds check on every slice access fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2]), T3(stack[3]), T4(stack[4])) } @@ -104,6 +109,7 @@ func ExportFuncII[TR, T0 i32](mod wazero.HostModuleBuilder, name string, fn func type funcIII[TR, T0, T1 i32] func(context.Context, api.Module, T0, T1) TR func (fn funcIII[TR, T0, T1]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[1] // prevent bounds check on every slice access stack[0] = uint64(fn(ctx, mod, T0(stack[0]), T1(stack[1]))) } @@ -117,6 +123,7 @@ func ExportFuncIII[TR, T0, T1 i32](mod wazero.HostModuleBuilder, name string, fn type funcIIII[TR, T0, T1, T2 i32] func(context.Context, api.Module, T0, T1, T2) TR func (fn funcIIII[TR, T0, T1, T2]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[2] // prevent bounds check on every slice access stack[0] = uint64(fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2]))) } @@ -130,6 +137,7 @@ func ExportFuncIIII[TR, T0, T1, T2 i32](mod wazero.HostModuleBuilder, name strin type funcIIIII[TR, T0, T1, T2, T3 i32] func(context.Context, api.Module, T0, T1, T2, T3) TR func (fn funcIIIII[TR, T0, T1, T2, T3]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[3] // prevent bounds check on every slice access stack[0] = uint64(fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2]), T3(stack[3]))) } @@ -143,6 +151,7 @@ func ExportFuncIIIII[TR, T0, T1, T2, T3 i32](mod wazero.HostModuleBuilder, name type funcIIIIII[TR, T0, T1, T2, T3, T4 i32] func(context.Context, api.Module, T0, T1, T2, T3, T4) TR func (fn funcIIIIII[TR, T0, T1, T2, T3, T4]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[4] // prevent bounds check on every slice access stack[0] = uint64(fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2]), T3(stack[3]), T4(stack[4]))) } @@ -156,6 +165,7 @@ func ExportFuncIIIIII[TR, T0, T1, T2, T3, T4 i32](mod wazero.HostModuleBuilder, type funcIIIIIII[TR, T0, T1, T2, T3, T4, T5 i32] func(context.Context, api.Module, T0, T1, T2, T3, T4, T5) TR func (fn funcIIIIIII[TR, T0, T1, T2, T3, T4, T5]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[5] // prevent bounds check on every slice access stack[0] = uint64(fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2]), T3(stack[3]), T4(stack[4]), T5(stack[5]))) } @@ -169,6 +179,7 @@ func ExportFuncIIIIIII[TR, T0, T1, T2, T3, T4, T5 i32](mod wazero.HostModuleBuil type funcIIIIJ[TR, T0, T1, T2 i32, T3 i64] func(context.Context, api.Module, T0, T1, T2, T3) TR func (fn funcIIIIJ[TR, T0, T1, T2, T3]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[3] // prevent bounds check on every slice access stack[0] = uint64(fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2]), T3(stack[3]))) } @@ -182,6 +193,7 @@ func ExportFuncIIIIJ[TR, T0, T1, T2 i32, T3 i64](mod wazero.HostModuleBuilder, n type funcIIJ[TR, T0 i32, T1 i64] func(context.Context, api.Module, T0, T1) TR func (fn funcIIJ[TR, T0, T1]) Call(ctx context.Context, mod api.Module, stack []uint64) { + _ = stack[1] // prevent bounds check on every slice access stack[0] = uint64(fn(ctx, mod, T0(stack[0]), T1(stack[1]))) } diff --git a/vendor/github.com/ncruces/go-sqlite3/internal/util/handle.go b/vendor/github.com/ncruces/go-sqlite3/internal/util/handle.go index 4584324c1..e4e338549 100644 --- a/vendor/github.com/ncruces/go-sqlite3/internal/util/handle.go +++ b/vendor/github.com/ncruces/go-sqlite3/internal/util/handle.go @@ -35,17 +35,22 @@ func DelHandle(ctx context.Context, id uint32) error { s := ctx.Value(moduleKey{}).(*moduleState) a := s.handles[^id] s.handles[^id] = nil - s.holes++ + if l := uint32(len(s.handles)); l == ^id { + s.handles = s.handles[:l-1] + } else { + s.holes++ + } if c, ok := a.(io.Closer); ok { return c.Close() } return nil } -func AddHandle(ctx context.Context, a any) (id uint32) { +func AddHandle(ctx context.Context, a any) uint32 { if a == nil { panic(NilErr) } + s := ctx.Value(moduleKey{}).(*moduleState) // Find an empty slot. diff --git a/vendor/github.com/ncruces/go-sqlite3/quote.go b/vendor/github.com/ncruces/go-sqlite3/quote.go index d1cd6fa87..abe516deb 100644 --- a/vendor/github.com/ncruces/go-sqlite3/quote.go +++ b/vendor/github.com/ncruces/go-sqlite3/quote.go @@ -3,6 +3,7 @@ package sqlite3 import ( "bytes" "math" + "reflect" "strconv" "strings" "time" @@ -13,6 +14,9 @@ import ( // Quote escapes and quotes a value // making it safe to embed in SQL text. +// Strings with embedded NUL characters are truncated. +// +// https://sqlite.org/lang_corefunc.html#quote func Quote(value any) string { switch v := value.(type) { case nil: @@ -42,8 +46,8 @@ func Quote(value any) string { return "'" + v.Format(time.RFC3339Nano) + "'" case string: - if strings.IndexByte(v, 0) >= 0 { - break + if i := strings.IndexByte(v, 0); i >= 0 { + v = v[:i] } buf := make([]byte, 2+len(v)+strings.Count(v, "'")) @@ -57,13 +61,13 @@ func Quote(value any) string { buf[i] = b i += 1 } - buf[i] = '\'' + buf[len(buf)-1] = '\'' return unsafe.String(&buf[0], len(buf)) case []byte: buf := make([]byte, 3+2*len(v)) - buf[0] = 'x' buf[1] = '\'' + buf[0] = 'x' i := 2 for _, b := range v { const hex = "0123456789ABCDEF" @@ -71,26 +75,50 @@ func Quote(value any) string { buf[i+1] = hex[b%16] i += 2 } - buf[i] = '\'' + buf[len(buf)-1] = '\'' return unsafe.String(&buf[0], len(buf)) case ZeroBlob: - if v > ZeroBlob(1e9-3)/2 { - break - } - buf := bytes.Repeat([]byte("0"), int(3+2*int64(v))) - buf[0] = 'x' buf[1] = '\'' + buf[0] = 'x' buf[len(buf)-1] = '\'' return unsafe.String(&buf[0], len(buf)) } + v := reflect.ValueOf(value) + k := v.Kind() + + if k == reflect.Interface || k == reflect.Pointer { + if v.IsNil() { + return "NULL" + } + v = v.Elem() + k = v.Kind() + } + + switch { + case v.CanInt(): + return strconv.FormatInt(v.Int(), 10) + case v.CanUint(): + return strconv.FormatUint(v.Uint(), 10) + case v.CanFloat(): + return Quote(v.Float()) + case k == reflect.Bool: + return Quote(v.Bool()) + case k == reflect.String: + return Quote(v.String()) + case (k == reflect.Slice || k == reflect.Array && v.CanAddr()) && + v.Type().Elem().Kind() == reflect.Uint8: + return Quote(v.Bytes()) + } + panic(util.ValueErr) } // QuoteIdentifier escapes and quotes an identifier // making it safe to embed in SQL text. +// Strings with embedded NUL characters panic. func QuoteIdentifier(id string) string { if strings.IndexByte(id, 0) >= 0 { panic(util.ValueErr) @@ -107,6 +135,6 @@ func QuoteIdentifier(id string) string { buf[i] = b i += 1 } - buf[i] = '"' + buf[len(buf)-1] = '"' return unsafe.String(&buf[0], len(buf)) } diff --git a/vendor/github.com/ncruces/go-sqlite3/sqlite.go b/vendor/github.com/ncruces/go-sqlite3/sqlite.go index b8c06d618..a5ff1363b 100644 --- a/vendor/github.com/ncruces/go-sqlite3/sqlite.go +++ b/vendor/github.com/ncruces/go-sqlite3/sqlite.go @@ -131,7 +131,7 @@ func (sqlt *sqlite) error(rc uint64, handle uint32, sql ...string) error { err.msg = util.ReadString(sqlt.mod, uint32(r), _MAX_LENGTH) } - if sql != nil { + if len(sql) != 0 { if r := sqlt.call("sqlite3_error_offset", uint64(handle)); r != math.MaxUint32 { err.sql = sql[0][r:] } @@ -301,7 +301,7 @@ func (a *arena) string(s string) uint32 { func exportCallbacks(env wazero.HostModuleBuilder) wazero.HostModuleBuilder { util.ExportFuncII(env, "go_progress_handler", progressCallback) - util.ExportFuncIIII(env, "go_busy_timeout", timeoutCallback) + util.ExportFuncIII(env, "go_busy_timeout", timeoutCallback) util.ExportFuncIII(env, "go_busy_handler", busyCallback) util.ExportFuncII(env, "go_commit_hook", commitCallback) util.ExportFuncVI(env, "go_rollback_hook", rollbackCallback) diff --git a/vendor/github.com/ncruces/go-sqlite3/stmt.go b/vendor/github.com/ncruces/go-sqlite3/stmt.go index e5d72465a..9da2a2eaf 100644 --- a/vendor/github.com/ncruces/go-sqlite3/stmt.go +++ b/vendor/github.com/ncruces/go-sqlite3/stmt.go @@ -30,12 +30,13 @@ func (s *Stmt) Close() error { } r := s.c.call("sqlite3_finalize", uint64(s.handle)) - for i := range s.c.stmts { - if s == s.c.stmts[i] { - l := len(s.c.stmts) - 1 - s.c.stmts[i] = s.c.stmts[l] - s.c.stmts[l] = nil - s.c.stmts = s.c.stmts[:l] + stmts := s.c.stmts + for i := range stmts { + if s == stmts[i] { + l := len(stmts) - 1 + stmts[i] = stmts[l] + stmts[l] = nil + s.c.stmts = stmts[:l] break } } @@ -105,7 +106,7 @@ func (s *Stmt) Busy() bool { // // https://sqlite.org/c3ref/step.html func (s *Stmt) Step() bool { - s.c.checkInterrupt() + s.c.checkInterrupt(s.c.handle) r := s.c.call("sqlite3_step", uint64(s.handle)) switch r { case _ROW: @@ -376,6 +377,15 @@ func (s *Stmt) BindValue(param int, value Value) error { return s.c.error(r) } +// DataCount resets the number of columns in a result set. +// +// https://sqlite.org/c3ref/data_count.html +func (s *Stmt) DataCount() int { + r := s.c.call("sqlite3_data_count", + uint64(s.handle)) + return int(int32(r)) +} + // ColumnCount returns the number of columns in a result set. // // https://sqlite.org/c3ref/column_count.html @@ -630,7 +640,7 @@ func (s *Stmt) Columns(dest []any) error { defer s.c.arena.mark()() count := uint64(len(dest)) typePtr := s.c.arena.new(count) - dataPtr := s.c.arena.new(8 * count) + dataPtr := s.c.arena.new(count * 8) r := s.c.call("sqlite3_columns_go", uint64(s.handle), count, uint64(typePtr), uint64(dataPtr)) @@ -639,26 +649,31 @@ func (s *Stmt) Columns(dest []any) error { } types := util.View(s.c.mod, typePtr, count) + + // Avoid bounds checks on types below. + if len(types) != len(dest) { + panic(util.AssertErr()) + } + for i := range dest { switch types[i] { case byte(INTEGER): - dest[i] = int64(util.ReadUint64(s.c.mod, dataPtr+8*uint32(i))) - continue + dest[i] = int64(util.ReadUint64(s.c.mod, dataPtr)) case byte(FLOAT): - dest[i] = util.ReadFloat64(s.c.mod, dataPtr+8*uint32(i)) - continue + dest[i] = util.ReadFloat64(s.c.mod, dataPtr) case byte(NULL): dest[i] = nil - continue - } - ptr := util.ReadUint32(s.c.mod, dataPtr+8*uint32(i)+0) - len := util.ReadUint32(s.c.mod, dataPtr+8*uint32(i)+4) - buf := util.View(s.c.mod, ptr, uint64(len)) - if types[i] == byte(TEXT) { - dest[i] = string(buf) - } else { - dest[i] = buf + default: + ptr := util.ReadUint32(s.c.mod, dataPtr+0) + len := util.ReadUint32(s.c.mod, dataPtr+4) + buf := util.View(s.c.mod, ptr, uint64(len)) + if types[i] == byte(TEXT) { + dest[i] = string(buf) + } else { + dest[i] = buf + } } + dataPtr += 8 } return nil } diff --git a/vendor/github.com/ncruces/go-sqlite3/time.go b/vendor/github.com/ncruces/go-sqlite3/time.go index 0164a307b..d9c516c81 100644 --- a/vendor/github.com/ncruces/go-sqlite3/time.go +++ b/vendor/github.com/ncruces/go-sqlite3/time.go @@ -138,6 +138,9 @@ func (f TimeFormat) Encode(t time.Time) any { // // https://sqlite.org/lang_datefunc.html func (f TimeFormat) Decode(v any) (time.Time, error) { + if t, ok := v.(time.Time); ok { + return t, nil + } switch f { // Numeric formats. case TimeFormatJulianDay: diff --git a/vendor/github.com/ncruces/go-sqlite3/txn.go b/vendor/github.com/ncruces/go-sqlite3/txn.go index 7121778d6..bd24724ea 100644 --- a/vendor/github.com/ncruces/go-sqlite3/txn.go +++ b/vendor/github.com/ncruces/go-sqlite3/txn.go @@ -3,7 +3,6 @@ package sqlite3 import ( "context" "errors" - "fmt" "math/rand" "runtime" "strconv" @@ -136,23 +135,21 @@ type Savepoint struct { // // https://sqlite.org/lang_savepoint.html func (c *Conn) Savepoint() Savepoint { - // Names can be reused; this makes catching bugs more likely. - name := saveptName() + "_" + strconv.Itoa(int(rand.Int31())) + name := callerName() + if name == "" { + name = "sqlite3.Savepoint" + } + // Names can be reused, but this makes catching bugs more likely. + name = QuoteIdentifier(name + "_" + strconv.Itoa(int(rand.Int31()))) - err := c.txnExecInterrupted(fmt.Sprintf("SAVEPOINT %q;", name)) + err := c.txnExecInterrupted("SAVEPOINT " + name) if err != nil { panic(err) } return Savepoint{c: c, name: name} } -func saveptName() (name string) { - defer func() { - if name == "" { - name = "sqlite3.Savepoint" - } - }() - +func callerName() (name string) { var pc [8]uintptr n := runtime.Callers(3, pc[:]) if n <= 0 { @@ -189,7 +186,7 @@ func (s Savepoint) Release(errp *error) { if s.c.GetAutocommit() { // There is nothing to commit. return } - *errp = s.c.Exec(fmt.Sprintf("RELEASE %q;", s.name)) + *errp = s.c.Exec("RELEASE " + s.name) if *errp == nil { return } @@ -201,10 +198,8 @@ func (s Savepoint) Release(errp *error) { return } // ROLLBACK and RELEASE even if interrupted. - err := s.c.txnExecInterrupted(fmt.Sprintf(` - ROLLBACK TO %[1]q; - RELEASE %[1]q; - `, s.name)) + err := s.c.txnExecInterrupted("ROLLBACK TO " + + s.name + "; RELEASE " + s.name) if err != nil { panic(err) } @@ -217,7 +212,7 @@ func (s Savepoint) Release(errp *error) { // https://sqlite.org/lang_transaction.html func (s Savepoint) Rollback() error { // ROLLBACK even if interrupted. - return s.c.txnExecInterrupted(fmt.Sprintf("ROLLBACK TO %q;", s.name)) + return s.c.txnExecInterrupted("ROLLBACK TO " + s.name) } func (c *Conn) txnExecInterrupted(sql string) error { diff --git a/vendor/github.com/ncruces/go-sqlite3/util/osutil/open_windows.go b/vendor/github.com/ncruces/go-sqlite3/util/osutil/open_windows.go index 277f58bc3..417faa562 100644 --- a/vendor/github.com/ncruces/go-sqlite3/util/osutil/open_windows.go +++ b/vendor/github.com/ncruces/go-sqlite3/util/osutil/open_windows.go @@ -15,7 +15,7 @@ func OpenFile(name string, flag int, perm fs.FileMode) (*os.File, error) { if name == "" { return nil, &os.PathError{Op: "open", Path: name, Err: ENOENT} } - r, e := syscallOpen(name, flag, uint32(perm.Perm())) + r, e := syscallOpen(name, flag|O_CLOEXEC, uint32(perm.Perm())) if e != nil { return nil, &os.PathError{Op: "open", Path: name, Err: e} } diff --git a/vendor/github.com/ncruces/go-sqlite3/vfs/file.go b/vendor/github.com/ncruces/go-sqlite3/vfs/file.go index 176b2507b..ebd42e9ad 100644 --- a/vendor/github.com/ncruces/go-sqlite3/vfs/file.go +++ b/vendor/github.com/ncruces/go-sqlite3/vfs/file.go @@ -19,17 +19,18 @@ func (vfsOS) FullPathname(path string) (string, error) { if err != nil { return "", err } - fi, err := os.Lstat(path) + return path, testSymlinks(filepath.Dir(path)) +} + +func testSymlinks(path string) error { + p, err := filepath.EvalSymlinks(path) if err != nil { - if errors.Is(err, fs.ErrNotExist) { - return path, nil - } - return "", err + return err } - if fi.Mode()&fs.ModeSymlink != 0 { - err = _OK_SYMLINK + if p != path { + return _OK_SYMLINK } - return path, err + return nil } func (vfsOS) Delete(path string, syncDir bool) error { @@ -74,7 +75,7 @@ func (vfsOS) Open(name string, flags OpenFlag) (File, OpenFlag, error) { } func (vfsOS) OpenFilename(name *Filename, flags OpenFlag) (File, OpenFlag, error) { - var oflags int + oflags := _O_NOFOLLOW if flags&OPEN_EXCLUSIVE != 0 { oflags |= os.O_EXCL } diff --git a/vendor/github.com/ncruces/go-sqlite3/vfs/memdb/api.go b/vendor/github.com/ncruces/go-sqlite3/vfs/memdb/api.go index 843488966..eb12eba09 100644 --- a/vendor/github.com/ncruces/go-sqlite3/vfs/memdb/api.go +++ b/vendor/github.com/ncruces/go-sqlite3/vfs/memdb/api.go @@ -43,7 +43,8 @@ func Create(name string, data []byte) { } // Convert data from WAL/2 to rollback journal. - if len(data) >= 20 && (data[18] == 2 && data[19] == 2 || + if len(data) >= 20 && (false || + data[18] == 2 && data[19] == 2 || data[18] == 3 && data[19] == 3) { data[18] = 1 data[19] = 1 diff --git a/vendor/github.com/ncruces/go-sqlite3/vfs/os_std_access.go b/vendor/github.com/ncruces/go-sqlite3/vfs/os_std.go index 1621c0998..87ce58b67 100644 --- a/vendor/github.com/ncruces/go-sqlite3/vfs/os_std_access.go +++ b/vendor/github.com/ncruces/go-sqlite3/vfs/os_std.go @@ -7,6 +7,8 @@ import ( "os" ) +const _O_NOFOLLOW = 0 + func osAccess(path string, flags AccessFlag) error { fi, err := os.Stat(path) if err != nil { @@ -34,3 +36,12 @@ func osAccess(path string, flags AccessFlag) error { } return nil } + +func osSetMode(file *os.File, modeof string) error { + fi, err := os.Stat(modeof) + if err != nil { + return err + } + file.Chmod(fi.Mode()) + return nil +} diff --git a/vendor/github.com/ncruces/go-sqlite3/vfs/os_std_mode.go b/vendor/github.com/ncruces/go-sqlite3/vfs/os_std_mode.go deleted file mode 100644 index ac4904773..000000000 --- a/vendor/github.com/ncruces/go-sqlite3/vfs/os_std_mode.go +++ /dev/null @@ -1,14 +0,0 @@ -//go:build !unix || sqlite3_nosys - -package vfs - -import "os" - -func osSetMode(file *os.File, modeof string) error { - fi, err := os.Stat(modeof) - if err != nil { - return err - } - file.Chmod(fi.Mode()) - return nil -} diff --git a/vendor/github.com/ncruces/go-sqlite3/vfs/os_unix.go b/vendor/github.com/ncruces/go-sqlite3/vfs/os_unix.go index 111af799a..7a540889b 100644 --- a/vendor/github.com/ncruces/go-sqlite3/vfs/os_unix.go +++ b/vendor/github.com/ncruces/go-sqlite3/vfs/os_unix.go @@ -9,6 +9,8 @@ import ( "golang.org/x/sys/unix" ) +const _O_NOFOLLOW = unix.O_NOFOLLOW + func osAccess(path string, flags AccessFlag) error { var access uint32 // unix.F_OK switch flags { diff --git a/vendor/github.com/ncruces/go-sqlite3/vtab.go b/vendor/github.com/ncruces/go-sqlite3/vtab.go index 3bbff6d31..2bb294ba3 100644 --- a/vendor/github.com/ncruces/go-sqlite3/vtab.go +++ b/vendor/github.com/ncruces/go-sqlite3/vtab.go @@ -57,9 +57,12 @@ func CreateModule[T VTab](db *Conn, name string, create, connect VTabConstructor flags |= VTAB_SHADOWTABS } + var modulePtr uint32 defer db.arena.mark()() namePtr := db.arena.string(name) - modulePtr := util.AddHandle(db.ctx, module[T]{create, connect}) + if connect != nil { + modulePtr = util.AddHandle(db.ctx, module[T]{create, connect}) + } r := db.call("sqlite3_create_module_go", uint64(db.handle), uint64(namePtr), uint64(flags), uint64(modulePtr)) return db.error(r) @@ -352,8 +355,9 @@ func (idx *IndexInfo) load() { idx.OrderBy = make([]IndexOrderBy, util.ReadUint32(mod, ptr+8)) constraintPtr := util.ReadUint32(mod, ptr+4) + constraint := idx.Constraint for i := range idx.Constraint { - idx.Constraint[i] = IndexConstraint{ + constraint[i] = IndexConstraint{ Column: int(int32(util.ReadUint32(mod, constraintPtr+0))), Op: IndexConstraintOp(util.ReadUint8(mod, constraintPtr+4)), Usable: util.ReadUint8(mod, constraintPtr+5) != 0, @@ -362,8 +366,9 @@ func (idx *IndexInfo) load() { } orderByPtr := util.ReadUint32(mod, ptr+12) - for i := range idx.OrderBy { - idx.OrderBy[i] = IndexOrderBy{ + orderBy := idx.OrderBy + for i := range orderBy { + orderBy[i] = IndexOrderBy{ Column: int(int32(util.ReadUint32(mod, orderByPtr+0))), Desc: util.ReadUint8(mod, orderByPtr+4) != 0, } diff --git a/vendor/modules.txt b/vendor/modules.txt index 3fbde4a8f..d2941cb41 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -518,7 +518,7 @@ github.com/modern-go/reflect2 # github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 ## explicit github.com/munnerz/goautoneg -# github.com/ncruces/go-sqlite3 v0.18.4 +# github.com/ncruces/go-sqlite3 v0.19.0 ## explicit; go 1.21 github.com/ncruces/go-sqlite3 github.com/ncruces/go-sqlite3/driver |