Merge branch 'master' of https://github.com/brianc/node-postgres into brianc-master

Conflicts:
	lib/defaults.js

Author: NumminorihSF

NEWS.md

@@ -4,6 +4,9 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### v4.5.0
+- Add option to parse JS date objects in query parameters as [UTC](https://github.com/brianc/node-postgres/pull/943)
+
 ### v4.4.0
 - Warn to `stderr` if a named query exceeds 63 characters which is the max lenght supported by postgres.
 

README.md

@@ -147,10 +147,14 @@ node-postgres is by design pretty light on abstractions.  These are some handy m
 - [iceddev/pg-transact](https://github.com/iceddev/pg-transact) - A nicer API on node-postgres transactions
 - [sehrope/node-pg-db](https://github.com/sehrope/node-pg-db) - Simpler interface, named parameter support, transaction management and event hooks.
 - [vitaly-t/pg-promise](https://github.com/vitaly-t/pg-promise) - Use node-postgres via [Promises/A+](https://promisesaplus.com/).
+- [kriasoft/node-pg-client](https://github.com/kriasoft/node-pg-client) - Promise-based wrapper for `node-postgres` designed for easy use with ES7 async/await.
 - [pg-then](https://github.com/coderhaoxin/pg-then) A tiny wrapper of `pg` for promise api.
+- [pg-rxjs](https://github.com/jadbox/pg-rxjs) Another tiny wrapper like `pg-then` but for [RxJS](https://github.com/Reactive-Extensions/RxJS)
 - [acarl/pg-restify](https://github.com/acarl/pg-restify) - Creates a generic REST API for a postgres database using restify.
 - [XeCycle/pg-template-tag](https://github.com/XeCycle/pg-template-tag) - Write queries with ES6 tagged template literals, a "poor man's query builder".
 - [recursivefunk/pg-gen](https://github.com/recursivefunk/pg-gen) - Use ES6 Generators to paginate through large Postgres result sets
+- [vitaly-t/pg-minify](https://github.com/vitaly-t/pg-minify) - Minifies PostgreSQL scripts.
+- [MassiveJS](https://github.com/robconery/massive-js) - A simple relational data access tool that has full JSONB document support for Postgres.
 
 ## License
 

lib/defaults.js

@@ -40,12 +40,10 @@ var defaults = module.exports = {
 
   ssl: false,
 
-  application_name : undefined,
+  application_name: undefined,
   fallback_application_name: undefined,
 
-  //heartbeat interval to check, that socket is alive. if 0 - heartbeat is disabled (for backward capability).
-  //else - timeout in ms.
-  heartbeat_interval: 0
+  parseInputDatesAsUTC: false
 };
 
 //parse int8 so you can get your count values as actual numbers

lib/native/result.js

@@ -19,3 +19,10 @@ NativeResult.prototype.addCommandComplete = function(pq) {
     });
   }
 };
+
+NativeResult.prototype.addRow = function(row) {
+  // This is empty to ensure pg code doesn't break when switching to pg-native
+  // pg-native loads all rows into the final result object by default.
+  // This is because libpg loads all rows into memory before passing the result
+  // to pg-native.
+};

lib/result.js

@@ -70,7 +70,10 @@ var inlineParser = function(fieldName, i) {
     //fields containing single quotes will break
     //the evaluated javascript unless they are escaped
     //see https://github.com/brianc/node-postgres/issues/507
-    fieldName.replace("'", "\\'") +
+    //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, "\\'") +
     "'] = " +
     "rowData[" + i + "] == null ? null : parsers[" + i + "](rowData[" + i + "]);";
 };

lib/utils.js

@@ -1,3 +1,4 @@
+var defaults = require('./defaults');
 
 // convert a JS array to a postgres array literal
 // uses comma separator so won't work for types like box that use
@@ -32,7 +33,11 @@ var prepareValue = function(val, seen) {
     return val;
   }
   if(val instanceof Date) {
-    return dateToString(val);
+    if(defaults.parseInputDatesAsUTC) {
+      return dateToStringUTC(val);
+    } else {
+      return dateToString(val);
+    }
   }
   if(Array.isArray(val)) {
     return arrayString(val);
@@ -59,13 +64,14 @@ function prepareObject(val, seen) {
   return JSON.stringify(val);
 }
 
+function pad(number, digits) {
+  number = ""  +number;
+  while(number.length < digits)
+    number = "0" + number;
+  return number;
+}
+
 function dateToString(date) {
-  function pad(number, digits) {
-    number = ""+number;
-    while(number.length < digits)
-      number = "0"+number;
-    return number;
-  }
 
   var offset = -date.getTimezoneOffset();
   var ret = pad(date.getFullYear(), 4) + '-' +
@@ -86,6 +92,19 @@ function dateToString(date) {
   return ret + pad(Math.floor(offset/60), 2) + ":" + pad(offset%60, 2);
 }
 
+function dateToStringUTC(date) {
+  
+  var ret = pad(date.getUTCFullYear(), 4) + '-' +
+      pad(date.getUTCMonth() + 1, 2) + '-' +
+      pad(date.getUTCDate(), 2) + 'T' +
+      pad(date.getUTCHours(), 2) + ':' +
+      pad(date.getUTCMinutes(), 2) + ':' +
+      pad(date.getUTCSeconds(), 2) + '.' +
+      pad(date.getUTCMilliseconds(), 3);
+  
+  return ret + "+00:00";
+}
+
 function normalizeQueryConfig (config, values, callback) {
   //can take in strings or config objects
   config = (typeof(config) == 'string') ? { text: config } : config;
@@ -103,6 +122,10 @@ function normalizeQueryConfig (config, values, callback) {
 }
 
 module.exports = {
-  prepareValue: prepareValue,
+  prepareValue: function prepareValueWrapper (value) {
+    //this ensures that extra arguments do not get passed into prepareValue
+    //by accident, eg: from calling values.map(utils.prepareValue)
+    return prepareValue(value);
+  },
   normalizeQueryConfig: normalizeQueryConfig
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "4.4.3",
+  "version": "4.5.1",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "postgres",
@@ -18,7 +18,7 @@
   "author": "Brian Carlson <brian.m.carlson@gmail.com>",
   "main": "./lib",
   "dependencies": {
-    "buffer-writer": "1.0.0",
+    "buffer-writer": "1.0.1",
     "generic-pool": "2.1.1",
     "packet-reader": "0.2.0",
     "pg-connection-string": "0.1.3",

test/integration/client/query-column-names-tests.js

@@ -0,0 +1,13 @@
+var helper = require(__dirname + '/../test-helper');
+var pg = helper.pg;
+
+test('support for complex column names', function() {
+  pg.connect(helper.config, assert.success(function(client, done) {
+    client.query("CREATE TEMP TABLE t ( \"complex''column\" TEXT )");
+    client.query('SELECT * FROM t', assert.success(function(res) {
+        done();
+        assert.strictEqual(res.fields[0].name, "complex''column");
+        pg.end();
+    }));
+  }));
+});

test/integration/client/simple-query-tests.js

@@ -36,6 +36,27 @@ test("simple query interface", function() {
   });
 });
 
+test("simple query interface using addRow", function() {
+
+  var client = helper.client();
+
+  var query = client.query("select name from person order by name");
+
+  client.on('drain', client.end.bind(client));
+
+  query.on('row', function(row, result) {
+    assert.ok(result);
+    result.addRow(row);
+  });
+
+  query.on('end', function(result) {
+    assert.lengthIs(result.rows, 26, "result returned wrong number of rows");
+    assert.lengthIs(result.rows, result.rowCount);
+    assert.equal(result.rows[0].name, "Aaron");
+    assert.equal(result.rows[25].name, "Zanzabar");
+  });
+});
+
 test("multiple simple queries", function() {
   var client = helper.client();
   client.query({ text: "create temp table bang(id serial, name varchar(5));insert into bang(name) VALUES('boom');"})

test/unit/utils-tests.js

@@ -65,6 +65,17 @@ test('prepareValues: date prepared properly', function() {
   helper.resetTimezoneOffset();
 });
 
+test('prepareValues: date prepared properly as UTC', function() {
+  defaults.parseInputDatesAsUTC = true;
+
+  // make a date in the local timezone that represents a specific UTC point in time
+  var date = new Date(Date.UTC(2014, 1, 1, 11, 11, 1, 7));
+  var out = utils.prepareValue(date);
+  assert.strictEqual(out, "2014-02-01T11:11:01.007+00:00");
+
+  defaults.parseInputDatesAsUTC = false;
+});
+
 test('prepareValues: undefined prepared properly', function() {
   var out = utils.prepareValue(void 0);
   assert.strictEqual(out, null);
@@ -171,3 +182,14 @@ test('prepareValue: objects with circular toPostgres rejected', function() {
   }
   throw new Error("Expected prepareValue to throw exception");
 });
+
+test('prepareValue: can safely be used to map an array of values including those with toPostgres functions', function() {
+  var customType = {
+    toPostgres: function() {
+      return "zomgcustom!";
+    }
+  };
+  var values = [1, "test", customType]
+  var out = values.map(utils.prepareValue)
+  assert.deepEqual(out, [1, "test", "zomgcustom!"])
+})