Merge branch 'master' of github.com:eerenyuan/bookshelf

bookshelf · Sep 19, 2018 · 2705e15 · 2705e15
2 parents 2510355 + 58ddd95
commit 2705e15
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/base/model.js b/lib/base/model.js
@@ -643,7 +643,7 @@ ModelBase.prototype.timestamp = function(options) {
   const updatedAtKey = timestampKeys[1];
   const isNewModel = method === 'insert';
 
-  if (updatedAtKey && (isNewModel || this.hasChanged())) {
+  if (updatedAtKey && (isNewModel || this.hasChanged()) && !this.hasChanged(updatedAtKey) ) {
     attributes[updatedAtKey] = now;
   }