balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Add support for connection string as url

Browse Source
This commit is contained in:
Dan Sosedoff 2014-10-09 22:42:52 -05:00
parent b3da515b81
commit 65420494d2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main.go
View File

@ -36,14 +36,20 @@ var dbClient *Client
var history []string var history []string
var options struct { var options struct {
Url string `long:"url" description:"Database connection string"`
Host string `short:"h" long:"host" description:"Server hostname or IP" default:"localhost"` Host string `short:"h" long:"host" description:"Server hostname or IP" default:"localhost"`
Port int `short:"p" long:"port" description:"Server port" default:"5432"` Port int `short:"p" long:"port" description:"Server port" default:"5432"`
User string `short:"u" long:"user" description:"Database user" default:"postgres"` User string `short:"u" long:"user" description:"Database user" default:"postgres"`
DbName string `short:"d" long:"db" description:"Database name" default:"postgres"` DbName string `short:"d" long:"db" description:"Database name" default:"postgres"`
Ssl string `long:"ssl" description:"SSL option" default:"disable"`
Static string `short:"s" description:"Path to static assets" default:"./static"` Static string `short:"s" description:"Path to static assets" default:"./static"`
} }
func getConnectionString() string { func getConnectionString() string {
if options.Url != "" {
return options.Url
}
return fmt.Sprintf( return fmt.Sprintf(
"host=%s port=%d user=%s dbname=%s sslmode=disable", "host=%s port=%d user=%s dbname=%s sslmode=disable",
options.Host, options.Port, options.Host, options.Port,
@ -52,7 +58,6 @@ func getConnectionString() string {
} }
func NewClient() (*Client, error) { func NewClient() (*Client, error) {
fmt.Println(getConnectionString())
db, err := sqlx.Open("postgres", getConnectionString()) db, err := sqlx.Open("postgres", getConnectionString())
if err != nil { if err != nil {