Merge pull request #76 from dadleyy/GH-75/count-fix

correcting postgres placeholder indexed param calculations

.travis.yml

@@ -14,7 +14,6 @@ script:
   - make
   - make test
   - make test-example
-  - go run marlowc/main.go -input examples/library/models -stdout=true
   - make example
   - pushd ./examples/library && ./library && popd
 after_success:

Makefile

@@ -52,6 +52,8 @@ LIBRARY_EXAMPLE_COVERAGE_REPORT=$(LIBRARY_COVERAGE_OUTPUT_DIR)/library.coverage.
 LIBRARY_EXAMPLE_COVERAGE_DISTRIBUTABLE=$(LIBRARY_COVERAGE_OUTPUT_DIR)/library.coverage.html
 LIBRARY_EXAMPLE_TEST_FLAGS=-covermode=atomic $(TEST_VERBOSITY) -coverprofile=$(LIBRARY_EXAMPLE_COVERAGE_REPORT)
 
+.PHONY: all lint test test-example clean clean-example
+
 all: $(EXE)
 
 $(EXE): $(VENDOR_DIR) $(GO_SRC) $(LIB_SRC)
@@ -78,7 +80,9 @@ $(VENDOR_DIR):
 	$(GO) get -v -u github.com/golang/lint/golint
 	$(GLIDE) install
 
-example: $(LIBRARY_EXAMPLE_SRC) $(LIBRARY_EXAMPLE_MAIN) $(EXE)
+example: $(LIBRARY_EXAMPLE_EXE)
+
+$(LIBRARY_EXAMPLE_EXE): $(LIBRARY_EXAMPLE_SRC) $(LIBRARY_EXAMPLE_MAIN) $(EXE)
 	$(GO) get -v github.com/lib/pq
 	$(GO) get -v github.com/mattn/go-sqlite3
 	$(GO) install -v -x github.com/mattn/go-sqlite3

examples/library/data/postgres.sql

@@ -0,0 +1,15 @@
+drop table if exists genres;
+
+create table genres (
+  id SERIAL,
+  name TEXT,
+  parent_id INTEGER
+);
+
+drop table if exists multi_auto;
+
+create table multi_auto (
+  id SERIAL,
+  status TEXT DEFAULT 'pending' NOT NULL,
+  name TEXT
+);

examples/library/main.go

@@ -3,6 +3,7 @@ package main
 import "os"
 import "log"
 import "fmt"
+import "bytes"
 import _ "github.com/mattn/go-sqlite3"
 import "database/sql"
 import "github.com/dadleyy/marlow/examples/library/data"
@@ -110,7 +111,9 @@ func main() {
 		NameLike: []string{"danny"},
 	})
 
-	authorStore := models.NewAuthorStore(db)
+	queryLog := new(bytes.Buffer)
+
+	authorStore := models.NewAuthorStore(db, queryLog)
 
 	a, e := authorStore.FindAuthors(&models.AuthorBlueprint{
 		ID: []int{1, 2, 3},
@@ -124,7 +127,16 @@ func main() {
 		log.Printf("found author name[%s]", author.Name)
 	}
 
-	bookStore := models.NewBookStore(db)
+	queryLog.Reset()
+
+	bookStore := models.NewBookStore(db, queryLog)
+
+	if _, e := bookStore.CreateBooks(models.Book{Title: "AwesomeBook"}); e != nil {
+		log.Fatalf("unable to create book: %v", e)
+	}
+
+	log.Printf("%v", queryLog.String())
+
 	b, e := bookStore.FindBooks(&models.BookBlueprint{
 		ID: []int{1, 2},
 	})

examples/library/models/author_test.go

@@ -1,7 +1,9 @@
 package models
 
 import "os"
+import "io"
 import "fmt"
+import "bytes"
 import "strings"
 import "testing"
 import _ "github.com/mattn/go-sqlite3"
@@ -37,6 +39,7 @@ func Test_Author(t *testing.T) {
 	g := goblin.Goblin(t)
 	var db *sql.DB
 	var store AuthorStore
+	var queryLog io.Writer
 
 	dbFile := "author-testing.db"
 	generatedAuthorCount := 150
@@ -149,7 +152,8 @@ func Test_Author(t *testing.T) {
 		})
 
 		g.BeforeEach(func() {
-			store = NewAuthorStore(db)
+			queryLog = new(bytes.Buffer)
+			store = NewAuthorStore(db, queryLog)
 		})
 
 		g.After(func() {

examples/library/models/book_test.go

@@ -1,7 +1,9 @@
 package models
 
 import "os"
+import "io"
 import "fmt"
+import "bytes"
 import "strings"
 import "testing"
 import _ "github.com/mattn/go-sqlite3"
@@ -35,6 +37,7 @@ func addBookRow(db *sql.DB, values ...[]string) error {
 func Test_Book(t *testing.T) {
 	var db *sql.DB
 	var store BookStore
+	var queryLog io.Writer
 
 	g := goblin.Goblin(t)
 	testBookCount := 150
@@ -77,7 +80,8 @@ func Test_Book(t *testing.T) {
 		})
 
 		g.BeforeEach(func() {
-			store = NewBookStore(db)
+			queryLog = new(bytes.Buffer)
+			store = NewBookStore(db, queryLog)
 		})
 
 		g.After(func() {