Skip to content
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

Jump to bottom

[8.x] Support psql and pg_restore commands in schema load #34711

Merged
merged 2 commits into from Oct 6, 2020
Merged

[8.x] Support psql and pg_restore commands in schema load #34711

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53c6e3a
support psql and pg_restore command in schema load
matejvelikonja Oct 6, 2020
c8100c1
Update PostgresSchemaState.php
taylorotwell Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Illuminate/Database/Schema/PostgresSchemaState.php
View file
Open in desktop
Expand Up @@ -51,7 +51,13 @@ protected function appendMigrationData(string $path)
*/
public function load($path)
{
$process = $this->makeProcess('PGPASSWORD=$LARAVEL_LOAD_PASSWORD pg_restore --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 --host=$LARAVEL_LOAD_HOST --port=$LARAVEL_LOAD_PORT --username=$LARAVEL_LOAD_USER --dbname=$LARAVEL_LOAD_DATABASE $LARAVEL_LOAD_PATH';

if (preg_match('/\.sql$/', $path) !== false) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this line is wrong. When I'm trying to dump and do a fresh migrate now I get an error due to the fact that it's trying to load a .dump file using psql instead of pg_restore.

I believe if (fnmatch('*.sql', $path)) might be an easier option here. preg_match does not give a boolean result, it returns an int value.

$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';
}

$process = $this->makeProcess($command);

$process->mustRun(null, array_merge($this->baseVariables($this->connection->getConfig()), [
'LARAVEL_LOAD_PATH' => $path,
Expand Down