Merge pull request #1892 from eerenyuan/master

change logic of timestamp "update_time"
bookshelf · Dec 9, 2018 · ec58b8d · ec58b8d
2 parents 4b4a420 + 1d37ed5
commit ec58b8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/base/model.js b/lib/base/model.js
@@ -643,9 +643,8 @@ ModelBase.prototype.timestamp = function(options) {
   const createdAtKey = timestampKeys[0];
   const updatedAtKey = timestampKeys[1];
   const isNewModel = method === 'insert';
-  const setUpdatedAt = updatedAtKey && this.hasChanged(updatedAtKey);
 
-  if (updatedAtKey && ((isNewModel && !setUpdatedAt) || (this.hasChanged() && !setUpdatedAt))) {
+  if (updatedAtKey && (isNewModel || this.hasChanged()) && !this.hasChanged(updatedAtKey) ) {
     attributes[updatedAtKey] = now;
   }
 

diff --git a/tutorials/parse-and-format.md b/tutorials/parse-and-format.md
@@ -9,11 +9,13 @@ methods:
 Book = bookshelf.Model.extend({
   tableName: 'books',
   parse: function(response) {
-    response.tags = JSON.parse(response.tags || '[]');
+    if(response.tags)
+      response.tags = JSON.parse(response.tags);
     return response;
   },
   format: function(attributes) {
-    attributes.tags = JSON.stringify(attributes.tags || []);
+    if(attributes.tags)
+      attributes.tags = JSON.stringify(attributes.tags);
     return attributes;
   }
 });