Small wrapper around sqlite3

db/db.go

@@ -0,0 +1,68 @@
+package db
+
+import (
+	"database/sql"
+
+	_ "github.com/mattn/go-sqlite3" // required blank import
+)
+
+// DB is the SQL database.
+type DB struct {
+	conn *sql.DB
+}
+
+type Result sql.Result
+type Row sql.Row
+type Rows sql.Rows
+
+// Open an existing database, creating it if it does not exist.
+func Open(dbPath string) *DB {
+	dbc, err := sql.Open("sqlite3", dbPath)
+	if err != nil {
+		return nil
+	}
+	return &DB{
+		conn: dbc,
+	}
+}
+
+// Close closes the underlying database connection.
+func (db *DB) Close() error {
+	return db.conn.Close()
+}
+
+func (db *DB) Execute(queries []string, tx bool) ([]sql.Result, error) {
+	type Execer interface {
+		Exec(query string, args ...interface{}) (sql.Result, error)
+	}
+
+	err := func() (err error) {
+		var execer Execer
+		defer func() {
+			if t, ok := execer.(*sql.Tx); ok {
+				if err != nil {
+					t.Rollback()
+					return
+				}
+				t.Commit()
+			}
+		}()
+
+		if tx {
+			execer, _ = db.conn.Begin()
+		} else {
+			execer = db.conn
+		}
+
+		for _, q := range queries {
+			_, err = execer.Exec(q)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}()
+
+	return nil, err
+
+}

http/service.go

@@ -132,9 +132,9 @@ func (s *Service) handleQuery(w http.ResponseWriter, r *http.Request) {
 	pretty, _ := isPretty(r)
 	var b []byte
 	if pretty {
-		b, err = json.MarshalIndent(*rows, "", "    ")
+		b, err = json.MarshalIndent(rows, "", "    ")
 	} else {
-		b, err = json.Marshal(*rows)
+		b, err = json.Marshal(rows)
 	}
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest) // Internal error actually

store/store.go

@@ -5,7 +5,6 @@ package store
 
 import (
 	"bytes"
-	"database/sql"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -19,8 +18,7 @@ import (
 
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/raft-boltdb"
-
+	sql "github.com/otoolep/rqlite/db"
-	_ "github.com/mattn/go-sqlite3" // required blank import
 )
 
 const (
@@ -108,20 +106,16 @@ func (s *Store) Open(enableSingle bool) error {
 	s.raft = ra
 
 	// Setup the SQLite database.
-	db, err := sql.Open("sqlite3", filepath.Join(s.raftDir, "db.sqlite"))
+	db, err := sql.Open(filepath.Join(s.raftDir, "db.sqlite"))
 	if err != nil {
 		return err
 	}
 	s.db = db
 
-	if err != nil {
-		panic(fmt.Sprintf("failed to CREATE TABLE: %s", err.Error()))
-	}
-
 	return nil
 }
 
-func (s *Store) Execute(queries []string, tx bool) (sql.Result, error) {
+func (s *Store) Execute(queries []string, tx bool) ([]sql.Result, error) {
 	if s.raft.State() != raft.Leader {
 		return nil, fmt.Errorf("not leader")
 	}
@@ -170,36 +164,7 @@ func (f *fsm) Apply(l *raft.Log) interface{} {
 		panic(fmt.Sprintf("failed to unmarshal command: %s", err.Error()))
 	}
 
-	type Execer interface {
+	_, err := f.db.Execute(c.Queries, c.Tx)
-		Exec(query string, args ...interface{}) (sql.Result, error)
-	}
-
-	err := func() (err error) {
-		var execer Execer
-		defer func() {
-			if t, ok := execer.(*sql.Tx); ok {
-				if err != nil {
-					t.Rollback()
-					return
-				}
-				t.Commit()
-			}
-		}()
-
-		if c.Tx {
-			execer, _ = f.db.Begin()
-		} else {
-			execer = f.db
-		}
-
-		for _, q := range c.Queries {
-			_, err = execer.Exec(q)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	}()
 
 	return err
 }