From 65420494d29808a3d3e3a0731ec433523cef789e Mon Sep 17 00:00:00 2001 From: Dan Sosedoff Date: Thu, 9 Oct 2014 22:42:52 -0500 Subject: [PATCH] Add support for connection string as url --- main.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index 4ca214c..0b3070b 100644 --- a/main.go +++ b/main.go @@ -36,14 +36,20 @@ var dbClient *Client var history []string var options struct { + Url string `long:"url" description:"Database connection string"` Host string `short:"h" long:"host" description:"Server hostname or IP" default:"localhost"` Port int `short:"p" long:"port" description:"Server port" default:"5432"` User string `short:"u" long:"user" description:"Database user" 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"` } func getConnectionString() string { + if options.Url != "" { + return options.Url + } + return fmt.Sprintf( "host=%s port=%d user=%s dbname=%s sslmode=disable", options.Host, options.Port, @@ -52,7 +58,6 @@ func getConnectionString() string { } func NewClient() (*Client, error) { - fmt.Println(getConnectionString()) db, err := sqlx.Open("postgres", getConnectionString()) if err != nil {