#6167 - fixed tests and added info why query is used in SequenceGener…

…ator
doctrine · Jun 21, 2017 · edffb4d · edffb4d
1 parent 60b6073
commit edffb4d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/lib/Doctrine/ORM/Id/SequenceGenerator.php b/lib/Doctrine/ORM/Id/SequenceGenerator.php
@@ -76,7 +76,8 @@ public function generate(EntityManager $em, $entity)
             $conn = $em->getConnection();
             $sql  = $conn->getDatabasePlatform()->getSequenceNextValSQL($this->_sequenceName);
 
-            $this->_nextValue = (int) $conn->query($sql)->fetchColumn(0);
+            // Use query to force master in MasterSlaveConnection
+            $this->_nextValue = (int) $conn->query($sql)->fetchColumn();
             $this->_maxValue  = $this->_nextValue + $this->_allocationSize;
         }
 

diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php
@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\Mocks;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Driver\Statement;
 
 /**
  * Mock class for Connection.
@@ -13,6 +14,11 @@ class ConnectionMock extends Connection
      */
     private $_fetchOneResult;
 
+    /**
+     * @var Statement
+     */
+    private $_queryResult;
+
     /**
      * @var DatabasePlatformMock
      */
@@ -89,6 +95,14 @@ public function fetchColumn($statement, array $params = [], $colnum = 0, array $
         return $this->_fetchOneResult;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function query()
+    {
+        return $this->_queryResult;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -132,6 +146,14 @@ public function setLastInsertId($id)
         $this->_lastInsertId = $id;
     }
 
+    /**
+     * @param Statement $result
+     */
+    public function setQueryResult($result)
+    {
+        $this->_queryResult = $result;
+    }
+
     /**
      * @return array
      */

diff --git a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php
@@ -3,6 +3,7 @@
 namespace Doctrine\Tests\ORM\Id;
 
 use Doctrine\ORM\Id\SequenceGenerator;
+use Doctrine\Tests\Mocks\StatementArrayMock;
 use Doctrine\Tests\OrmTestCase;
 
 /**
@@ -25,15 +26,14 @@ public function testGeneration()
     {
         for ($i=0; $i < 42; ++$i) {
             if ($i % 10 == 0) {
-                $this->_em->getConnection()->setFetchOneResult((int)($i / 10) * 10);
+                $nextId = array(array((int)($i / 10) * 10));
+                $this->_em->getConnection()->setQueryResult(new StatementArrayMock($nextId));
             }
             $id = $this->_seqGen->generate($this->_em, null);
             $this->assertEquals($i, $id);
             $this->assertEquals((int)($i / 10) * 10 + 10, $this->_seqGen->getCurrentMaxValue());
             $this->assertEquals($i + 1, $this->_seqGen->getNextValue());
         }
-
-
     }
 }