fix tests

Author: cenkalti

internal/pas/analytics.go

@@ -17,32 +17,30 @@ func NewAnalytics(db *sql.DB) *Analytics {
 	}
 }
 
-func (p *Analytics) InsertEvents(events []Event) (int, error) {
-	var n int
+func (p *Analytics) InsertEvents(events []Event) (n int, err error) {
 	now := time.Now().UTC()
 	for _, e := range events {
 		i := eventInserter{e}
-		err := p.insert(i, now)
+		err = p.insert(i, now)
 		if err != nil {
 			break
 		}
 		n++
 	}
-	return n, nil
+	return
 }
 
-func (p *Analytics) UpdateUsers(users []User) (int, error) {
-	var n int
+func (p *Analytics) UpdateUsers(users []User) (n int, err error) {
 	now := time.Now().UTC()
 	for _, u := range users {
 		i := userInserter{u}
-		err := p.insert(i, now)
+		err = p.insert(i, now)
 		if err != nil {
 			break
 		}
 		n++
 	}
-	return n, nil
+	return
 }
 
 func (p *Analytics) insert(i inserter, t time.Time) error {

internal/pas/analytics_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestInsertEvent(t *testing.T) {
+func TestInsertEvents(t *testing.T) {
 	db, err := sql.Open("mysql", localDSN)
 	if err != nil {
 		log.Fatal(err)
@@ -65,3 +65,56 @@ func TestInsertEvent(t *testing.T) {
 	}
 	assert.Equal(t, n, 1)
 }
+
+func TestUpdateUsers(t *testing.T) {
+	db, err := sql.Open("mysql", localDSN)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer db.Close()
+
+	analytics := pas.NewAnalytics(db)
+
+	_, err = db.Exec("drop table if exists user")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	u := pas.User{
+		ID: pas.UserID(1234),
+		Properties: []pas.Property{
+			{
+				Type:  pas.TypeInteger,
+				Name:  "foo",
+				Value: 1,
+			},
+		},
+	}
+	users := []pas.User{u}
+
+	// will create table
+	n, err := analytics.UpdateUsers(users)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, n, 1)
+
+	// will insert
+	n, err = analytics.UpdateUsers(users)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, n, 1)
+
+	// will add column
+	users[0].Properties = append(users[0].Properties, pas.Property{
+		Type:  pas.TypeString,
+		Name:  "bar",
+		Value: "test",
+	})
+	n, err = analytics.UpdateUsers(users)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, n, 1)
+}

internal/pas/handler_test.go

@@ -51,7 +51,7 @@ func TestPostUsers(t *testing.T) {
 	s := `{
 		"users": [
 		{"id": "1234", "properties": [
-				{"name": "foo", "value": "bar", "type": "string"}
+				{"name": "foo", "value": 1, "type": "string"}
 		]}]}
 	`
 	var postBody = bytes.NewBufferString(s)

internal/pas/inserter_user.go

@@ -58,7 +58,7 @@ func (i userInserter) CreateTableSQL() string {
 }
 
 func (i userInserter) ExistingColumns(db *sql.DB) (map[string]struct{}, error) {
-	rows, err := db.Query("select column_name from information_schema.columns where table_name = user and column_name != id")
+	rows, err := db.Query("select column_name from information_schema.columns where table_name = 'user' and column_name != 'id'")
 	if err != nil {
 		return nil, err
 	}