Merge pull request #546 from deeky666/DBAL-474

[DBAL-474] Fix filtering sequence names on PostgreSQL

lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php

@@ -257,6 +257,32 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
         return $database['datname'];
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getPortableSequencesList($sequences)
+    {
+        $sequenceDefinitions = array();
+
+        foreach ($sequences as $sequence) {
+            if ($sequence['schemaname'] != 'public') {
+                $sequenceName = $sequence['schemaname'] . "." . $sequence['relname'];
+            } else {
+                $sequenceName = $sequence['relname'];
+            }
+
+            $sequenceDefinitions[$sequenceName] = $sequence;
+        }
+
+        $list = array();
+
+        foreach ($this->filterAssetNames(array_keys($sequenceDefinitions)) as $sequenceName) {
+            $list[] = $this->_getPortableSequenceDefinition($sequenceDefinitions[$sequenceName]);
+        }
+
+        return $list;
+    }
+
     /**
      * {@inheritdoc}
      */

tests/Doctrine/Tests/DBAL/Schema/PostgreSQLSchemaManagerTest.php

+<?php
+
+namespace Doctrine\Tests\DBAL\Schema;
+
+use Doctrine\DBAL\Configuration;
+use Doctrine\DBAL\Schema\PostgreSqlSchemaManager;
+use Doctrine\DBAL\Schema\Sequence;
+use Doctrine\Tests\DBAL\Mocks;
+
+class PostgreSQLSchemaManagerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Doctrine\DBAL\Schema\PostgreSQLSchemaManager
+     */
+    private $schemaManager;
+
+    /**
+     * @var \Doctrine\DBAL\Connection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connection;
+
+    protected function setUp()
+    {
+        $driverMock = $this->getMock('Doctrine\DBAL\Driver');
+        $platform = $this->getMock('Doctrine\DBAL\Platforms\PostgreSqlPlatform');
+        $this->connection = $this->getMock(
+            'Doctrine\DBAL\Connection',
+            array(),
+            array(array('platform' => $platform), $driverMock)
+        );
+        $this->schemaManager = new PostgreSqlSchemaManager($this->connection, $platform);
+    }
+
+    /**
+     * @group DBAL-474
+     */
+    public function testFiltersSequences()
+    {
+        $configuration = new Configuration();
+        $configuration->setFilterSchemaAssetsExpression('/^schema/');
+
+        $sequences = array(
+            array('relname' => 'foo', 'schemaname' => 'schema'),
+            array('relname' => 'bar', 'schemaname' => 'schema'),
+            array('relname' => 'baz', 'schemaname' => ''),
+            array('relname' => 'bloo', 'schemaname' => 'bloo_schema'),
+        );
+
+        $this->connection->expects($this->any())
+            ->method('getConfiguration')
+            ->will($this->returnValue($configuration));
+
+        $this->connection->expects($this->at(0))
+            ->method('fetchAll')
+            ->will($this->returnValue($sequences));
+
+        $this->connection->expects($this->at(1))
+            ->method('fetchAll')
+            ->will($this->returnValue(array(array('min_value' => 1, 'increment_by' => 1))));
+
+        $this->connection->expects($this->at(2))
+            ->method('fetchAll')
+            ->will($this->returnValue(array(array('min_value' => 2, 'increment_by' => 2))));
+
+        $this->connection->expects($this->exactly(3))
+            ->method('fetchAll');
+
+        $this->assertEquals(
+            array(
+                new Sequence('schema.foo', 2, 2),
+                new Sequence('schema.bar', 1, 1),
+            ),
+            $this->schemaManager->listSequences('database')
+        );
+    }
+}