diff --git a/src/Blueprint.php b/src/Blueprint.php index bba03703..6bf460b7 100644 --- a/src/Blueprint.php +++ b/src/Blueprint.php @@ -38,6 +38,10 @@ public function parse($content) return $matches[1] . 'resource: all'; }, $content); + $content = preg_replace_callback('/^(\s+)uuid(: true)?$/mi', function ($matches) { + return $matches[1] . 'id: uuid primary'; + }, $content); + return Yaml::parse($content); } diff --git a/tests/Feature/BlueprintTest.php b/tests/Feature/BlueprintTest.php index fb6f8bf1..891fdfda 100644 --- a/tests/Feature/BlueprintTest.php +++ b/tests/Feature/BlueprintTest.php @@ -95,6 +95,23 @@ public function it_parses_shorthands() ], $this->subject->parse($blueprint)); } + /** + * @test + */ + public function it_parses_uuid_shorthand() + { + $blueprint = $this->fixture('definitions/uuid-shorthand.bp'); + + $this->assertEquals([ + 'models' => [ + 'Person' => [ + 'id' => 'uuid primary', + 'timestamps' => 'timestamps', + ], + ] + ], $this->subject->parse($blueprint)); + } + /** * @test */ diff --git a/tests/Feature/Generator/MigrationGeneratorTest.php b/tests/Feature/Generator/MigrationGeneratorTest.php index 126c82a1..628518dc 100644 --- a/tests/Feature/Generator/MigrationGeneratorTest.php +++ b/tests/Feature/Generator/MigrationGeneratorTest.php @@ -138,6 +138,7 @@ public function modelTreeDataProvider() ['definitions/optimize.bp', 'database/migrations/timestamp_create_optimizes_table.php', 'migrations/optimize.php'], ['definitions/model-key-constraints.bp', 'database/migrations/timestamp_create_orders_table.php', 'migrations/model-key-constraints.php'], ['definitions/disable-auto-columns.bp', 'database/migrations/timestamp_create_states_table.php', 'migrations/disable-auto-columns.php'], + ['definitions/uuid-shorthand.bp', 'database/migrations/timestamp_create_people_table.php', 'migrations/uuid-shorthand.php'], ]; } } diff --git a/tests/fixtures/definitions/uuid-shorthand.bp b/tests/fixtures/definitions/uuid-shorthand.bp new file mode 100644 index 00000000..ddd12b14 --- /dev/null +++ b/tests/fixtures/definitions/uuid-shorthand.bp @@ -0,0 +1,4 @@ +models: + Person: + uuid + timestamps diff --git a/tests/fixtures/migrations/uuid-shorthand.php b/tests/fixtures/migrations/uuid-shorthand.php new file mode 100644 index 00000000..ecc5e0c0 --- /dev/null +++ b/tests/fixtures/migrations/uuid-shorthand.php @@ -0,0 +1,31 @@ +uuid('id')->primary(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('people'); + } +}