Fixed #6167 - Forced SELECT NEXTVAL to be run on master

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->fetchColumn($sql);
+            // Use query to force master in MasterSlaveConnection
+            $this->_nextValue = (int) $conn->query($sql)->fetchColumn();
             $this->_maxValue  = $this->_nextValue + $this->_allocationSize;
         }
 

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,16 @@ class ConnectionMock extends Connection
      */
     private $_fetchOneResult;
 
+    /**
+     * @var \Exception
+     */
+    private $_fetchOneException;
+
+    /**
+     * @var Statement
+     */
+    private $_queryResult;
+
     /**
      * @var DatabasePlatformMock
      */
@@ -86,9 +97,21 @@ public function lastInsertId($seqName = null)
      */
     public function fetchColumn($statement, array $params = array(), $colnum = 0, array $types = array())
     {
+        if ($this->_fetchOneException != null) {
+            throw $this->_fetchOneException;
+        }
+
         return $this->_fetchOneResult;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function query()
+    {
+        return $this->_queryResult;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -112,6 +135,16 @@ public function setFetchOneResult($fetchOneResult)
         $this->_fetchOneResult = $fetchOneResult;
     }
 
+    /**
+     * @param \Exception $exception
+     *
+     * @return void
+     */
+    public function setFetchOneException(\Exception $exception = null)
+    {
+        $this->_fetchOneException = $exception;
+    }
+
     /**
      * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
      *
@@ -132,6 +165,14 @@ public function setLastInsertId($id)
         $this->_lastInsertId = $id;
     }
 
+    /**
+     * @param Statement $result
+     */
+    public function setQueryResult($result)
+    {
+        $this->_queryResult = $result;
+    }
+
     /**
      * @return array
      */

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;
 
 /**
@@ -23,17 +24,20 @@ protected function setUp()
 
     public function testGeneration()
     {
+        $this->_em->getConnection()->setFetchOneException(
+            new \Exception('Fetch* method used. Query method should be used instead, as NEXTVAL should be run on a master server in master-slave setup.')
+        );
+
         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());
         }
-
-
     }
 }