Merge pull request #3802 from hariprasadkulkarni/master

Fixes #3799 hasOwnProperty is now called through Object.prototype

lib/sequelize.js

@@ -658,15 +658,15 @@ module.exports = (function() {
     }
     }
 
 
     if (Utils._.isPlainObject(sql)) {
     if (Utils._.isPlainObject(sql)) {
-      if (sql.hasOwnProperty('values')) {
-        if (options.hasOwnProperty('replacements')) {
+      if (Object.prototype.hasOwnProperty.call(sql,'values')) {
+        if (Object.prototype.hasOwnProperty.call(options,'replacements')) {
           throw new Error('Both `sql.values` and `options.replacements` cannot be set at the same time');
           throw new Error('Both `sql.values` and `options.replacements` cannot be set at the same time');
         }
         }
 
 
         options.replacements = sql.values;
         options.replacements = sql.values;
       }
       }
 
 
-      if (sql.hasOwnProperty('query')) {
+      if (Object.prototype.hasOwnProperty.call(sql,'query')) {
         sql = sql.query;
         sql = sql.query;
       }
       }
     }
     }

lib/sql-string.js

@@ -156,7 +156,7 @@ SqlString.formatNamedParameters = function(sql, values, timeZone, dialect) {
       return value;
       return value;
     }
     }
 
 
-    if (values.hasOwnProperty(key)) {
+    if (Object.prototype.hasOwnProperty.call(values,key)) {
       return SqlString.escape(values[key], false, timeZone, dialect);
       return SqlString.escape(values[key], false, timeZone, dialect);
     } else {
     } else {
       throw new Error('Named parameter "' + value + '" has no value in the given object.');
       throw new Error('Named parameter "' + value + '" has no value in the given object.');