Skip to content

Remove duplicates with overwrite-migrations flag #375

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
Sep 17, 2020
Merged

Remove duplicates with overwrite-migrations flag #375

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a15b548
fix: remove duplicate migrations on overwrite
Sep 13, 2020
300e569
chore: clean up
Sep 13, 2020
76725ed
chore: report deleted files
Sep 13, 2020
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
38 changes: 29 additions & 9 deletions src/Generators/MigrationGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Carbon\Carbon;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Str;
use Symfony\Component\Finder\SplFileInfo;

class MigrationGenerator implements Generator
{
Expand Down Expand Up @@ -37,6 +38,8 @@ class MigrationGenerator implements Generator
/** @var \Illuminate\Contracts\Filesystem\Filesystem */
private $files;

private $output = [];

private $hasForeignKeyConstraints = false;

public function __construct($files)
Expand All @@ -46,8 +49,6 @@ public function __construct($files)

public function output(Tree $tree, $overwrite = false): array
{
$output = [];

$created_pivot_tables = [];

$stub = $this->files->stub('migration.stub');
Expand All @@ -60,7 +61,7 @@ public function output(Tree $tree, $overwrite = false): array
$action = $this->files->exists($path) ? 'updated' : 'created';
$this->files->put($path, $this->populateStub($stub, $model));

$output[$action][] = $path;
$this->output[$action][] = $path;

if (! empty($model->pivotTables())) {
foreach ($model->pivotTables() as $pivotSegments) {
Expand All @@ -75,10 +76,10 @@ public function output(Tree $tree, $overwrite = false): array
$action = $this->files->exists($path) ? 'updated' : 'created';
$this->files->put($path, $this->populatePivotStub($stub, $pivotSegments));
$created_pivot_tables[] = $pivotTable;
$output[$action][] = $path;
$this->output[$action][] = $path;
}

return $output;
return $this->output;
}

public function types(): array
Expand Down Expand Up @@ -324,11 +325,30 @@ protected function getTablePath($tableName, Carbon $timestamp, $overwrite = fals
$dir = 'database/migrations/';
$name = '_create_'.$tableName.'_table.php';

$file = $overwrite ? collect($this->files->files($dir))->first(function ($file) use ($tableName) {
return str_contains($file, $tableName);
}) : false;
if ($overwrite) {
$migrations = collect($this->files->files($dir))
->filter(function (SplFileInfo $file) use ($name) {
return str_contains($file->getFilename(), $name);
})
->sort();

if ($migrations->isNotEmpty()) {
$migration = $migrations->first()->getPathname();

$migrations->diff($migration)
->each(function (SplFileInfo $file) {
$path = $file->getPathname();

$this->files->delete($path);

$this->output['deleted'][] = $path;
});

return $migration;
}
}

return $file ? (string) $file : $dir.$timestamp->format('Y_m_d_His').$name;
return $dir.$timestamp->format('Y_m_d_His').$name;
}

protected function isLaravel7orNewer()
Expand Down