Paranoid on include

lib/dao-factory.js

@@ -1573,39 +1573,45 @@ module.exports = (function() {
 
 
   // private
   // private
 
 
-  var paranoidClause = function(options) {
-    if (this.options.paranoid === true) {
-      options = options || {}
-      options.where = options.where || {}
+  var paranoidClause = function ( options ) {
+    if ( ! this.options.paranoid ) return options || {};
 
 
-      var deletedAtCol = this._timestampAttributes.deletedAt
-        , quoteIdentifiedDeletedAtCol = this.QueryInterface.quoteIdentifier(deletedAtCol)
+    options = options || {}
+    options.where = options.where || {}
 
 
-      // Don't overwrite our explicit deletedAt search value if we provide one
-      if (!!options.where[deletedAtCol]) {
-        return options
-      }
+    var deletedAtCol = this._timestampAttributes.deletedAt
+      , quoteIdentifiedDeletedAtCol = this.QueryInterface.quoteIdentifier(deletedAtCol)
 
 
-      if(this.name || this.tableName) {
-        quoteIdentifiedDeletedAtCol = this.QueryInterface.quoteIdentifier(this.name || this.tableName) + '.' + quoteIdentifiedDeletedAtCol
-      }
+    // Don't overwrite our explicit deletedAt search value if we provide one
+    if (!!options.where[deletedAtCol]) {
+      return options
+    }
 
 
-      if (typeof options.where === "string") {
-        options.where += ' AND ' + quoteIdentifiedDeletedAtCol + ' IS NULL '
-      }
-      else if (Array.isArray(options.where)) {
+    if(this.name || this.tableName) {
+      quoteIdentifiedDeletedAtCol = this.QueryInterface.quoteIdentifier(this.name || this.tableName) + '.' + quoteIdentifiedDeletedAtCol
+    }
 
 
-        // 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 {
-        options.where[deletedAtCol] = null
+    if (typeof options.where === "string") {
+      options.where += ' AND ' + quoteIdentifiedDeletedAtCol + ' IS NULL '
+    }
+    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
       }
       }
+      options.where[0] += ' AND ' + quoteIdentifiedDeletedAtCol + ' IS NULL '
+    } else {
+      options.where[deletedAtCol] = null
     }
     }
 
 
-    return options
+    // Apply on each include
+    if ( options.include && options.include.length )
+      for( var i in options.include )
+        if( typeof options.include[i] == 'object' )
+          paranoidClause.call( options.include[i].daoFactory, options.include[i] );
+
+    return options;
   }
   }
 
 
   var addOptionalClassMethods = function() {
   var addOptionalClassMethods = function() {