Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: Fixing up postgres connection strings (#96)

Browse source
This commit is contained in:
Mukundan Kidambi 2021-09-24 02:49:41 -07:00 • committed by GitHub
parent 8d43829bc5
commit a85eafd58c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
generator/postgres/postgres_generator.go
View file

@ -3,6 +3,7 @@ package postgres
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
"net/url"
"path" "path"
"strconv" "strconv"
@ -31,8 +32,11 @@ type DBConnection struct {
func Generate(destDir string, dbConn DBConnection, genTemplate ...template.Template) (err error) { func Generate(destDir string, dbConn DBConnection, genTemplate ...template.Template) (err error) {
defer utils.ErrorCatch(&err) defer utils.ErrorCatch(&err)
connectionString := fmt.Sprintf("host=%s port=%s user=%s password=%s dbname=%s sslmode=%s %s", if dbConfig.SchemaName == "" {
dbConn.Host, strconv.Itoa(dbConn.Port), dbConn.User, dbConn.Password, dbConn.DBName, dbConn.SslMode, dbConn.Params) dbConfig.SchemaName = "public"
}
connectionString := fmt.Sprintf("postgresql://%s:%s@%s:%s/%s?sslmode=%s&search_path=%s",
dbConn.User, url.QueryEscape(dbConn.Password), dbConn.Host, strconv.Itoa(dbConn.Port), dbConn.DBName, dbConn.SslMode, dbConn.SchemaName)
db := openConnection(connectionString) db := openConnection(connectionString)
defer utils.DBClose(db) defer utils.DBClose(db)