Fix #1792 - Don't coerce attribute names to string when checking for mappings

lib/model.js

@@ -1461,6 +1461,9 @@ module.exports = (function() {
   var mapFieldNames = function(options, Model) {
   var mapFieldNames = function(options, Model) {
     if (options.attributes) {
     if (options.attributes) {
       options.attributes = options.attributes.map(function(attr) {
       options.attributes = options.attributes.map(function(attr) {
+        // Object lookups will force any variable to strings, we don't want that for special objects etc
+        if (typeof attr !== "string") return attr;
+        // Map attributes to aliased syntax attributes
         if (Model.rawAttributes[attr] && Model.rawAttributes[attr].field) {
         if (Model.rawAttributes[attr] && Model.rawAttributes[attr].field) {
           return [Model.rawAttributes[attr].field, attr];
           return [Model.rawAttributes[attr].field, attr];
         }
         }
@@ -1470,9 +1473,11 @@ module.exports = (function() {
 
 
     if (options.where) {
     if (options.where) {
       for (var attr in options.where) {
       for (var attr in options.where) {
-        if (Model.rawAttributes[attr] && Model.rawAttributes[attr].field) {
-          options.where[Model.rawAttributes[attr].field] = options.where[attr];
-          delete options.where[attr];
+        if (typeof attr === "string") {
+          if (Model.rawAttributes[attr] && Model.rawAttributes[attr].field) {
+            options.where[Model.rawAttributes[attr].field] = options.where[attr];
+            delete options.where[attr];
+          }
         }
         }
       }
       }
     }
     }