diff --git a/go.mod b/go.mod
index 0717e9c076b9c0937874aa8e903aca16731ed4b0..1fcccb7aaa90b41045acae2b22ffd5632431ac88 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
github.com/gofrs/flock v0.12.1
github.com/google/go-cmp v0.6.0
github.com/lib/pq v1.10.9
- github.com/mattn/go-sqlite3 v1.14.24
+ github.com/mattn/go-sqlite3 v1.14.26
github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627
github.com/pquerna/otp v1.4.0
github.com/prometheus/client_golang v1.20.5
diff --git a/go.sum b/go.sum
index 58c8561f6ba59137d4522981e885b45371b4f545..5b6a33f613ba8762bfa503ba010a8453fe8bd501 100644
--- a/go.sum
+++ b/go.sum
@@ -153,6 +153,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.26 h1:h72fc7d3zXGhHpwjWw+fPOBxYUupuKlbhUAQi5n6t58=
+github.com/mattn/go-sqlite3 v1.14.26/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
diff --git a/vendor/github.com/mattn/go-sqlite3/README.md b/vendor/github.com/mattn/go-sqlite3/README.md
index 1804a89ad198e69a11146d52a1a9ebba03edb819..3b43b033e1b3b065985c8520fb4c22079c598b20 100644
--- a/vendor/github.com/mattn/go-sqlite3/README.md
+++ b/vendor/github.com/mattn/go-sqlite3/README.md
@@ -35,7 +35,7 @@ This package follows the official [Golang Release Policy](https://golang.org/doc
- [Android](#android)
- [ARM](#arm)
- [Cross Compile](#cross-compile)
-- [Google Cloud Platform](#google-cloud-platform)
+- [Compiling](#compiling)
- [Linux](#linux)
- [Alpine](#alpine)
- [Fedora](#fedora)
@@ -70,7 +70,6 @@ This package can be installed with the `go get` command:
_go-sqlite3_ is *cgo* package.
If you want to build your app using go-sqlite3, you need gcc.
-However, after you have built and installed _go-sqlite3_ with `go install github.com/mattn/go-sqlite3` (which requires gcc), you can build your app without relying on gcc in future.
***Important: because this is a `CGO` enabled package, you are required to set the environment variable `CGO_ENABLED=1` and have a `gcc` compiler present within your path.***
@@ -228,11 +227,7 @@ Steps:
Please refer to the project's [README](https://github.com/FiloSottile/homebrew-musl-cross#readme) for further information.
-# Google Cloud Platform
-
-Building on GCP is not possible because Google Cloud Platform does not allow `gcc` to be executed.
-
-Please work only with compiled final binaries.
+# Compiling
## Linux
diff --git a/vendor/github.com/mattn/go-sqlite3/callback.go b/vendor/github.com/mattn/go-sqlite3/callback.go
index b794bcd839220775587ec28a8573e561bb015ca6..84612b42853bf32f3e2fcbdce13ae3ebd74b9e8c 100644
--- a/vendor/github.com/mattn/go-sqlite3/callback.go
+++ b/vendor/github.com/mattn/go-sqlite3/callback.go
@@ -345,7 +345,9 @@ func callbackRetText(ctx *C.sqlite3_context, v reflect.Value) error {
if v.Type().Kind() != reflect.String {
return fmt.Errorf("cannot convert %s to TEXT", v.Type())
}
- C._sqlite3_result_text(ctx, C.CString(v.Interface().(string)))
+ cstr := C.CString(v.Interface().(string))
+ defer C.free(unsafe.Pointer(cstr))
+ C._sqlite3_result_text(ctx, cstr)
return nil
}
diff --git a/vendor/github.com/mattn/go-sqlite3/sqlite3.go b/vendor/github.com/mattn/go-sqlite3/sqlite3.go
index ed2a9e2a3d6db445845e9e6a4fdabb72cd539156..3025a50049be14703d10bc43e5cbf59d4c033fb6 100644
--- a/vendor/github.com/mattn/go-sqlite3/sqlite3.go
+++ b/vendor/github.com/mattn/go-sqlite3/sqlite3.go
@@ -381,7 +381,7 @@ type SQLiteStmt struct {
s *C.sqlite3_stmt
t string
closed bool
- cls bool
+ cls bool // True if the statement was created by SQLiteConn.Query
}
// SQLiteResult implements sql.Result.
@@ -393,12 +393,12 @@ type SQLiteResult struct {
// SQLiteRows implements driver.Rows.
type SQLiteRows struct {
s *SQLiteStmt
- nc int
+ nc int32 // Number of columns
+ cls bool // True if we need to close the parent statement in Close
cols []string
decltype []string
- cls bool
- closed bool
ctx context.Context // no better alternative to pass context into Next() method
+ closemu sync.Mutex
}
type functionInfo struct {
@@ -929,6 +929,7 @@ func (c *SQLiteConn) query(ctx context.Context, query string, args []driver.Name
s.(*SQLiteStmt).cls = true
na := s.NumInput()
if len(args)-start < na {
+ s.Close()
return nil, fmt.Errorf("not enough args to execute query: want %d got %d", na, len(args)-start)
}
// consume the number of arguments used in the current
@@ -2007,14 +2008,12 @@ func (s *SQLiteStmt) query(ctx context.Context, args []driver.NamedValue) (drive
rows := &SQLiteRows{
s: s,
- nc: int(C.sqlite3_column_count(s.s)),
+ nc: int32(C.sqlite3_column_count(s.s)),
+ cls: s.cls,
cols: nil,
decltype: nil,
- cls: s.cls,
- closed: false,
ctx: ctx,
}
- runtime.SetFinalizer(rows, (*SQLiteRows).Close)
return rows, nil
}
@@ -2111,24 +2110,28 @@ func (s *SQLiteStmt) Readonly() bool {
// Close the rows.
func (rc *SQLiteRows) Close() error {
- rc.s.mu.Lock()
- if rc.s.closed || rc.closed {
- rc.s.mu.Unlock()
+ rc.closemu.Lock()
+ defer rc.closemu.Unlock()
+ s := rc.s
+ if s == nil {
+ return nil
+ }
+ rc.s = nil // remove reference to SQLiteStmt
+ s.mu.Lock()
+ if s.closed {
+ s.mu.Unlock()
return nil
}
- rc.closed = true
if rc.cls {
- rc.s.mu.Unlock()
- return rc.s.Close()
+ s.mu.Unlock()
+ return s.Close()
}
- rv := C.sqlite3_reset(rc.s.s)
+ rv := C.sqlite3_reset(s.s)
if rv != C.SQLITE_OK {
- rc.s.mu.Unlock()
- return rc.s.c.lastError()
+ s.mu.Unlock()
+ return s.c.lastError()
}
- rc.s.mu.Unlock()
- rc.s = nil
- runtime.SetFinalizer(rc, nil)
+ s.mu.Unlock()
return nil
}
@@ -2136,9 +2139,9 @@ func (rc *SQLiteRows) Close() error {
func (rc *SQLiteRows) Columns() []string {
rc.s.mu.Lock()
defer rc.s.mu.Unlock()
- if rc.s.s != nil && rc.nc != len(rc.cols) {
+ if rc.s.s != nil && int(rc.nc) != len(rc.cols) {
rc.cols = make([]string, rc.nc)
- for i := 0; i < rc.nc; i++ {
+ for i := 0; i < int(rc.nc); i++ {
rc.cols[i] = C.GoString(C.sqlite3_column_name(rc.s.s, C.int(i)))
}
}
@@ -2148,7 +2151,7 @@ func (rc *SQLiteRows) Columns() []string {
func (rc *SQLiteRows) declTypes() []string {
if rc.s.s != nil && rc.decltype == nil {
rc.decltype = make([]string, rc.nc)
- for i := 0; i < rc.nc; i++ {
+ for i := 0; i < int(rc.nc); i++ {
rc.decltype[i] = strings.ToLower(C.GoString(C.sqlite3_column_decltype(rc.s.s, C.int(i))))
}
}
diff --git a/vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.c b/vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.c
index fc37b336c30dad1d9930022e26e97d0c611ad95a..3a00f43de4ae56b168ef0f2629893a6879506424 100644
--- a/vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.c
+++ b/vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.c
@@ -5,7 +5,11 @@
#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
#include <stdio.h>
+#ifndef USE_LIBSQLITE3
#include "sqlite3-binding.h"
+#else
+#include <sqlite3.h>
+#endif
extern int unlock_notify_wait(sqlite3 *db);
diff --git a/vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.go b/vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.go
index 76f7bbfb69773e86ddf9a6e68b1b53c7a294901e..3ac8050a4a2cfc614805732635a201e10477195e 100644
--- a/vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.go
+++ b/vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.go
@@ -12,7 +12,11 @@ package sqlite3
#cgo CFLAGS: -DSQLITE_ENABLE_UNLOCK_NOTIFY
#include <stdlib.h>
+#ifndef USE_LIBSQLITE3
#include "sqlite3-binding.h"
+#else
+#include <sqlite3.h>
+#endif
extern void unlock_notify_callback(void *arg, int argc);
*/
diff --git a/vendor/modules.txt b/vendor/modules.txt
index a18d74a11d1bc3ea496f17ad25717317b2c625c7..1844586b75a5cbf12c092f7fd4110d7ae7e13877 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -112,7 +112,7 @@ github.com/klauspost/compress/zstd/internal/xxhash
github.com/lib/pq
github.com/lib/pq/oid
github.com/lib/pq/scram
-# github.com/mattn/go-sqlite3 v1.14.24
+# github.com/mattn/go-sqlite3 v1.14.26
## explicit; go 1.19
github.com/mattn/go-sqlite3
# github.com/mitchellh/mapstructure v1.5.0