Merge pull request #935 from durango/trueparanoia

This commit fixes paranoid: true option, .find, .all, and .count will no...

lib/dao-factory.js

@@ -339,6 +339,8 @@ module.exports = (function() {
       this.options.whereCollection = options.where || null
       this.options.whereCollection = options.where || null
     }
     }
 
 
+    options = paranoidClause.call(this, options)
+
     return this.QueryInterface.select(this, this.tableName, options, Utils._.defaults({
     return this.QueryInterface.select(this, this.tableName, options, Utils._.defaults({
       type:    'SELECT',
       type:    'SELECT',
       hasJoin: hasJoin
       hasJoin: hasJoin
@@ -430,6 +432,7 @@ module.exports = (function() {
       }
       }
     }
     }
 
 
+    options = paranoidClause.call(this, options)
     options.limit = 1
     options.limit = 1
 
 
     return this.QueryInterface.select(this, this.getTableName(), options, Utils._.defaults({
     return this.QueryInterface.select(this, this.getTableName(), options, Utils._.defaults({
@@ -444,6 +447,8 @@ module.exports = (function() {
     options.attributes.push(['count(*)', 'count'])
     options.attributes.push(['count(*)', 'count'])
     options.parseInt = true
     options.parseInt = true
 
 
+    options = paranoidClause.call(this, options)
+
     return this.QueryInterface.rawSelect(this.getTableName(), options, 'count')
     return this.QueryInterface.rawSelect(this.getTableName(), options, 'count')
   }
   }
 
 
@@ -702,6 +707,29 @@ module.exports = (function() {
 
 
   // private
   // private
 
 
+  var paranoidClause = function(options) {
+    if (this.options.paranoid === true) {
+      options = options || {}
+      options.where = options.where || {}
+
+      // Don't overwrite our explicit deletedAt search value if we provide one
+      if (!!options.where[this.options.deletedAt]) {
+        return options
+      }
+
+      if (typeof options.where === "string") {
+        options.where += ' AND ' + this.QueryInterface.quoteIdentifier(this.options.deletedAt) + ' IS NULL '
+      }
+      else if (Array.isArray(options.where)) {
+        options.where[0] += ' AND ' + this.QueryInterface.quoteIdentifier(this.options.deletedAt) + ' IS NULL '
+      } else {
+        options.where[this.options.deletedAt] = null
+      }
+    }
+
+    return options
+  }
+
   var addOptionalClassMethods = function() {
   var addOptionalClassMethods = function() {
     var self = this
     var self = this
     Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })
     Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })

test/dao-factory.test.js

@@ -435,7 +435,8 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
                   }
                   }
                   return '0' + number
                   return '0' + number
                 }
                 }
-              expect(user.year).to.equal(now.getFullYear() + '-' + pad(now.getMonth() + 1) + '-' + pad(now.getDate()))
+
+              expect(user.year).to.equal(now.getUTCFullYear() + '-' + pad(now.getUTCMonth() + 1) + '-' + pad(now.getUTCDate()))
               done()
               done()
             })
             })
           })
           })
