Add support for FATHOM_DATABASE_URL

pkg/config/config.go

@@ -4,6 +4,7 @@ import (
 	"math/rand"
 	"os"
 	"path/filepath"
+	"net/url"
 
 	"github.com/joho/godotenv"
 	"github.com/kelseyhightower/envconfig"
@@ -52,6 +53,14 @@ func Parse() *Config {
 		log.Fatalf("Error parsing configuration from environment: %s", err)
 	}
 
+	if cfg.Database.URL != "" {
+		u, err := url.Parse(cfg.Database.URL)
+		if err != nil {
+			log.Fatalf("Error parsing DATABASE_URL from environment: %s", err)
+		}
+		cfg.Database.Driver = u.Scheme
+	}
+
 	// alias sqlite to sqlite3
 	if cfg.Database.Driver == "sqlite" {
 		cfg.Database.Driver = "sqlite3"

pkg/config/config_test.go

@@ -49,6 +49,23 @@ func TestParse(t *testing.T) {
 	}
 }
 
+func TestDatabaseURL(t *testing.T) {
+	data := []byte("FATHOM_DATABASE_URL=\"postgres://dbuser:dbsecret@dbhost:1234/dbname\"")
+	ioutil.WriteFile("env_values", data, 0644)
+	defer os.Remove("env_values")
+
+	LoadEnv("env_values")
+	cfg := Parse()
+	driver := "postgres"
+	url := "postgres://dbuser:dbsecret@dbhost:1234/dbname"
+	if cfg.Database.Driver != driver {
+		t.Errorf("Expected %#v, got %#v", driver, cfg.Database.Driver)
+	}
+	if cfg.Database.URL != url {
+		t.Errorf("Expected %#v, got %#v", url, cfg.Database.URL)
+	}
+}
+
 func TestRandomString(t *testing.T) {
 	r1 := randomString(10)
 	r2 := randomString(10)

pkg/datastore/sqlstore/config.go

@@ -6,6 +6,7 @@ import (
 )
 
 type Config struct {
+	URL      string `default:""`
 	Driver   string `default:"sqlite3"`
 	Host     string `default:""`
 	User     string `default:""`
@@ -19,23 +20,26 @@ func (c *Config) DSN() string {
 
 	switch c.Driver {
 	case "postgres":
-		params := map[string]string{
-			"host":     c.Host,
-			"dbname":   c.Name,
-			"user":     c.User,
-			"password": c.Password,
-			"sslmode":  c.SSLMode,
-		}
-
-		for k, v := range params {
-			if v == "" {
-				continue
+		if c.URL != "" {
+			dsn = c.URL
+		} else {
+			params := map[string]string{
+				"host":     c.Host,
+				"dbname":   c.Name,
+				"user":     c.User,
+				"password": c.Password,
+				"sslmode":  c.SSLMode,
 			}
 
-			dsn = dsn + k + "=" + v + " "
-		}
+			for k, v := range params {
+				if v == "" {
+					continue
+				}
 
-		dsn = strings.TrimSpace(dsn)
+				dsn = dsn + k + "=" + v + " "
+			}
+			dsn = strings.TrimSpace(dsn)
+		}
 	case "mysql":
 		mc := mysql.NewConfig()
 		mc.User = c.User

pkg/datastore/sqlstore/sqlstore.go

@@ -30,7 +30,7 @@ func New(c *Config) *sqlstore {
 	db := &sqlstore{dbx, c}
 
 	// write log statement
-	log.Printf("Connected to %s database: %s", c.Driver, c.Name)
+	log.Printf("Connected to %s database: %s", c.Driver, c.DSN())
 
 	// run migrations
 	db.Migrate()