arcad
/
edge
15
0
Fork 0
Code Issues 8 Pull Requests Projects Releases 3 Wiki Activity

chore(sqlite): add Open() utility func

This commit is contained in:
wpetit 2023-03-03 16:37:19 +01:00
parent fef0321475
commit 6399196fe5
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/cli/command/app/run.go
View File

@ -1,7 +1,6 @@
package app package app
import ( import (
"database/sql"
"fmt" "fmt"
"net/http" "net/http"
"path/filepath" "path/filepath"
@ -26,8 +25,6 @@ import (
"github.com/golang-jwt/jwt" "github.com/golang-jwt/jwt"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
_ "modernc.org/sqlite"
) )
func RunCommand() *cli.Command { func RunCommand() *cli.Command {
@ -115,9 +112,9 @@ func RunCommand() *cli.Command {
bus := memory.NewBus() bus := memory.NewBus()
db, err := sql.Open("sqlite", storageFile) db, err := sqlite.Open(storageFile)
if err != nil { if err != nil {
return errors.Wrapf(err, "could not open database with path '%s'", storageFile) return errors.WithStack(err)
} }
ds := sqlite.NewDocumentStoreWithDB(db) ds := sqlite.NewDocumentStoreWithDB(db)

11
pkg/storage/sqlite/sql.go
View File

@ -7,8 +7,19 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"gitlab.com/wpetit/goweb/logger" "gitlab.com/wpetit/goweb/logger"
_ "modernc.org/sqlite"
) )
func Open(path string) (*sql.DB, error) {
db, err := sql.Open("sqlite", path)
if err != nil {
return nil, errors.Wrapf(err, "could not open database with path '%s'", path)
}
return db, nil
}
func withTx(ctx context.Context, db *sql.DB, fn func(tx *sql.Tx) error) error { func withTx(ctx context.Context, db *sql.DB, fn func(tx *sql.Tx) error) error {
var tx *sql.Tx var tx *sql.Tx