Skip to content

Commit

Permalink
Merge branch 'DBAL-453' into 2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
beberlei committed May 1, 2013
2 parents 597da8c + 5eee2ff commit ac0c063
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,12 @@ public function getSchemaSearchPaths()
{
$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);
}

/**
Expand Down

0 comments on commit ac0c063

Please sign in to comment.