Skip to content

Commit 6d15fba

Browse files
committed
Update db env
1 parent de51cc7 commit 6d15fba

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ go get -u github.com/bulo-hq/go-utils
2626
| POSTGRES_NAME | postgres |
2727
| POSTGRES_USER | postgres |
2828
| POSTGRES_PASS | postgres |
29-
| POSTGRES_SSL_MODE | verify-full |
29+
| POSTGRES_SSL_MODE | |
3030
| POSTGRES_ROOT_CERT_PATH | |
3131
| POSTGRES_CLIENT_CERT_PATH | |
3232
| POSTGRES_CLIENT_KEY_PATH | |

db/env.go

+5-9
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ import (
55
)
66

77
const (
8-
defaultHost = "127.0.0.1"
9-
defaultPort = "5432"
10-
defaultName = "postgres"
11-
defaultUser = "postgres"
12-
defaultPass = "postgres"
13-
defaultSSLMode = "verify-full"
8+
defaultHost = "127.0.0.1"
9+
defaultPort = "5432"
10+
defaultName = "postgres"
11+
defaultUser = "postgres"
12+
defaultPass = "postgres"
1413
)
1514

1615
func Env() (
@@ -49,9 +48,6 @@ func Env() (
4948
if password == "" {
5049
password = defaultPass
5150
}
52-
if sslmode == "" {
53-
sslmode = defaultSSLMode
54-
}
5551

5652
return host, port, dbname, user, password, sslmode, sslrootcert, sslcert, sslkey
5753
}

db/sql_db.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ func GetSQLDB(
2121
uri += fmt.Sprintf(" dbname=%s", dbname)
2222
uri += fmt.Sprintf(" user=%s", user)
2323
uri += fmt.Sprintf(" password=%s", password)
24-
uri += fmt.Sprintf(" sslmode=%s", sslmode)
24+
25+
if sslmode != "" {
26+
uri += fmt.Sprintf(" sslmode=%s", sslmode)
27+
}
2528

2629
if sslrootcert != "" {
2730
uri += fmt.Sprintf(" sslrootcert=%s", sslrootcert)

0 commit comments

Comments
 (0)