gopkg/pgx
2
0
Fork 0
Code Activity

Merge pull request #436 from ikitiki/fix-config-merge

Browse Source 
Mind PreferSimpleProtocol parameter in the config Merge method
This commit is contained in:
Jack Christensen
2018-07-24 09:53:07 -05:00
committed by GitHub
parent b8832c26d4 d9f21d02a5
commit 93ee40e691
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conn.go
+2
View File
@@ -706,6 +706,8 @@ func (old ConnConfig) Merge(other ConnConfig) ConnConfig {
cc.Dial = other.Dial cc.Dial = other.Dial
} }
cc.PreferSimpleProtocol = other.PreferSimpleProtocol
cc.RuntimeParams = make(map[string]string) cc.RuntimeParams = make(map[string]string)
for k, v := range old.RuntimeParams { for k, v := range old.RuntimeParams {
cc.RuntimeParams[k] = v cc.RuntimeParams[k] = v