This commit is contained in:
Matthew Dillon 2015-01-05 16:28:03 -09:00
parent 50c09481ec
commit 16e742fcd7
5 changed files with 59 additions and 4 deletions

View file

@ -26,6 +26,7 @@ var connectOnce sync.Once
func Connect() {
connectOnce.Do(func() {
var err error
setDBCredentialsFromFig()
DB.Dbx, err = sqlx.Open("postgres", "timezone=UTC sslmode=disable")
if err != nil {
log.Fatal("Error connecting to PostgreSQL database (using PG* environment variables): ", err)
@ -35,8 +36,6 @@ func Connect() {
})
}
var createSQL []string
// Create the database schema. It calls log.Fatal if it encounters an error.
func Create(path string) {
migrator, err := gomigrate.NewMigrator(DB.Dbx.DB, gomigrate.Postgres{}, path)
@ -93,3 +92,12 @@ func transact(dbh modl.SqlExecutor, fn func(fbh modl.SqlExecutor) error) error {
return nil
}
func setDBCredentialsFromFig() {
if figVal := os.Getenv("BACTDB_DB_1_PORT_5432_TCP_ADDR"); figVal != "" {
err := os.Setenv("PGHOST", figVal)
if err != nil {
log.Print(err)
}
}
}