GOMODULES
/
goose
mirror of https://github.com/pressly/goose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dbconf: cleaning, no need to declare several error variables

pull/2/head
Liam Staskawicz 2013-04-07 11:21:04 -07:00
parent 84b1aeabec
commit f1ab447a9a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dbconf.go
View File

@ -3,8 +3,8 @@ package main
import ( import (
"flag" "flag"
"fmt" "fmt"
"github.com/lib/pq"
"github.com/kylelemons/go-gypsy/yaml" "github.com/kylelemons/go-gypsy/yaml"
"github.com/lib/pq"
"os" "os"
"path/filepath" "path/filepath"
) )
@ -35,23 +35,23 @@ func makeDBConfDetails(p, env string) (*DBConf, error) {
return nil, err return nil, err
} }
drv, derr := f.Get(fmt.Sprintf("%s.driver", env)) drv, err := f.Get(fmt.Sprintf("%s.driver", env))
if derr != nil { if err != nil {
return nil, derr return nil, err
} }
open, oerr := f.Get(fmt.Sprintf("%s.open", env)) open, err := f.Get(fmt.Sprintf("%s.open", env))
if oerr != nil { if err != nil {
return nil, oerr return nil, err
} }
open = os.ExpandEnv(open) open = os.ExpandEnv(open)
// Automatically parse postgres urls // Automatically parse postgres urls
if drv == "postgres" { if drv == "postgres" {
parsed_open, parse_err := pq.ParseURL(open)
// Assumption: If we can parse the URL, we should // Assumption: If we can parse the URL, we should
if parse_err == nil && parsed_open != "" { if parsedURL, err := pq.ParseURL(open); err == nil && parsedURL != "" {
open = parsed_open open = parsedURL
} }
} }