Merge 5aa6174 into 7ed4138

adonisjs · Dec 17, 2018 · f3454d9 · f3454d9
2 parents 7ed4138 + 5aa6174
commit f3454d9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Lucid/Model/index.js b/src/Lucid/Model/index.js
@@ -519,7 +519,7 @@ class Model extends BaseModel {
    * Sets `created_at` column on the values object.
    *
    * Note: This method will mutate the original object
-   * by adding a new key/value pair.
+   * by adding a new key/value pair if undefined.
    *
    * @method _setCreatedAt
    *
@@ -529,7 +529,7 @@ class Model extends BaseModel {
    */
   _setCreatedAt (values) {
     const createdAtColumn = this.constructor.createdAtColumn
-    if (createdAtColumn) {
+    if (createdAtColumn && !values[createdAtColumn]) {
       values[createdAtColumn] = this._getSetterValue(createdAtColumn, new Date())
     }
   }
@@ -546,9 +546,9 @@ class Model extends BaseModel {
    *
    * @private
    */
-  _setUpdatedAt (values) {
+  _setUpdatedAt (values, onInsert) {
     const updatedAtColumn = this.constructor.updatedAtColumn
-    if (updatedAtColumn) {
+    if (updatedAtColumn && ((onInsert && !values[updatedAtColumn]) || !onInsert)) {
       values[updatedAtColumn] = this._getSetterValue(updatedAtColumn, new Date())
     }
   }
@@ -593,7 +593,7 @@ class Model extends BaseModel {
      * Set timestamps
      */
     this._setCreatedAt(this.$attributes)
-    this._setUpdatedAt(this.$attributes)
+    this._setUpdatedAt(this.$attributes, true)
     this._formatDateFields(this.$attributes)
 
     const query = this.constructor.query()