Merge branch 'DBAL-510'

lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -280,7 +280,7 @@ class PostgreSqlPlatform extends AbstractPlatform
             list($schema, $table) = explode(".", $table);
             $schema = "'" . $schema . "'";
         } else {
-            $schema = "ANY(string_to_array((select setting from pg_catalog.pg_settings where name = 'search_path'),','))";
+            $schema = "ANY(string_to_array((select replace(setting,'\"\$user\"',user) from pg_catalog.pg_settings where name = 'search_path'),','))";
         }
         $whereClause .= "$classAlias.relname = '" . $table . "' AND $namespaceAlias.nspname = $schema";
 

tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL510Test.php

+<?php
+
+namespace Doctrine\Tests\DBAL\Functional\Ticket;
+
+use Doctrine\DBAL\Schema\Comparator;
+use Doctrine\DBAL\Schema\Table;
+
+/**
+ * @group DBAL-510
+ */
+class DBAL510Test extends \Doctrine\Tests\DbalFunctionalTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        if ($this->_conn->getDatabasePlatform()->getName() !== "postgresql") {
+            $this->markTestSkipped('PostgreSQL Only test');
+        }
+    }
+
+    public function testSearchPathSchemaChanges()
+    {
+        $table = new Table("dbal510tbl");
+        $table->addColumn('id', 'integer');
+        $table->setPrimaryKey(array('id'));
+
+        $this->_conn->getSchemaManager()->createTable($table);
+
+        $onlineTable = $this->_conn->getSchemaManager()->listTableDetails('dbal510tbl');
+
+        $comparator = new Comparator();
+        $diff = $comparator->diffTable($onlineTable, $table);
+
+        $this->assertFalse($diff);
+    }
+}