For the paranoidClause function, prevent that deletedAt is overwritten when the …

…where option is an array

lib/dao-factory.js

@@ -1191,17 +1191,27 @@ module.exports = (function() {
       options.where = options.where || {}
       options.where = options.where || {}
 
 
       var deletedAtCol = Utils._.underscoredIf(this.options.deletedAt, this.options.underscored)
       var deletedAtCol = Utils._.underscoredIf(this.options.deletedAt, this.options.underscored)
+        , quoteIdentifiedDeletedAtCol = this.QueryInterface.quoteIdentifier(deletedAtCol)
 
 
       // Don't overwrite our explicit deletedAt search value if we provide one
       // Don't overwrite our explicit deletedAt search value if we provide one
       if (!!options.where[deletedAtCol]) {
       if (!!options.where[deletedAtCol]) {
         return options
         return options
       }
       }
 
 
+      if(this.tableName) {
+        quoteIdentifiedDeletedAtCol = this.QueryInterface.quoteIdentifier(this.tableName) + '.' + quoteIdentifiedDeletedAtCol
+      }
+
       if (typeof options.where === "string") {
       if (typeof options.where === "string") {
-        options.where += ' AND ' + this.QueryInterface.quoteIdentifier(deletedAtCol) + ' IS NULL '
+        options.where += ' AND ' + quoteIdentifiedDeletedAtCol + ' IS NULL '
       }
       }
       else if (Array.isArray(options.where)) {
       else if (Array.isArray(options.where)) {
-        options.where[0] += ' AND ' + this.QueryInterface.quoteIdentifier(deletedAtCol) + ' IS NULL '
+
+        // 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 '
       } else {
       } else {
         options.where[deletedAtCol] = null
         options.where[deletedAtCol] = null
       }
       }