You've already forked reloading-manager
Nobody had ever created a function like this one before. (#26)
Reviewed-on: rrise/reloading-manager#26 Co-authored-by: Ron Rise <ron@siteworxpro.com> Co-committed-by: Ron Rise <ron@siteworxpro.com>
This commit is contained in:
@@ -31,7 +31,7 @@ type Database struct {
|
||||
Loads *loads.Queries
|
||||
}
|
||||
|
||||
func (*Database) DSN() string {
|
||||
func (*Database) DSN(hidePassword bool) string {
|
||||
dbHost := DbHost.GetEnvString("localhost")
|
||||
dbDatabase := DbDatabase.GetEnvString("loading")
|
||||
dbUser := DbUser.GetEnvString("postgres")
|
||||
@@ -39,13 +39,21 @@ func (*Database) DSN() string {
|
||||
|
||||
extraParams := "?sslmode=require"
|
||||
|
||||
if dbHost == "localhost" || dbHost == "127.0.0.1" {
|
||||
extraParams = "?sslmode=disable"
|
||||
}
|
||||
|
||||
if hidePassword {
|
||||
dbPassword = "********"
|
||||
}
|
||||
|
||||
return fmt.Sprintf("postgres://%s:%s@%s:5432/%s%s", dbUser, dbPassword, dbHost, dbDatabase, extraParams)
|
||||
}
|
||||
|
||||
func GetNewDatabase() *Database {
|
||||
var dbSingleton Database
|
||||
|
||||
conn, dbErr := pgx.Connect(context.Background(), dbSingleton.DSN())
|
||||
conn, dbErr := pgx.Connect(context.Background(), dbSingleton.DSN(false))
|
||||
if dbErr != nil {
|
||||
log.Fatal(dbErr)
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func (db *Database) Migrate() {
|
||||
sqlDB, err := sql.Open("postgres", db.DSN())
|
||||
sqlDB, err := sql.Open("postgres", db.DSN(false))
|
||||
|
||||
driver, err := postgres.WithInstance(sqlDB, &postgres.Config{
|
||||
MigrationsTable: "schema_migrations",
|
||||
|
||||
Reference in New Issue
Block a user