adds db connection string

MartinGallauner · Jul 5, 2024 · f1d1414 · f1d1414
1 parent 68d2d8d
commit f1d1414
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/internal/database.go b/internal/database.go
@@ -9,13 +9,14 @@ import (
 )
 
 type DatabaseConfig struct {
-	Host     string `env:"POSTGRES_HOST" validate:"hostname"` 
-	DbUser   string `env:"POSTGRES_USER"`
-	Password string `env:"POSTGRES_PASSWORD"`
-	Dbname   string `env:"POSTGRES_DBNAME"`
-	Port     int `env:"POSTGRES_PORT"`
-	Sslmode  string `env:"POSTGRES_SSLMODE"`
-	Timezone string `env:"TIMEZONE"`
+	Host        string `env:"POSTGRES_HOST" validate:"hostname"`
+	DbUser      string `env:"POSTGRES_USER"`
+	Password    string `env:"POSTGRES_PASSWORD"`
+	Dbname      string `env:"POSTGRES_DBNAME"`
+	Port        int    `env:"POSTGRES_PORT"`
+	Sslmode     string `env:"POSTGRES_SSLMODE"`
+	Timezone    string `env:"TIMEZONE"`
+	DatabaseUrl string `env:"DATABASE_URL"`
 }
 
 func ReadDatabaseConfig() (DatabaseConfig, error) {
@@ -34,9 +35,10 @@ func SetupDatabase(config DatabaseConfig) (*gorm.DB, error) {
 	if err != nil {
 		return nil, err
 	}
-	connString := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s", 
-	config.Host, config.DbUser, config.Password, config.Dbname, config.Port, config.Sslmode, config.Timezone)
-	return SetupDatabaseWithDSN(connString)
+	// commented out to use the connection string provided by Digital Ocean
+	/* connString := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s",
+		config.Host, config.DbUser, config.Password, config.Dbname, config.Port, config.Sslmode, config.Timezone) */
+	return SetupDatabaseWithDSN(config.DatabaseUrl)
 }
 
 func SetupDatabaseWithDSN(connString string) (*gorm.DB, error) {