pg 7.0.2 → 7.1.2

package/CHANGELOG.md

@@ -4,6 +4,12 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### 7.1.0
+
+#### Enhancements
+
+- [You can now supply both a connection string and additional config options to clients.](https://github.com/brianc/node-postgres/pull/1363)
+
 ### 7.0.0
 
 #### Breaking Changes

package/README.md

@@ -48,6 +48,10 @@ You can also follow me [@briancarlson](https://twitter.com/briancarlson) if that
 
 I offer professional support for node-postgres.  I provide implementation, training, and many years of expertise on how to build applications with node, express, PostgreSQL, and react/redux.  Please contact me at [brian.m.carlson@gmail.com](mailto:brian.m.carlson@gmail.com) to discuss how I can help your company be more successful!
 
+### Sponsorship :star:
+
+If you are benefiting from node-postgres and would like to help keep the project financially sustainable please visit Brian Carlson's [Patreon page](https://www.patreon.com/node_postgres).
+
 ## Contributing
 
 __:heart: contributions!__

package/SPONSORS.md

@@ -0,0 +1,8 @@
+node-postgres is made possible by the helpful contributors from the community well as the following generous supporters on [Patreon](https://www.patreon.com/node_postgres).
+
+# Leaders
+
+# Supporters
+- John Fawcett
+- Lalit Kapoor [@lalitkapoor](https://twitter.com/lalitkapoor)
+- Paul Frazee [@pfrazee](https://twitter.com/pfrazee)

package/lib/connection-parameters.js

@@ -11,6 +11,8 @@ var dns = require('dns')
 
 var defaults = require('./defaults')
 
+var parse = require('pg-connection-string').parse // parses a connection string
+
 var val = function (key, config, envVar) {
   if (envVar === undefined) {
     envVar = process.env[ 'PG' + key.toUpperCase() ]
@@ -25,9 +27,6 @@ var val = function (key, config, envVar) {
     defaults[key]
 }
 
-// parses a connection string
-var parse = require('pg-connection-string').parse
-
 var useSsl = function () {
   switch (process.env.PGSSLMODE) {
     case 'disable':
@@ -43,12 +42,14 @@ var useSsl = function () {
 
 var ConnectionParameters = function (config) {
   // if a string is passed, it is a raw connection string so we parse it into a config
-  config = typeof config === 'string' ? parse(config) : (config || {})
+  config = typeof config === 'string' ? parse(config) : config || {}
+
   // if the config has a connectionString defined, parse IT into the config we use
   // this will override other default values with what is stored in connectionString
   if (config.connectionString) {
-    config = parse(config.connectionString)
+    config = Object.assign({}, config, parse(config.connectionString))
   }
+
   this.user = val('user', config)
   this.database = val('database', config)
   this.port = parseInt(val('port', config), 10)

package/lib/index.js

@@ -15,10 +15,7 @@ var Pool = require('pg-pool')
 
 const poolFactory = (Client) => {
   var BoundPool = function (options) {
-    var config = { Client: Client }
-    for (var key in options) {
-      config[key] = options[key]
-    }
+    var config = Object.assign({ Client: Client }, options)
     return new Pool(config)
   }
 

package/lib/result.js

@@ -8,6 +8,7 @@
  */
 
 var types = require('pg-types')
+var escape = require('js-string-escape')
 
 // result object returned from query
 // in the 'end' event and also
@@ -82,7 +83,7 @@ var inlineParser = function (fieldName, i) {
     // Addendum: However, we need to make sure to replace all
     // occurences of apostrophes, not just the first one.
     // See https://github.com/brianc/node-postgres/issues/934
-    fieldName.replace(/'/g, "\\'") +
+    escape(fieldName) +
     "'] = " +
     'rowData[' + i + '] == null ? null : parsers[' + i + '](rowData[' + i + ']);'
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "7.0.2",
+  "version": "7.1.2",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "postgres",
@@ -20,6 +20,7 @@
   "dependencies": {
     "buffer-writer": "1.0.1",
     "packet-reader": "0.3.1",
+    "js-string-escape": "1.0.1",
     "pg-connection-string": "0.1.3",
     "pg-pool": "2.*",
     "pg-types": "1.*",