Added deletion check when updating or deleting records (#13)

Author: joshmcrae

.gitignore

@@ -1,2 +1,3 @@
 vendor/
 .idea/
+.phpunit.result.cache

phpunit.xml

@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         forceCoversAnnotation="true"
-         beStrictAboutCoversAnnotation="true"
+         forceCoversAnnotation="false"
+         beStrictAboutCoversAnnotation="false"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          verbose="true">
-    <testsuite name="default">
-        <directory suffix="Test.php">tests</directory>
-    </testsuite>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </coverage>
+  <testsuite name="default">
+    <directory suffix="Test.php">tests</directory>
+  </testsuite>
 </phpunit>

src/Mapping.php

@@ -304,6 +304,10 @@ private function replace(array $data, array $original, array $deleteIds = [])
             }
         }
 
+        if ($this->definition->getDeletionTimestamp()) {
+            $query->isNull($this->definition->getDeletionTimestamp());
+        }
+
         $base = $this->getBaseData($data);
         $originalBase = $this->getBaseData($original);
 
@@ -432,7 +436,7 @@ private function delete($ids = [])
                     $query->in($primary, array_values($primaryValues));
                     $query->closeOr();
 
-                    $result = $deletion ? $query->update([$deletion => gmdate('Y-m-d H:i:s')]) : $query->remove();
+                    $result = $deletion ? $query->isNull($deletion)->update([$deletion => gmdate('Y-m-d H:i:s')]) : $query->remove();
                     if (!$result) {
                         throw new \Exception('Failed to delete records.');
                     }

tests/MappingTest.php

@@ -303,7 +303,6 @@ public function getMapping()
             ->withColumns('id', 'description', 'amount', 'modified')
             ->withModificationData(['modified' => '2019-01-02 03:04:05']);
 
-
         $order = (new Definition('orders'))
             ->withColumns('id', 'date_created')
             ->withOne($discount, 'discount', 'order_id')