8000 [9.x] Fix postgresql build by driesvints · Pull Request #39531 · laravel/framework · GitHub
[go: up one dir, main page]
Skip to content

[9.x] Fix postgresql build #39531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 16, 2021
Merged

[9.x] Fix postgresql build #39531

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e0320e
Fix PostgreSQL build
driesvints Nov 8, 2021
1bb9be7
wip
driesvints Nov 8, 2021
d003013
Gracefully handle schema key deprecation
driesvints Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wip
  • Loading branch information
@driesvints
driesvints committed Nov 8, 2021
commit 1bb9be77e79aeb9a67c2312e64b1cc6b98f25fb8
6 changes: 4 additions & 2 deletions src/Illuminate/Database/Schema/PostgresBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,16 @@ protected function parseSearchPath($searchPath)
$searchPath = $matches[0];
}

array_walk($searchPath ?? [], function (&$schema) {
$searchPath = $searchPath ?? [];

array_walk($searchPath, function (&$schema) {
$schema = trim($schema, '\'"');

$schema = $schema === '$user'
? $this->connection->getConfig('username')
: $schema;
});

return $searchPath ?? [];
return $searchPath;
}
}
0