Revert "Merge pull request brianc#290 from ericjperry/master"

brianc · brianc · commit 7f072ae52e9d · 2016-01-27T11:33:14.000-06:00
This reverts commit 7a64031, reversing changes made to cbd17ea.
diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
@@ -26,7 +26,7 @@ Postgres.prototype._getParameterText = function(index, value) {
   }
 };
 
-Postgres.prototype._getParameterValue = function(value, quoteChar) {
+Postgres.prototype._getParameterValue = function(value) {
   // handle primitives
   if (null === value) {
     value = 'NULL';
@@ -36,22 +36,13 @@ Postgres.prototype._getParameterValue = function(value, quoteChar) {
     // number is just number
     value = value;
   } else if ('string' === typeof value) {
-    // string uses single quote by default
-    value = this.quote(value, quoteChar || "'");
+    // string uses single quote
+    value = this.quote(value, "'");
   } else if ('object' === typeof value) {
     if (_.isArray(value)) {
       // convert each element of the array
-      if (this._myClass === Postgres) {
-        var self = this;
-        value = value.map(function (item) {
-            // In a Postgres array, strings must be double-quoted
-            return self._getParameterValue(item, '"');
-        });
-        value = '\'{' + value.join(',') + '}\'';
-      } else {
-        value = _.map(value, this._getParameterValue, this);
-        value = '(' + value.join(', ') + ')';
-      }
+      value = _.map(value, this._getParameterValue, this);
+      value = '(' + value.join(', ') + ')';
     } else if (_.isFunction(value.toISOString)) {
       // Date object's default toString format does not get parsed well
       // Handle date like objects using toISOString
diff --git a/test/dialects/insert-tests.js b/test/dialects/insert-tests.js
@@ -1,15 +1,9 @@
 'use strict';
 
-var Table = require(__dirname + '/../../lib/table');
 var Harness = require('./support');
 var post = Harness.definePostTable();
 var user = Harness.defineUserTable();
 
-var arrayTable = Table.define({
-    name: 'arraytest',
-    columns: ['id', 'numbers']
-});
-
 Harness.test({
   query: post.insert(post.content.value('test'), post.userId.value(1)),
   pg: {
@@ -636,43 +630,3 @@ Harness.test({
   },
   params: []
 });
-
-Harness.test({
-  query: arrayTable.insert(arrayTable.id.value(1), arrayTable.numbers.value([2, 3, 4])),
-  pg: {
-    text  : 'INSERT INTO "arraytest" ("id", "numbers") VALUES ($1, $2)',
-    string: 'INSERT INTO "arraytest" ("id", "numbers") VALUES (1, \'{2,3,4}\')'
-  },
-  sqlite: {
-    text  : 'INSERT INTO "arraytest" ("id", "numbers") VALUES ($1, $2)',
-    string: 'INSERT INTO "arraytest" ("id", "numbers") VALUES (1, (2, 3, 4))'
-  },
-  mysql: {
-    text  : 'INSERT INTO `arraytest` (`id`, `numbers`) VALUES (?, ?)',
-    string: 'INSERT INTO `arraytest` (`id`, `numbers`) VALUES (1, (2, 3, 4))'
-  },
-  oracle: {
-    text  : 'INSERT INTO "arraytest" ("id", "numbers") VALUES (:1, :2)',
-    string: 'INSERT INTO "arraytest" ("id", "numbers") VALUES (1, (2, 3, 4))'
-  }
-});
-
-Harness.test({
-  query: arrayTable.insert(arrayTable.id.value(1), arrayTable.numbers.value(["one", "two", "three"])),
-  pg: {
-    text  : 'INSERT INTO "arraytest" ("id", "numbers") VALUES ($1, $2)',
-    string: 'INSERT INTO "arraytest" ("id", "numbers") VALUES (1, \'{"one","two","three"}\')'
-  },
-  sqlite: {
-    text  : 'INSERT INTO "arraytest" ("id", "numbers") VALUES ($1, $2)',
-    string: 'INSERT INTO "arraytest" ("id", "numbers") VALUES (1, (\'one\', \'two\', \'three\'))'
-  },
-  mysql: {
-    text  : 'INSERT INTO `arraytest` (`id`, `numbers`) VALUES (?, ?)',
-    string: 'INSERT INTO `arraytest` (`id`, `numbers`) VALUES (1, (\'one\', \'two\', \'three\'))'
-  },
-  oracle: {
-    text  : 'INSERT INTO "arraytest" ("id", "numbers") VALUES (:1, :2)',
-    string: 'INSERT INTO "arraytest" ("id", "numbers") VALUES (1, (\'one\', \'two\', \'three\'))'
-  }
-});
