better fix for paranoidClause failing complex wheres

lib/model.js

@@ -1584,9 +1584,11 @@ module.exports = (function() {
       // of string-likes/Dates or an array with objects, hashes, or other
       // of string-likes/Dates or an array with objects, hashes, or other
       // complex data types
       // complex data types
       if (Utils.canTreatArrayAsAnd(options.where)) {
       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.
+        // smth, tableName, factory, options, prepend
+        var whereClause = this.QueryGenerator.getWhereConditions(options.where, this.getTableName(), this, options);
+        if (whereClause.indexOf(deletedAtCol) !== -1) {
+          return options;
+        }
         var whereObj = {};
         var whereObj = {};
         whereObj[quoteIdentifiedDeletedAtCol] = null;
         whereObj[quoteIdentifiedDeletedAtCol] = null;
         options.where.push(whereObj);
         options.where.push(whereObj);

test/dao-factory.test.js

@@ -2159,6 +2159,23 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       }).error(done)
       }).error(done)
     })
     })
 
 
+    it.only('should not overwrite a specified deletedAt (complex query)', function (done) {
+      this.User.findAll({
+        where: [
+          this.sequelize.or({ username: 'leia' }, { username: 'luke' }),
+          this.sequelize.and(
+            { id: [1, 2, 3] },
+            this.sequelize.or({ deletedAt: null }, { deletedAt: { gt: new Date(0) } })
+          )
+        ]
+      })
+        .then(function(res) {
+          expect(res).to.have.length(2)
+          done()
+        })
+        .catch(function(e) { done(e) })
+    })
+
   })
   })
 
 
   if (dialect !== 'sqlite') {
   if (dialect !== 'sqlite') {