check how to treat array when doing paranoidClause

lib/model.js

@@ -1580,12 +1580,23 @@ module.exports = (function() {
       options.where += ' AND ' + quoteIdentifiedDeletedAtCol + ' IS NULL ';
       options.where += ' AND ' + quoteIdentifiedDeletedAtCol + ' IS NULL ';
     }
     }
     else if (Array.isArray(options.where)) {
     else if (Array.isArray(options.where)) {
-
-      // Don't overwrite our explicit deletedAt search value if we provide one
-      if (options.where[0].indexOf(deletedAtCol) !== -1) {
-        return options;
+      // Need to check how the array is being used, as it could be an array
+      // of string-likes/Dates or an array with objects, hashes, or other
+      // complex data types
+      if (Utils.canTreatArrayAsAnd(options.where)) {
+        // TODO: This is simplifying this case greatly. We actually need all
+        // the logic from QueryGenerator.getWhereConditions in order to
+        // properly decide what to do here.
+        var whereObj = {};
+        whereObj[quoteIdentifiedDeletedAtCol] = null;
+        options.where.push(whereObj);
+      } else {
+        // Don't overwrite our explicit deletedAt search value if we provide one
+        if (options.where[0].indexOf(deletedAtCol) !== -1) {
+          return options;
+        }
+        options.where[0] += ' AND ' + quoteIdentifiedDeletedAtCol + ' IS NULL ';
       }
       }
-      options.where[0] += ' AND ' + quoteIdentifiedDeletedAtCol + ' IS NULL ';
     } else {
     } else {
       options.where[deletedAtCol] = null;
       options.where[deletedAtCol] = null;
     }
     }

test/dao-factory.test.js

@@ -2100,6 +2100,20 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
       })
     })
     })
 
 
+    it('should not fail when array contains Sequelize.or / and', function (done) {
+      this.User.findAll({
+        where: [
+          this.sequelize.or({ username: 'vader' }, { username: 'luke' }),
+          this.sequelize.and({ id: [1, 2, 3] })
+        ]
+      })
+        .then(function(res) {
+          expect(res).to.have.length(2)
+          done()
+        })
+        .catch(function(e) { done(e) })
+    })
+
     it('should not fail with an include', function(done) {
     it('should not fail with an include', function(done) {
       this.User.findAll({
       this.User.findAll({
         where: [
         where: [