Merge branch 'marco6/simplify-prepared-statements' into marco6/improv…

…e-list-sql
canonical · Jul 24, 2024 · aac7502 · aac7502
2 parents 02c3cad + 164a8fc
commit aac7502
Show file tree

Hide file tree

Showing 6 changed files with 356 additions and 225 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/canonical/k8s-dqlite
 go 1.21
 
 require (
-	github.com/Rican7/retry v0.3.1
 	github.com/canonical/go-dqlite v1.22.0
 	github.com/mattn/go-sqlite3 v1.14.22
 	github.com/onsi/gomega v1.27.10
@@ -29,6 +28,7 @@ require (
 )
 
 require (
+	github.com/Rican7/retry v0.3.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect

diff --git a/pkg/kine/drivers/dqlite/dqlite.go b/pkg/kine/drivers/dqlite/dqlite.go
@@ -37,7 +37,7 @@ func NewVariant(ctx context.Context, datasourceName string) (server.Backend, *ge
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "sqlite client")
 	}
-	if err := migrate(ctx, generic.DB); err != nil {
+	if err := migrate(ctx, generic.DB.Underlying()); err != nil {
 		return nil, nil, errors.Wrap(err, "failed to migrate DB from sqlite")
 	}
 	generic.LockWrites = true