Adding testing

Author: djthorpe

Makefile

@@ -16,7 +16,7 @@ BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/config.GitHash=$(shell git rev-parse HE
 BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/config.GoBuildTime=$(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
 BUILD_FLAGS = -ldflags "-s -w $(BUILD_LD_FLAGS)" 
 
-.PHONY: all server npm plugins dependencies mkdir clean 
+.PHONY: all test server npm plugins dependencies mkdir clean 
 
 all: clean plugins server npm
 
@@ -44,6 +44,14 @@ $(PLUGIN_DIR): FORCE
 
 FORCE:
 
+test:
+	@echo Test sys/sqlite3
+	@${GO} test -v ./sys/sqlite3
+	@echo Test pkg/sqlite3
+	@${GO} test -v ./pkg/sqlite3
+	@echo Test pkg/tokenizer
+	@${GO} test -v ./pkg/tokenizer
+
 dependencies:
 ifeq (,${GO})
         $(error "Missing go binary")

etc/server.yaml

@@ -3,6 +3,7 @@ plugins:
   - build/httpserver.plugin
   - build/log.plugin
   - build/sqlite3.plugin
+  - build/static.plugin
 
 # HTTP Server parameters
 httpserver:
@@ -17,6 +18,11 @@ handlers:
     # Requests are logged
     middleware:
       - log
+  static:
+    prefix: /api/static
+    
+static:
+  "/": npm/sqlite3/dist
 
 sqlite3:
   # Databases to load and/or create. Only the 'main' database is required.

pkg/sqlite3/cache.go

@@ -1,6 +1,17 @@
 package sqlite3
 
+////////////////////////////////////////////////////////////////////////////////
+// TYPES
+
 // PoolCache caches prepared statements and profiling information for
 // statements so it's possible to see slow queries, etc.
 type PoolCache struct {
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+
+// Return a prepared statement from the cache
+func (cache *PoolCache) Prepare(q string) (*Results, error) {
+
+}

plugin/sqlite3/handlers.go

@@ -10,9 +10,10 @@ import (
 	"regexp"
 	"strconv"
 
-	// Modules
+	// Packages
 	router "github.com/djthorpe/go-server/pkg/httprouter"
 	sqlite3 "github.com/djthorpe/go-sqlite/pkg/sqlite3"
+	tokenizer "github.com/djthorpe/go-sqlite/pkg/tokenizer"
 
 	// Namespace imports
 	. "github.com/djthorpe/go-server"
@@ -302,7 +303,7 @@ func tokenize(v string) ([]template.HTML, error) {
 	result := []template.HTML{}
 
 	// Iterate through the tokenizer
-	t := sqlite3.NewTokenizer(v)
+	t := tokenizer.NewTokenizer(v)
 	for {
 		token, err := t.Next()
 		if token == nil || err == io.EOF {
@@ -311,17 +312,17 @@ func tokenize(v string) ([]template.HTML, error) {
 			return nil, err
 		}
 		switch t := token.(type) {
-		case sqlite3.KeywordToken:
+		case tokenizer.KeywordToken:
 			result = appendtoken(result, "keyword", t)
-		case sqlite3.TypeToken:
+		case tokenizer.TypeToken:
 			result = appendtoken(result, "type", t)
-		case sqlite3.NameToken:
+		case tokenizer.NameToken:
 			result = appendtoken(result, "name", t)
-		case sqlite3.ValueToken:
+		case tokenizer.ValueToken:
 			result = appendtoken(result, "value", t)
-		case sqlite3.PuncuationToken:
+		case tokenizer.PuncuationToken:
 			result = appendtoken(result, "puncuation", t)
-		case sqlite3.WhitespaceToken:
+		case tokenizer.WhitespaceToken:
 			result = appendtoken(result, "space", t)
 		default:
 			result = appendtoken(result, "", t)

sys/sqlite3/connex.go

@@ -154,6 +154,12 @@ func OpenUrlEx(url string, flags OpenFlags, vfs string) (*ConnEx, error) {
 // Open Path (with busy and progress handlers)
 func OpenPathEx(path string, flags OpenFlags, vfs string) (*ConnEx, error) {
 	c := new(ConnEx)
+
+	// Add RW flag if CREATE flag is set
+	if flags&SQLITE_OPEN_CREATE != 0 {
+		flags |= SQLITE_OPEN_READWRITE
+	}
+
 	if conn, err := OpenPath(path, flags, vfs); err != nil {
 		return nil, err
 	} else {