fix postgres errors by converting to null in divisions. closes #54 relates to #52

.gitignore

@@ -1,5 +1,6 @@
 node_modules
-.env
+.env*
+!.env.example
 coverage.out
 build
 fathom.db

pkg/datastore/sqlstore/migrations/postgres/1_initial_tables.sql

@@ -11,10 +11,10 @@ CREATE TABLE pageviews(
    hostname VARCHAR(255) NOT NULL,
    pathname VARCHAR(255) NOT NULL,
    session_id VARCHAR(16) NOT NULL,
-   is_new_visitor SMALLINT NOT NULL,
-   is_new_session SMALLINT NOT NULL,
-   is_unique SMALLINT NOT NULL,
-   is_bounce SMALLINT NULL,
+   is_new_visitor BOOLEAN NOT NULL,
+   is_new_session BOOLEAN NOT NULL,
+   is_unique BOOLEAN NOT NULL,
+   is_bounce BOOLEAN NULL,
    referrer VARCHAR(255) NULL,
    duration INTEGER NULL,
    timestamp TIMESTAMP WITH TIME ZONE NOT NULL

pkg/datastore/sqlstore/page_stats.go

@@ -30,7 +30,17 @@ func (db *sqlstore) UpdatePageStats(s *models.PageStats) error {
 
 func (db *sqlstore) GetAggregatedPageStats(startDate time.Time, endDate time.Time, limit int) ([]*models.PageStats, error) {
 	var result []*models.PageStats
-	query := db.Rebind(`SELECT hostname, pathname, SUM(pageviews) AS pageviews, SUM(visitors) AS visitors, SUM(entries) AS entries, COALESCE(ROUND(SUM(entries*bounce_rate)/SUM(entries), 4), 0.00) AS bounce_rate, COALESCE(ROUND(SUM(avg_duration*pageviews)/SUM(pageviews), 4), 0.00) AS avg_duration FROM daily_page_stats WHERE date >= ? AND date <= ? GROUP BY hostname, pathname ORDER BY pageviews DESC LIMIT ?`)
+	query := db.Rebind(`SELECT 
+		hostname, 
+		pathname, 
+		SUM(pageviews) AS pageviews, 
+		SUM(visitors) AS visitors, 
+		SUM(entries) AS entries, 
+		COALESCE(ROUND(SUM(entries*bounce_rate) / NULLIF(SUM(entries), 0), 4), 0.00) AS bounce_rate, 
+		COALESCE(ROUND(SUM(avg_duration*pageviews) / SUM(pageviews), 4), 0.00) AS avg_duration 
+		FROM daily_page_stats WHERE date >= ? AND date <= ? 
+		GROUP BY hostname, pathname 
+		ORDER BY pageviews DESC LIMIT ?`)
 	err := db.Select(&result, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02"), limit)
 	return result, err
 }

pkg/datastore/sqlstore/pageviews.go

@@ -45,7 +45,8 @@ func (db *sqlstore) GetMostRecentPageviewBySessionID(sessionID string) (*models.
 func (db *sqlstore) GetProcessablePageviews() ([]*models.Pageview, error) {
 	var results []*models.Pageview
 	thirtyMinsAgo := time.Now().Add(-30 * time.Minute)
-	query := db.Rebind(`SELECT * FROM pageviews WHERE ( duration > 0 AND is_bounce = 0 ) OR timestamp < ? LIMIT 500`)
+	// We use FALSE here, even though SQLite has no BOOLEAN value. If it fails, maybe we can roll our own Rebind?
+	query := db.Rebind(`SELECT * FROM pageviews WHERE ( duration > 0 AND is_bounce = FALSE ) OR timestamp < ? LIMIT 500`)
 	err := db.Select(&results, query, thirtyMinsAgo)
 	return results, err
 }

pkg/datastore/sqlstore/referrer_stats.go

@@ -32,24 +32,24 @@ func (db *sqlstore) UpdateReferrerStats(s *models.ReferrerStats) error {
 func (db *sqlstore) GetAggregatedReferrerStats(startDate time.Time, endDate time.Time, limit int) ([]*models.ReferrerStats, error) {
 	var result []*models.ReferrerStats
 
-	sql := `
-	SELECT 
+	sql := `SELECT 
 		MIN(hostname) AS hostname,
 		MIN(pathname) AS pathname,
-		MIN(COALESCE(groupname, "")) AS groupname,  
+		COALESCE(MIN(groupname), '') AS groupname,  
 		SUM(visitors) AS visitors, 
 		SUM(pageviews) AS pageviews, 
-		COALESCE(ROUND(SUM(pageviews*bounce_rate)/SUM(pageviews), 4), 0.00) AS bounce_rate, 
-		COALESCE(ROUND(SUM(avg_duration*pageviews)/SUM(pageviews), 4), 0.00) AS avg_duration 
+		COALESCE(ROUND(SUM(pageviews*NULLIF(bounce_rate, 0)) / SUM(pageviews), 4), 0.00) AS bounce_rate, 
+		COALESCE(ROUND(SUM(avg_duration*pageviews) / SUM(pageviews), 4), 0.00) AS avg_duration 
 	FROM daily_referrer_stats 
-	WHERE date >= ? AND date <= ? 
-	GROUP BY COALESCE(NULLIF(groupname, ""), `
+	WHERE date >= ? AND date <= ? `
+
 	if db.Config.Driver == "sqlite3" {
-		sql = sql + `hostname || pathname`
+		sql = sql + `GROUP BY COALESCE(groupname, hostname || pathname ) `
 	} else {
-		sql = sql + ` CONCAT(hostname, pathname)`
+		sql = sql + `GROUP BY COALESCE(groupname, CONCAT(hostname, pathname) ) `
 	}
-	sql = sql + `) ORDER BY pageviews DESC LIMIT ?`
+	sql = sql + ` ORDER BY pageviews DESC LIMIT ?`
+
 	query := db.Rebind(sql)
 
 	err := db.Select(&result, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02"), limit)

pkg/datastore/sqlstore/site_stats.go

@@ -42,8 +42,8 @@ func (db *sqlstore) GetAggregatedSiteStats(startDate time.Time, endDate time.Tim
 		COALESCE(SUM(pageviews), 0) AS pageviews,
 		COALESCE(SUM(visitors), 0) AS visitors,
 		COALESCE(SUM(sessions), 0) AS sessions,
-		COALESCE(ROUND(SUM(pageviews*avg_duration)/SUM(pageviews), 4), 0.00) AS avg_duration,
-		COALESCE(ROUND(SUM(sessions*bounce_rate)/SUM(sessions), 4), 0.00) AS bounce_rate
+		COALESCE(ROUND(SUM(pageviews*avg_duration) / NULLIF(SUM(pageviews), 0), 4), 0.00) AS avg_duration,
+		COALESCE(ROUND(SUM(sessions*bounce_rate) / NULLIF(SUM(sessions), 0), 4), 0.00) AS bounce_rate
 	 FROM daily_site_stats WHERE date >= ? AND date <= ? LIMIT 1`)
 	err := db.Get(stats, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02"))
 	if err != nil && err == sql.ErrNoRows {