Merge branch '5.x'

Author: vkarpov15

CHANGELOG.md

@@ -1,3 +1,8 @@
+5.13.14 / 2021-12-27
+====================
+ * fix(timestamps): avoid setting createdAt on documents that already exist but dont have createdAt #11024
+ * docs(models): fix up nModified example for 5.x #11055
+
 6.1.3 / 2021-12-21
 ==================
  * perf(populate): avoid duplicate model names when using refPath to avoid O(n^2) memory growth with number of array elements #10983

docs/models.md

@@ -103,7 +103,7 @@ database without returning them to your application. See the
 
 ```javascript
 Tank.updateOne({ size: 'large' }, { name: 'T-90' }, function(err, res) {
-  // Updated at most one doc, `res.modifiedCount` contains the number
+  // Updated at most one doc, `res.nModified` contains the number
   // of docs that MongoDB updated
 });
 ```

lib/helpers/timestamps/setupTimestamps.js

@@ -49,7 +49,7 @@ module.exports = function setupTimestamps(schema, timestamps) {
       this.ownerDocument().constructor.base.now();
     const auto_id = this._id && this._id.auto;
 
-    if (!skipCreatedAt && createdAt && !this.$__getValue(createdAt) && this.$__isSelected(createdAt)) {
+    if (!skipCreatedAt && this.isNew && createdAt && !this.$__getValue(createdAt) && this.$__isSelected(createdAt)) {
       this.$set(createdAt, auto_id ? this._id.getTimestamp() : defaultTimestamp);
     }