common: Create migrate db connection string from scratch

This fixes a bug in the recent commit to introduce golang-migrate,
such that it wasn't able to connect to our production backend.

Author: justinclift

common/config.go

@@ -172,7 +172,6 @@ func ReadConfig() error {
 		}
 	}
 
-
 	// Set the PostgreSQL configuration values
 	pgConfig, err = pgxpool.ParseConfig(fmt.Sprintf("host=%s port=%d user= %s password = %s dbname=%s pool_max_conns=%d connect_timeout=10", Conf.Pg.Server, uint16(Conf.Pg.Port), Conf.Pg.Username, Conf.Pg.Password, Conf.Pg.Database, Conf.Pg.NumConnections))
 	clientTLSConfig := tls.Config{}

common/postgresql.go

@@ -490,8 +490,19 @@ func ConnectPostgreSQL() (err error) {
 		return fmt.Errorf("Couldn't connect to PostgreSQL server: %v", err)
 	}
 
-	// Apply any outstanding database migrations
-	m, err := migrate.New(fmt.Sprintf("file://%s/database/migrations", Conf.Web.BaseDir), "pgx5://dbhub@localhost:5432/dbhub")
+	// migrate doesn't handle pgx connection strings, so we need to manually create something it can use
+	var mConnStr string
+	if Conf.Environment.Environment == "production" {
+		mConnStr = fmt.Sprintf("pgx5://%s@%s:%d/%s?password=%s&connect_timeout=10", Conf.Pg.Username, Conf.Pg.Server,
+			uint16(Conf.Pg.Port), Conf.Pg.Database, url.PathEscape(Conf.Pg.Password))
+	} else {
+		// Non-production, so probably our Docker test container
+		mConnStr = "pgx5://dbhub@localhost:5432/dbhub"
+	}
+	if Conf.Pg.SSL {
+		mConnStr += "&sslmode=require"
+	}
+	m, err := migrate.New(fmt.Sprintf("file://%s/database/migrations", Conf.Web.BaseDir), mConnStr)
 	if err != nil {
 		return
 	}