Merge branch 'develop'

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -1,12 +1,11 @@
 CHANGELOG for 0.9.0 RC
 ======================
 
-0.9.9 (28.03.2017)
+1.0.1 (25.04.2017)
 -----
-- now possible to use 'limit' and 'orderBy' options in HasMany and ManyToMany loaders
-- new Record constant 'ORDER_BY', defines default order for related data (exclude: with-relations)
+- BelongsTo and BelongsToMorphed relations do not save parent relations when parent is already loaded (to prevent recursion loops)
 
-0.9.7 (15.03.2017)
+0.9.7 (15.03.2017) = 1.0.0 public release
 -----
 - fetchAll
 - better phpDoc

source/Spiral/ORM/Entities/Relations/BelongsToMorphedRelation.php

@@ -99,8 +99,13 @@ protected function getRoles(): array
     private function queueRelated(
         ContextualCommandInterface $parentCommand
     ): ContextualCommandInterface {
-        //Command or command set needed to store
-        $innerCommand = $this->instance->queueStore(true);
+        /*
+         * Only queue parent relations when parent wasn't saved already, attention, this might
+         * cause an issues with very deep recursive structures (and it's expected).
+         */
+        $innerCommand = $this->instance->queueStore(
+            !$this->instance->isLoaded()
+        );
 
         if (!$this->isSynced($this->parent, $this->instance)) {
             //Syncing FKs before primary command been executed

source/Spiral/ORM/Entities/Relations/BelongsToRelation.php

@@ -75,8 +75,13 @@ public function queueCommands(ContextualCommandInterface $parentCommand): Comman
     private function queueRelated(
         ContextualCommandInterface $parentCommand
     ): ContextualCommandInterface {
-        //Command or command set needed to store
-        $innerCommand = $this->instance->queueStore(true);
+        /*
+         * Only queue parent relations when parent wasn't saved already, attention, this might
+         * cause an issues with very deep recursive structures (and it's expected).
+         */
+        $innerCommand = $this->instance->queueStore(
+            !$this->instance->isLoaded()
+        );
 
         if (!$this->isSynced($this->parent, $this->instance)) {
             //Syncing FKs before primary command been executed

source/Spiral/ORM/RecordInterface.php

@@ -13,6 +13,13 @@
 
 interface RecordInterface extends EntityInterface
 {
+    /**
+     * Indication that record has allocated database row.
+     *
+     * @return bool
+     */
+    public function isLoaded(): bool;
+
     /**
      * Can be null.
      *

source/Spiral/ORM/Transaction.php

@@ -105,6 +105,10 @@ public function run(bool $forceTransaction = false, bool $clean = true)
             $commands[] = $command;
         }
 
+        if (empty($commands)) {
+            return;
+        }
+
         //Commands we executed and drivers with started transactions
         $executedCommands = $wrappedDrivers = [];
 
@@ -138,6 +142,7 @@ public function run(bool $forceTransaction = false, bool $clean = true)
         }
 
         foreach (array_reverse($wrappedDrivers) as $driver) {
+            /** @var Driver $driver */
             $driver->commitTransaction();
         }
 

tests/ORM/MySQL/TreeSequenceTest.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * orm
+ *
+ * @author    Wolfy-J
+ */
+
+namespace Spiral\Tests\ORM\MySQL;
+
+use Spiral\Tests\Database\MySQL\DriverTrait;
+
+class TreeSequenceTest extends \Spiral\Tests\ORM\TreeSequenceTest
+{
+    use DriverTrait;
+}

tests/ORM/Postgres/TreeSequenceTest.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * orm
+ *
+ * @author    Wolfy-J
+ */
+
+namespace Spiral\Tests\ORM\Postgres;
+
+use Spiral\Tests\Database\Postgres\DriverTrait;
+
+class TreeSequenceTest extends \Spiral\Tests\ORM\TreeSequenceTest
+{
+    use DriverTrait;
+}

tests/ORM/SQLServer/TreeSequenceTest.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * orm
+ *
+ * @author    Wolfy-J
+ */
+
+namespace Spiral\Tests\ORM\SQLServer;
+
+use Spiral\Tests\Database\SQLServer\DriverTrait;
+
+class TreeSequenceTest extends \Spiral\Tests\ORM\TreeSequenceTest
+{
+    use DriverTrait;
+}

tests/ORM/SQLite/TreeSequenceTest.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * orm
+ *
+ * @author    Wolfy-J
+ */
+
+namespace Spiral\Tests\ORM\SQLite;
+
+use Spiral\Tests\Database\SQLite\DriverTrait;
+
+class TreeSequenceTest extends \Spiral\Tests\ORM\TreeSequenceTest
+{
+    use DriverTrait;
+}

tests/ORM/TreeSequenceTest.php

@@ -0,0 +1,103 @@
+<?php
+/**
+ * orm
+ *
+ * @author    Wolfy-J
+ */
+
+namespace Spiral\Tests\ORM;
+
+use Spiral\ORM\Transaction;
+use Spiral\Tests\ORM\Fixtures\Post;
+use Spiral\Tests\ORM\Fixtures\User;
+
+abstract class TreeSequenceTest extends BaseTest
+{
+    public function testSaveParentAndChild()
+    {
+        $user = new User();
+
+        $post = new Post();
+        $post->author = $user;
+
+        $transaction = new Transaction();
+        $transaction->store($user);
+        $transaction->store($post);
+
+        $transaction->run();
+
+        $this->assertSameInDB($user);
+        $this->assertSameInDB($post);
+    }
+
+    public function testSaveChildAndParent()
+    {
+        $user = new User();
+
+        $post = new Post();
+        $post->author = $user;
+
+        $transaction = new Transaction();
+        $transaction->store($post);
+        $transaction->store($user);
+
+        $transaction->run();
+
+        $this->assertSameInDB($user);
+        $this->assertSameInDB($post);
+    }
+
+    public function testSaveChildAndParentLOOP()
+    {
+        $user = new User();
+
+        $post = new Post();
+        $post->author = $user;
+        $user->posts->add(clone $post);
+
+        $transaction = new Transaction();
+        $transaction->store($post);
+        $transaction->store($user);
+
+        $transaction->run();
+
+        $this->assertSameInDB($user);
+        $this->assertSameInDB($post);
+    }
+
+    public function testSaveChildAndParentLOOP_noParentSave()
+    {
+        $user = new User();
+
+        $post = new Post();
+        $post->author = $user;
+        $user->posts->add(clone $post);
+
+        $transaction = new Transaction();
+        $transaction->store($post);
+
+        $transaction->run();
+
+        $this->assertSameInDB($user);
+        $this->assertSameInDB($post);
+    }
+
+    public function testSavedParentAndChildLOOP()
+    {
+        $user = new User();
+
+        $post = new Post();
+        $post->author = $user;
+        $user->posts->add(clone $post);
+
+        $transaction = new Transaction();
+
+        $transaction->store($user);
+        $transaction->store($post);
+
+        $transaction->run();
+
+        $this->assertSameInDB($user);
+        $this->assertSameInDB($post);
+    }
+}