archive-gh-me/node-postgres
1
0
Fork 0
mirror of https://github.com/brianc/node-postgres.git synced 2025-12-08 20:16:25 +00:00
Code Issues Projects Releases Wiki Activity

Re-implement changes from conflict

Browse Source
This commit is contained in:
Brian M. Carlson 2017-07-16 16:35:32 -05:00
parent 8bfdd39c4d
commit f9390dab6b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/client.js
View File

@ -40,11 +40,11 @@ var Client = function (config) {
this.connection = c.connection || new Connection({
stream: c.stream,
ssl: this.connectionParameters.ssl,
keepAlive: c.keepAlive || false
keepAlive: c.keepAlive || false,
encoding: this.connectionParameters.client_encoding || 'utf8'
})
this.queryQueue = []
this.binary = c.binary || defaults.binary
this.encoding = 'utf8'
this.processID = null
this.secretKey = null
this.ssl = this.connectionParameters.ssl || false

2
lib/connection.js
View File

@ -25,7 +25,7 @@ var Connection = function (config) {
this.lastOffset = 0
this.buffer = null
this.offset = null
this.encoding = 'utf8'
this.encoding = config.encoding || 'utf8'
this.parsedStatements = {}
this.writer = new Writer()
this.ssl = config.ssl || false