gopkg/pgx
2
0
Fork 0
Code Activity

Merge pull request #513 from sidh/issues/495

Browse Source 
Fix PreferSimpleProtocol overwrite
This commit is contained in:
Jack Christensen
2019-03-08 15:27:02 -06:00
committed by GitHub
parent fb61dbf363 8fe19f698b
commit 051e69d512
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conn.go
+1 -1
View File
@@ -707,7 +707,7 @@ func (old ConnConfig) Merge(other ConnConfig) ConnConfig {
cc.Dial = other.Dial cc.Dial = other.Dial
} }
cc.PreferSimpleProtocol = other.PreferSimpleProtocol cc.PreferSimpleProtocol = old.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 {