Merge pull request 'adding in file path option' (#2) from new/file-path into main

Reviewed-on: #2

option.go

@@ -1,15 +1,26 @@
 package lite
 
-type Option func(d *database)
+import "errors"
+
+var (
+	ErrBadFilename error = errors.New("database filename cannot be empty")
+)
+
+type Option func(d *database) error
 
 func WithFile(name string) Option {
-	return func(d *database) {
+	return func(d *database) error {
+		if name == "" {
+			return ErrBadFilename
+		}
 		d.file = name
+		return nil
 	}
 }
 
 func WithPath(path string) Option {
-	return func(d *database) {
+	return func(d *database) error {
 		d.path = path
+		return nil
 	}
 }

sqlite.go

@@ -3,19 +3,14 @@ package lite
 import (
 	"context"
 	"database/sql"
-	"errors"
 	"fmt"
-	"os"
+	"path"
 
 	"github.com/jmoiron/sqlx"
 	_ "github.com/ncruces/go-sqlite3/driver"
 	_ "github.com/ncruces/go-sqlite3/embed"
 )
 
-var (
-	ErrNotConnected = errors.New("the connect method must be called before any queries can be executed")
-)
-
 type database struct {
 	file   string
 	path   string
@@ -23,44 +18,36 @@ type database struct {
 }
 
 type Database interface {
-	Connect() error
 	Close() error
 	Exec(ctx context.Context, query string, args ...any) (sql.Result, error)
 	Query(ctx context.Context, query string, args ...any) (*sqlx.Rows, error)
-	QueryRow(ctx context.Context, query string, args ...any) (*sqlx.Row, error)
+	QueryRow(ctx context.Context, query string, args ...any) *sqlx.Row
 	QueryIn(ctx context.Context, query string, args ...any) (*sqlx.Rows, error)
 }
 
 func New(opts ...Option) (Database, error) {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return nil, err
-	}
-
 	defaultFile := "lite-db"
 
 	db := &database{
 		file: defaultFile,
-		path: home,
 	}
 
 	for _, opt := range opts {
 		opt(db)
 	}
 
-	return db, nil
+	filePath := db.file
+	if db.path != "" {
+		filePath = path.Join(db.path, db.file)
 	}
 
-// connects to database file
+	slite, err := sqlx.Open("sqlite3", fmt.Sprintf("file:%s", filePath))
-func (d *database) Connect() error {
-	db, err := sqlx.Open("sqlite3", fmt.Sprintf("file:%s/%s", d.path, d.file))
 	if err != nil {
-		return err
+		return nil, err
 	}
+	db.sqlite = slite
 
-	d.sqlite = db
+	return db, nil
-
-	return nil
 }
 
 // closes database file connection
@@ -70,33 +57,21 @@ func (d *database) Close() error {
 
 // runs any updates, inserts, or any other queries that do not return rows
 func (d *database) Exec(ctx context.Context, query string, args ...any) (sql.Result, error) {
-	if d.sqlite == nil {
-		return nil, ErrNotConnected
-	}
 	return d.sqlite.ExecContext(ctx, query, args...)
 }
 
 // runs basic data queries
 func (d *database) Query(ctx context.Context, query string, args ...any) (*sqlx.Rows, error) {
-	if d.sqlite == nil {
-		return nil, ErrNotConnected
-	}
 	return d.sqlite.QueryxContext(ctx, query, args...)
 }
 
 // retrieves a single row from database
-func (d *database) QueryRow(ctx context.Context, query string, args ...any) (*sqlx.Row, error) {
+func (d *database) QueryRow(ctx context.Context, query string, args ...any) *sqlx.Row {
-	if d.sqlite == nil {
+	return d.sqlite.QueryRowxContext(ctx, query, args...)
-		return nil, ErrNotConnected
-	}
-	return d.sqlite.QueryRowxContext(ctx, query, args...), nil
 }
 
 // runs queries that require parameters in an IN clause
 func (d *database) QueryIn(ctx context.Context, query string, args ...any) (*sqlx.Rows, error) {
-	if d.sqlite == nil {
-		return nil, ErrNotConnected
-	}
 	q, ar, err := sqlx.In(query, args...)
 	if err != nil {
 		return nil, err