Change hstore and range parse to use pg types arrayparser. Provides a better fix for #3383

lib/dialects/postgres/index.js

@@ -11,6 +11,10 @@ var PostgresDialect = function(sequelize) {
   this.sequelize = sequelize;
   this.sequelize = sequelize;
   this.connectionManager = new ConnectionManager(this, sequelize);
   this.connectionManager = new ConnectionManager(this, sequelize);
   this.connectionManager.initPools();
   this.connectionManager.initPools();
+
+  // parseDialectSpecificFields needs access to the pg lib in order to use its array parser. We cannot simply require pg in query.js since the user can specify another library path (such as pg-native etc)
+  Query.prototype.parseDialectSpecificFields.lib = this.connectionManager.lib;
+
   this.QueryGenerator = _.extend({}, QueryGenerator, {
   this.QueryGenerator = _.extend({}, QueryGenerator, {
     options: sequelize.options,
     options: sequelize.options,
     _dialect: this,
     _dialect: this,

lib/dialects/postgres/query.js

@@ -18,28 +18,16 @@ parseDialectSpecificFields = {
   hstore: function (value, options) {
   hstore: function (value, options) {
     if (value === null) return null;
     if (value === null) return null;
 
 
-    // hstore does not require you to escape newlines, but JSON.parse does!
     return DataTypes.ARRAY.is(options.dataType, DataTypes.HSTORE) ?
     return DataTypes.ARRAY.is(options.dataType, DataTypes.HSTORE) ?
-      Utils._.map(
-        JSON.parse('[' +
-        value.substring(1, value.length - 1)
-          .replace('\n', '\\n')
-          .replace('\t', '\\t')
-          .replace('\r', '\\r') +
-          ']'), function (v) {
-          return hstore.parse(v);
-        }) : hstore.parse(value);
+      this.lib.types.arrayParser.create(value, hstore.parse).parse() : hstore.parse(value);
   },
   },
   range:  function (value, options) {
   range:  function (value, options) {
     if (value === null) return null;
     if (value === null) return null;
 
 
     return DataTypes.ARRAY.is(options.dataType, DataTypes.RANGE) ?
     return DataTypes.ARRAY.is(options.dataType, DataTypes.RANGE) ?
-      Utils._.map(
-        JSON.parse('[' + value.substring(1, value.length - 1) + ']'),
-        function (v) {
+      this.lib.types.arrayParser.create(value, function (v) {
         return range.parse(v, options.dataType.type);
         return range.parse(v, options.dataType.type);
-        }) :
-      range.parse(value, options.dataType);
+      }).parse() : range.parse(value, options.dataType);
   }
   }
 };
 };
 
 
@@ -93,6 +81,8 @@ module.exports = (function() {
   };
   };
   Utils.inherit(Query, AbstractQuery);
   Utils.inherit(Query, AbstractQuery);
 
 
+  Query.prototype.parseDialectSpecificFields = parseDialectSpecificFields;
+
   Query.prototype.run = function(sql) {
   Query.prototype.run = function(sql) {
     /* jshint -W027 */
     /* jshint -W027 */
     this.sql = sql;
     this.sql = sql;
@@ -156,6 +146,7 @@ module.exports = (function() {
         results.forEach(function (result) {
         results.forEach(function (result) {
           var attributes = /ON .*? (?:USING .*?\s)?\((.*)\)/gi.exec(result.definition)[1].split(',')
           var attributes = /ON .*? (?:USING .*?\s)?\((.*)\)/gi.exec(result.definition)[1].split(',')
             , field
             , field
+
             , attribute
             , attribute
             , columns;
             , columns;