ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve a bit more upon work done in #10922 and only return a quoted 

string if there is whitespace present.

Aesthetics.  What can I say.
This commit is contained in:
Sean Chittenden 2016-12-25 06:19:14 -08:00
parent d92a3caedf
commit 7d19fcae25
No known key found for this signature in database
GPG Key ID: 4EBC9DC16C2E5E16
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/providers/postgresql/config.go
View File

@ -5,6 +5,7 @@ import (
"database/sql"
"fmt"
"log"
"unicode"
_ "github.com/lib/pq" //PostgreSQL db
)
@ -38,7 +39,12 @@ func (c *Config) NewClient() (*Client, error) {
q := func(s string) string {
b := bytes.NewBufferString(`'`)
b.Grow(len(s) + 2)
var haveWhitespace bool
for _, r := range s {
if unicode.IsSpace(r) {
haveWhitespace = true
}
switch r {
case '\'':
b.WriteString(`\'`)
@ -50,7 +56,12 @@ func (c *Config) NewClient() (*Client, error) {
}
b.WriteString(`'`)
return b.String()
str := b.String()
if haveWhitespace {
return str
}
return str[1 : len(str)-1]
}
logDSN := fmt.Sprintf(dsnFmt, q(c.Host), c.Port, q(c.Database), q(c.Username), q("<redacted>"), q(c.SSLMode), q(c.ApplicationName), c.ConnectTimeoutSec)