Skip to content

Quote empty parameters or those containing spaces in generated connec… #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Quote empty parameters or those containing spaces in generated connec… #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions pkg/models/database_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,25 @@ type DatabaseConfig struct {
AdditionalParams map[string]string `json:"additionalParams,omitempty"` // Optional additional connection parameters mapped into the connection string
}

func quoteConfigParameter(s string) string {
if s == "" {
return "''"
}
if !strings.Contains(s, " ") {
return s
}
return "'" + s + "'"
}

// Generates a connection string to be passed to sql.Open or equivalents, assuming Postgres syntax
func (c DatabaseConfig) ConnectionString() string {
var b strings.Builder
b.WriteString(fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s", c.Host, c.Port, c.Username, c.Password, c.Database))
b.WriteString(fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s",
quoteConfigParameter(c.Host),
c.Port,
quoteConfigParameter(c.Username),
quoteConfigParameter(c.Password),
quoteConfigParameter(c.Database)))

if _, ok := c.AdditionalParams["sslmode"]; !ok {
b.WriteString(" sslmode=disable")
Expand All @@ -33,7 +48,7 @@ func (c DatabaseConfig) ConnectionString() string {
sort.Strings(params)

for _, param := range params {
fmt.Fprintf(&b, " %s=%s", param, c.AdditionalParams[param])
fmt.Fprintf(&b, " %s=%s", param, quoteConfigParameter(c.AdditionalParams[param]))
}
}

Expand Down