Skip to content

[8.x] Fix issues with dumping PostgreSQL databases that contain multiple schemata #36046

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 4 commits into from
Jan 27, 2021
Merged

[8.x] Fix issues with dumping PostgreSQL databases that contain multiple schemata #36046

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6a8a09
Eliminate the need for search_path logic
cbj4074 Jan 26, 2021
fb11c42
Merge tag 'v8.25.0' into fix-pgsql-dump
cbj4074 Jan 26, 2021
b5de1f0
Re-implement pg_restore fix that was reverted
cbj4074 Jan 26, 2021
aef5715
Fix PostgreSQL object reference pattern quoting
cbj4074 Jan 26, 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
10 changes: 3 additions & 7 deletions src/Illuminate/Database/Schema/PostgresSchemaState.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,12 @@ class PostgresSchemaState extends SchemaState
*/
public function dump(Connection $connection, $path)
{
$schema = $connection->getConfig('schema', 'public');

$schema = $schema === 'public' ? '' : $schema.'.';

$excludedTables = collect($connection->getSchemaBuilder()->getAllTables())
->map->tablename
->reject(function ($table) {
return $table === $this->migrationTable;
})->map(function ($table) use ($schema) {
return '--exclude-table-data='.$schema.$table;
})->map(function ($table) {
return '--exclude-table-data="*.'.$table.'"';
})->implode(' ');

$this->makeProcess(
Expand All @@ -43,7 +39,7 @@ public function dump(Connection $connection, $path)
*/
public function load($path)
{
$command = 'PGPASSWORD=$LARAVEL_LOAD_PASSWORD pg_restore --no-owner --no-acl --host=$LARAVEL_LOAD_HOST --port=$LARAVEL_LOAD_PORT --username=$LARAVEL_LOAD_USER --dbname=$LARAVEL_LOAD_DATABASE $LARAVEL_LOAD_PATH';
$command = 'PGPASSWORD=$LARAVEL_LOAD_PASSWORD pg_restore --no-owner --no-acl --clean --if-exists --host=$LARAVEL_LOAD_HOST --port=$LARAVEL_LOAD_PORT --username=$LARAVEL_LOAD_USER --dbname=$LARAVEL_LOAD_DATABASE $LARAVEL_LOAD_PATH';

if (Str::endsWith($path, '.sql')) {
$command = 'PGPASSWORD=$LARAVEL_LOAD_PASSWORD psql --file=$LARAVEL_LOAD_PATH --host=$LARAVEL_LOAD_HOST --port=$LARAVEL_LOAD_PORT --username=$LARAVEL_LOAD_USER --dbname=$LARAVEL_LOAD_DATABASE';
Expand Down