re-organise everything sqlite

2 files changed, 4 insertions, 14 deletions

diff --git a/internal/storage/sqlite/reader.go b/internal/storage/sqlite/reader.go
index fe5da7e..fefeb74 100644
--- a/internal/storage/sqlite/reader.go
+++ b/internal/storage/sqlite/reader.go
@@ -19,12 +19,7 @@ type Reader struct {
 	}
 }
 
-func NewReader(dbPath string, log *log.Logger) (r *Reader, err error) {
-	db, err := openDB(dbPath)
-	if err != nil {
-		return nil, errors.WithMessage(err, "could not open SQLite database")
-	}
-
+func NewReader(db *sql.DB, log *log.Logger) (r *Reader, err error) {
 	r = &Reader{
 		log: log,
 		db:  db,
diff --git a/internal/storage/sqlite/writer.go b/internal/storage/sqlite/writer.go
index c35494d..ec0d6d0 100644
--- a/internal/storage/sqlite/writer.go
+++ b/internal/storage/sqlite/writer.go
@@ -32,7 +32,7 @@ type Options struct {
 	Compress bool
 }
 
-func openDB(dbPath string) (*sql.DB, error) {
+func OpenDB(dbPath string) (*sql.DB, error) {
 	return sql.Open(
 		"sqlite",
 		fmt.Sprintf(
@@ -44,14 +44,9 @@ func openDB(dbPath string) (*sql.DB, error) {
 	)
 }
 
-func NewWriter(dbPath string, logger *log.Logger, opts *Options) (*Writer, error) {
-	db, err := openDB(dbPath)
-	if err != nil {
-		return nil, errors.WithMessage(err, "opening sqlite database")
-	}
-
+func NewWriter(db *sql.DB, logger *log.Logger, opts *Options) (*Writer, error) {
 	// WIP: only memory database for now
-	_, err = db.Exec(`
+	_, err := db.Exec(`
 		CREATE TABLE IF NOT EXISTS url (
 			id INTEGER PRIMARY KEY,
 			path TEXT NOT NULL