github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix history database URI on windows

Browse Source
This commit is contained in:
Daniel
2023-07-28 16:48:26 +02:00
parent b882b910ca
commit 2452a92b8b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netquery/database.go
View File

@@ -7,7 +7,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"path" "path/filepath"
"sort" "sort"
"strings" "strings"
"sync" "sync"
@@ -124,7 +124,10 @@ func New(dbPath string) (*Database, error) {
return nil, fmt.Errorf("failed to ensure database directory exists: %w", err) return nil, fmt.Errorf("failed to ensure database directory exists: %w", err)
} }
historyPath := "file://" + path.Join(historyParentDir.Path, "history.db") // Get file location of history database.
historyFile := filepath.Join(historyParentDir.Path, "history.db")
// Convert to SQLite URI path.
historyURI := "file:///" + strings.TrimPrefix(filepath.ToSlash(historyFile), "/")
constructor := func(ctx context.Context) (*sqlite.Conn, error) { constructor := func(ctx context.Context) (*sqlite.Conn, error) {
c, err := sqlite.OpenConn( c, err := sqlite.OpenConn(
@@ -137,7 +140,7 @@ func New(dbPath string) (*Database, error) {
return nil, fmt.Errorf("failed to open read-only sqlite connection at %s: %w", dbPath, err) return nil, fmt.Errorf("failed to open read-only sqlite connection at %s: %w", dbPath, err)
} }
if err := sqlitex.ExecuteTransient(c, "ATTACH DATABASE '"+historyPath+"?mode=ro' AS history", nil); err != nil { if err := sqlitex.ExecuteTransient(c, "ATTACH DATABASE '"+historyURI+"?mode=ro' AS history", nil); err != nil {
return nil, fmt.Errorf("failed to attach history database: %w", err) return nil, fmt.Errorf("failed to attach history database: %w", err)
} }
@@ -180,7 +183,7 @@ func New(dbPath string) (*Database, error) {
readConnPool: pool, readConnPool: pool,
Schema: schema, Schema: schema,
writeConn: writeConn, writeConn: writeConn,
historyPath: historyPath, historyPath: historyURI,
}, nil }, nil
} }
@@ -207,7 +210,6 @@ func NewInMemory() (*Database, error) {
// any data-migrations. Once the history module is implemented this should // any data-migrations. Once the history module is implemented this should
// become/use a full migration system -- use zombiezen.com/go/sqlite/sqlitemigration. // become/use a full migration system -- use zombiezen.com/go/sqlite/sqlitemigration.
func (db *Database) ApplyMigrations() error { func (db *Database) ApplyMigrations() error {
log.Errorf("applying migrations ...")
db.l.Lock() db.l.Lock()
defer db.l.Unlock() defer db.l.Unlock()

1
netquery/module_api.go
View File

@@ -64,6 +64,7 @@ func (m *module) prepare() error {
Internal: true, Internal: true,
}) })
// TODO: Open database in start() phase.
m.Store, err = NewInMemory() m.Store, err = NewInMemory()
if err != nil { if err != nil {
return fmt.Errorf("failed to create in-memory database: %w", err) return fmt.Errorf("failed to create in-memory database: %w", err)