@@ -1169,6 +1170,8 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
 
 
     it('sets deletedAt to the current timestamp if paranoid is true', function(done) {
     it('sets deletedAt to the current timestamp if paranoid is true', function(done) {
       var self = this
       var self = this
+        , ident = self.sequelize.queryInterface.QueryGenerator.quoteIdentifier
+        , escape = self.sequelize.queryInterface.QueryGenerator.quote
         , ParanoidUser = self.sequelize.define('ParanoidUser', {
         , ParanoidUser = self.sequelize.define('ParanoidUser', {
           username:     Sequelize.STRING,
           username:     Sequelize.STRING,
           secretValue:  Sequelize.STRING,
           secretValue:  Sequelize.STRING,
@@ -1183,18 +1186,52 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
 
 
       ParanoidUser.sync({ force: true }).success(function() {
       ParanoidUser.sync({ force: true }).success(function() {
         ParanoidUser.bulkCreate(data).success(function() {
         ParanoidUser.bulkCreate(data).success(function() {
-          var date = parseInt(+new Date()/5000, 10)
+          // since we save in UTC, let's format to UTC time
+          var date = moment().utc().format('YYYY-MM-DD h:mm')
           ParanoidUser.destroy({secretValue: '42'}).success(function() {
           ParanoidUser.destroy({secretValue: '42'}).success(function() {
             ParanoidUser.findAll({order: 'id'}).success(function(users) {
             ParanoidUser.findAll({order: 'id'}).success(function(users) {
-              expect(users.length).to.equal(3)
+              expect(users.length).to.equal(1)
+              expect(users[0].username).to.equal("Bob")
 
 
+              self.sequelize.query('SELECT * FROM ' + ident('ParanoidUsers') + ' WHERE ' + ident('deletedAt') + ' IS NOT NULL ORDER BY ' + ident('id'), null, {raw: true}).success(function(users) {
                 expect(users[0].username).to.equal("Peter")
                 expect(users[0].username).to.equal("Peter")
                 expect(users[1].username).to.equal("Paul")
                 expect(users[1].username).to.equal("Paul")
-              expect(users[2].username).to.equal("Bob")
 
 
-              expect(parseInt(+users[0].deletedAt/5000, 10)).to.equal(date)
-              expect(parseInt(+users[1].deletedAt/5000, 10)).to.equal(date)
+                if (dialect === "sqlite") {
+                  expect(moment(users[0].deletedAt).format('YYYY-MM-DD h:mm')).to.equal(date)
+                  expect(moment(users[1].deletedAt).format('YYYY-MM-DD h:mm')).to.equal(date)
+                } else {
+                  expect(moment(users[0].deletedAt).utc().format('YYYY-MM-DD h:mm')).to.equal(date)
+                  expect(moment(users[1].deletedAt).utc().format('YYYY-MM-DD h:mm')).to.equal(date)
+                }
+                done()
+              })
+            })
+          })
+        })
+      })
+    })
 
 
+    describe("can't find records marked as deleted with paranoid being true", function() {
+      it('with the DAOFactory', function(done) {
+        var User = this.sequelize.define('UserCol', {
+          username: Sequelize.STRING
+        }, { paranoid: true })
+
+        User.sync({ force: true }).success(function() {
+          User.bulkCreate([
+            {username: 'Toni'},
+            {username: 'Tobi'},
+            {username: 'Max'}
+          ]).success(function() {
+            User.find(1).success(function(user) {
+              user.destroy().success(function() {
+                User.find(1).success(function(user) {
+                  expect(user).to.be.null
+                  User.count().success(function(cnt) {
+                    expect(cnt).to.equal(2)
+                    User.all().success(function(users) {
+                      expect(users).to.have.length(2)
                       done()
                       done()
                     })
                     })
                   })
                   })
@@ -1202,6 +1239,10 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
               })
               })
             })
             })
           })
           })
+        })
+      })
+    })
+  })
 
 
   describe('special where conditions/smartWhere object', function() {
   describe('special where conditions/smartWhere object', function() {
     beforeEach(function(done) {
     beforeEach(function(done) {
@@ -2743,6 +2784,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
 
 
       it("handles offset and limit", function(done) {
       it("handles offset and limit", function(done) {
         var self = this
         var self = this
+
         this.User.bulkCreate([{username: 'bobby'}, {username: 'tables'}]).success(function() {
         this.User.bulkCreate([{username: 'bobby'}, {username: 'tables'}]).success(function() {
           self.User.findAll({ limit: 2, offset: 2 }).success(function(users) {
           self.User.findAll({ limit: 2, offset: 2 }).success(function(users) {
             expect(users.length).to.equal(2)
             expect(users.length).to.equal(2)
@@ -2830,6 +2872,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         done()
         done()
       })
       })
     })
     })
+
     it("handles attributes", function(done) {
     it("handles attributes", function(done) {
       this.User.findAndCountAll({where: "id != " + this.users[0].id, attributes: ['data']}).success(function(info) {
       this.User.findAndCountAll({where: "id != " + this.users[0].id, attributes: ['data']}).success(function(info) {
         expect(info.count).to.equal(2)
         expect(info.count).to.equal(2)