Improve the Database ORM

nova-framework · Jun 2, 2018 · a33387b · a33387b
1 parent a3bcdb7
commit a33387b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/src/Database/ORM/Model.php b/src/Database/ORM/Model.php
@@ -1587,6 +1587,10 @@ protected function getKeyForSaveQuery()
      */
     public function touch()
     {
+        if (! $this->timestamps) {
+            return false;
+        }
+
         $this->updateTimestamps();
 
         return $this->save();
@@ -1601,12 +1605,12 @@ protected function updateTimestamps()
     {
         $time = $this->freshTimestamp();
 
-        if (! $this->isDirty(static::UPDATED_AT)) {
-            $this->setUpdatedAt($time);
+        if (! is_null($column = $this->getUpdatedAtColumn()) && ! $this->isDirty($column)) {
+            $this->setAttribute($column, $time);
         }
 
-        if (! $this->exists && ! $this->isDirty(static::CREATED_AT)) {
-            $this->setCreatedAt($time);
+        if (! $this->exists && ! is_null($column = $this->getCreatedAtColumn()) && ! $this->isDirty($column)) {
+            $this->setAttribute($column, $time);
         }
     }
 
@@ -1618,7 +1622,9 @@ protected function updateTimestamps()
      */
     public function setCreatedAt($value)
     {
-        $this->{static::CREATED_AT} = $value;
+        if (! is_null($column = $this->getCreatedAtColumn())) {
+            $this->setAttribute($column, $value);
+        }
     }
 
     /**
@@ -1629,7 +1635,9 @@ public function setCreatedAt($value)
      */
     public function setUpdatedAt($value)
     {
-        $this->{static::UPDATED_AT} = $value;
+        if (! is_null($column = $this->getUpdatedAtColumn())) {
+            $this->setAttribute($column, $value);
+        }
     }
 
     /**

diff --git a/src/Database/ORM/SoftDeletingScope.php b/src/Database/ORM/SoftDeletingScope.php
@@ -10,7 +10,8 @@ class SoftDeletingScope implements ScopeInterface
      *
      * @var array
      */
-    protected $extensions = ['ForceDelete', 'Restore', 'WithTrashed', 'OnlyTrashed'];
+    protected $extensions = array('ForceDelete', 'Restore', 'WithTrashed', 'OnlyTrashed');
+
 
     /**
      * Apply the scope to a given ORM query builder.
@@ -158,7 +159,7 @@ protected function addOnlyTrashed(Builder $builder)
      */
     protected function isSoftDeleteConstraint(array $where, $column)
     {
-        return $where['type'] == 'Null' && $where['column'] == $column;
+        return ($where['type'] == 'Null') && ($where['column'] == $column);
     }
 
 }
diff --git a/src/Database/ORM/SoftDeletingTrait.php b/src/Database/ORM/SoftDeletingTrait.php
@@ -61,9 +61,9 @@ protected function runSoftDelete()
     {
         $query = $this->newQuery()->where($this->getKeyName(), $this->getKey());
 
-        $this->{$this->getDeletedAtColumn()} = $time = $this->freshTimestamp();
+        $this->setAttribute($column = $this->getDeletedAtColumn(), $time = $this->freshTimestamp());
 
-        $query->update(array($this->getDeletedAtColumn() => $this->fromDateTime($time)));
+        $query->update(array($column => $this->fromDateTime($time)));
     }
 
     /**
@@ -77,7 +77,7 @@ public function restore()
             return false;
         }
 
-        $this->{$this->getDeletedAtColumn()} = null;
+        $this->setAttribute($this->getDeletedAtColumn(), null);
 
         //
         $this->exists = true;
@@ -96,7 +96,7 @@ public function restore()
      */
     public function trashed()
     {
-        return ! is_null($this->{$this->getDeletedAtColumn()});
+        return ! is_null($this->getAttribute($this->getDeletedAtColumn()));
     }
 
     /**

diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -41,7 +41,7 @@ class Application extends Container implements ResponsePreparerInterface
      *
      * @var string
      */
-    const VERSION = '4.0.74';
+    const VERSION = '4.0.75';
 
     /**
      * Indicates if the application has "booted".