brianc · Oct 14, 2015 · Oct 14, 2015 · Oct 14, 2015 · Oct 14, 2015 · Oct 14, 2015
Showing with 93 additions and 21 deletions.

+41 −20 lib/client.js

+3 −1 lib/utils.js

+49 −0 test/unit/client/escape-tests.js
diff --git a/lib/client.js b/lib/client.js
@@ -8,6 +8,7 @@ var ConnectionParameters = require('./connection-parameters');
 var Query = require('./query');
 var defaults = require('./defaults');
 var Connection = require('./connection');
+var utils = require('./utils');
 
 var Client = function(config) {
   EventEmitter.call(this);
@@ -262,31 +263,51 @@ Client.prototype.escapeIdentifier = function(str) {
   return escaped;
 };
 
-// Ported from PostgreSQL 9.2.4 source code in src/interfaces/libpq/fe-exec.c
-Client.prototype.escapeLiteral = function(str) {
+Client.prototype.escapeLiteral = function(value) {
+
+  if(value === null || value === undefined) {
+    return 'NULL';
+  } else if (typeof value === 'number' || value instanceof Number) {
+    return value.toString();
+  } else if (typeof value === 'boolean' || value instanceof Boolean) {
+    /* 
+    Reason for jshint ignore:
+    jshint normally enforces that an equality check with a boolean literal uses === (triple equals sign).
+    However, for this instance, we intentionally use == because === will fail when used with a Boolean object type.
+    The unit tests cover this behavior.
+    */
+    return value == true ? 'TRUE' : 'FALSE'; // jshint ignore:line
+  } else if (value instanceof Date) {
+    return utils.dateToString(value);
+  } else if (value.constructor === Array) {
+    return utils.arrayString(value);
+  } else if(typeof value === 'string' || value instanceof String) {
+    // Ported from PostgreSQL 9.2.4 source code in src/interfaces/libpq/fe-exec.c
+    var hasBackslash = false;
+    var escaped = '\'';
+
+    for(var i = 0; i < value.length; i++) {
+      var c = value[i];
+      if(c === '\'') {
+        escaped += c + c;
+      } else if (c === '\\') {
+        escaped += c + c;
+        hasBackslash = true;
+      } else {
+        escaped += c;
+      }
+    }
 
-  var hasBackslash = false;
-  var escaped = '\'';
+    escaped += '\'';
 
-  for(var i = 0; i < str.length; i++) {
-    var c = str[i];
-    if(c === '\'') {
-      escaped += c + c;
-    } else if (c === '\\') {
-      escaped += c + c;
-      hasBackslash = true;
-    } else {
-      escaped += c;
+    if(hasBackslash === true) {
+      escaped = ' E' + escaped;
     }
-  }
-
-  escaped += '\'';
 
-  if(hasBackslash === true) {
-    escaped = ' E' + escaped;
+    return escaped;
+  } else {
+    return value;
   }
-
-  return escaped;
 };
 
 Client.prototype._pulseQueryQueue = function() {

diff --git a/lib/utils.js b/lib/utils.js
@@ -127,5 +127,7 @@ module.exports = {
     //by accident, eg: from calling values.map(utils.prepareValue)
     return prepareValue(value);
   },
-  normalizeQueryConfig: normalizeQueryConfig
+  normalizeQueryConfig: normalizeQueryConfig,
+  arrayString: arrayString,
+  dateToString: dateToString
 };
diff --git a/test/unit/client/escape-tests.js b/test/unit/client/escape-tests.js
@@ -1,4 +1,5 @@
 var helper = require(__dirname + '/test-helper');
+var testDateHelper = require('../test-helper');
 
 function createClient(callback) {
   var client = new Client(helper.config);
@@ -47,6 +48,54 @@ testLit('escapeLiteral: contains single quotes and backslashes',
 testLit('escapeLiteral: contains single quotes, double quotes, and backslashes',
         'hello \\ \' " world', " E'hello \\\\ '' \" world'");
 
+testLit('escapeLiteral: empty string',
+        '', "''");
+
+testLit('escapeLiteral: null',
+        null, "NULL");
+
+testLit('escapeLiteral: undefined',
+        undefined, "NULL");
+
+testLit('escapeLiteral: zero as a string',
+        '0', "'0'");
+
+testLit('escapeLiteral: zero as a number',
+        0, "0");
+
+testLit('escapeLiteral: number',
+        42, "42");
+
+testLit('escapeLiteral: Number object',
+        new Number(88), "88");
+
+testLit('escapeLiteral: true',
+        true, "TRUE");
+
+testLit('escapeLiteral: false',
+        false, "FALSE");
+
+testLit('escapeLiteral: true Boolean object',
+        new Boolean(true), "TRUE");
+
+testLit('escapeLiteral: false Boolean object',
+        new Boolean(false), "FALSE");
+
+test('escapeLiteral: Date', function() {
+  testDateHelper.setTimezoneOffset(420);
+
+  var d = new Date(2015, 9, 27); // note: Javascript month range is 0 - 11  
+
+  var client = new Client(helper.config);
+  var actual = client.escapeLiteral(d);
+  assert.equal('2015-10-27T00:00:00.000-07:00', actual);
+
+  testDateHelper.resetTimezoneOffset();
+});
+
+testLit('escapeLiteral: array',
+        ['Nintendo', 64], '{"Nintendo","64"}');
+
 testIdent('escapeIdentifier: no special characters',
         'hello world', '"hello world"');