Merge branch 'DBAL-453' into 2.3

ac0c0630 · Benjamin Eberlei · 597da8c3 · 5eee2ffd · ac0c0630
Commit ac0c0630 authored May 01, 2013 by Benjamin Eberlei
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

PostgreSqlSchemaManager.php lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php +3 -1

No files found.
--- a/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
+++ b/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
@@ -58,10 +58,12 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
    {
        $params = $this->_conn->getParams();
        $schema = explode(",", $this->_conn->fetchColumn('SHOW search_path'));
+
        if (isset($params['user'])) {
            $schema = str_replace('"$user"', $params['user'], $schema);
        }
-        return $schema;
+
+        return array_map('trim', $schema);
    }

    /**