Rework all known column data types (#268)

jasonmccreary · web-flow · commit fecabdccf5f9 · 2020-06-12T10:53:53.000-04:00
diff --git a/src/Generators/FactoryGenerator.php b/src/Generators/FactoryGenerator.php
@@ -77,6 +77,10 @@ protected function buildDefinition(Model $model)
                 continue;
             }
 
+            if (Str::startsWith($column->dataType(), 'nullable')) {
+                continue;
+            }
+
             $foreign = $column->isForeignKey();
             if ($foreign) {
                 $table = Str::beforeLast($column->name(), '_id');
@@ -109,7 +113,7 @@ protected function buildDefinition(Model $model)
                     $definition .= PHP_EOL;
                     $definition .= self::INDENT . '},' . PHP_EOL;
                 }
-            } elseif (in_array($column->dataType(), ['id', 'uuid'])) {
+            } elseif ($column->dataType() === 'id' || ($column->dataType() === 'uuid' && Str::endsWith($column->name(), '_id'))) {
                 $name = Str::beforeLast($column->name(), '_id');
                 $class = Str::studly($column->attributes()[0] ?? $name);
 
@@ -140,7 +144,7 @@ protected function buildDefinition(Model $model)
                     implode(', ', [$scale, 0, (str_repeat(9, $precision - $scale) . '.' . str_repeat(9, $scale))]),
                     $definition
                 );
-            } elseif ($column->dataType() === 'json') {
+            } elseif (in_array($column->dataType(), ['json', 'jsonb'])) {
                 $default = $column->defaultValue() ?? "'{}'";
                 $definition .= self::INDENT . "'{$column->name()}' => {$default}," . PHP_EOL;
             } elseif ($column->dataType() === 'morphs') {
@@ -156,7 +160,18 @@ protected function buildDefinition(Model $model)
                 $definition .= ',' . PHP_EOL;
             } else {
                 $definition .= self::INDENT . "'{$column->name()}' => ";
-                $faker = self::fakerData($column->name()) ?? self::fakerDataType($column->dataType());
+
+                $type = $column->dataType();
+                if ($column->isUnsigned()) {
+                    $type = 'unsigned' . $type;
+                }
+
+                $faker = self::fakerData($column->name()) ?? (self::fakerDataType($type) ?? self::fakerDataType($column->dataType()));
+
+                if ($faker === null) {
+                    $faker = 'word';
+                }
+
                 $definition .= '$faker->' . $faker;
                 $definition .= ',' . PHP_EOL;
             }
@@ -235,29 +250,57 @@ public static function fakerData(string $name)
     public static function fakerDataType(string $type)
     {
         $fakeableTypes = [
-            'biginteger' => 'randomNumber()',
+            'biginteger' => 'numberBetween(-100000, 100000)',
+            'binary' => 'sha256',
             'boolean' => 'boolean',
+            'char' => 'randomLetter',
             'date' => 'date()',
             'datetime' => 'dateTime()',
             'datetimetz' => 'dateTime()',
             'decimal' => 'randomFloat(/** decimal_attributes **/)',
             'double' => 'randomFloat(/** double_attributes **/)',
             'enum' => 'randomElement(/** enum_attributes **/)',
             'float' => 'randomFloat(/** float_attributes **/)',
+            'geometry' => 'word',
+            'geometrycollection' => 'word',
             'guid' => 'uuid',
             'id' => 'randomDigitNotNull',
-            'integer' => 'randomNumber()',
+            'integer' => 'numberBetween(-10000, 10000)',
+            'ipaddress' => 'ipv4',
+            'linestring' => 'word',
             'longtext' => 'text',
+            'macaddress' => 'macAddress',
+            'mediuminteger' => 'numberBetween(-10000, 10000)',
+            'mediumtext' => 'text',
+            'morphs_id' => 'randomDigitNotNull',
+            'morphs_type' => 'word',
+            'multilinestring' => 'word',
+            'multipoint' => 'word',
+            'multipolygon' => 'word',
+            'nullablemorphs' => null,
+            'nullabletimestamps' => null,
+            'nullableuuidmorphs' => null,
+            'point' => 'word',
+            'polygon' => 'word',
             'set' => 'randomElement(/** set_attributes **/)',
-            'smallint' => 'randomNumber()',
-            'smallinteger' => 'randomNumber()',
+            'smallint' => 'numberBetween(-1000, 1000)',
+            'smallinteger' => 'numberBetween(-1000, 1000)',
             'string' => 'word',
             'text' => 'text',
             'time' => 'time()',
             'timestamp' => 'dateTime()',
-            'tinyinteger' => 'randomNumber()',
-            'unsignedsmallinteger' => 'randomDigitNotNull',
+            'timestamptz' => 'dateTime()',
+            'timetz' => 'time()',
+            'tinyinteger' => 'numberBetween(-8, 8)',
+            'unsignedbiginteger' => 'randomNumber()',
+            'unsigneddecimal' => 'randomNumber()',
+            'unsignedinteger' => 'randomNumber()',
+            'unsignedmediuminteger' => 'randomNumber()',
+            'unsignedsmallinteger' => 'randomNumber()',
+            'unsignedtinyinteger' => 'randomDigitNotNull',
             'uuid' => 'uuid',
+            'uuidmorphs' => 'word',
+            'year' => 'year()',
         ];
 
         return $fakeableTypes[strtolower($type)] ?? null;
diff --git a/src/Models/Column.php b/src/Models/Column.php
@@ -57,4 +57,9 @@ public function isNullable()
     {
         return in_array('nullable', $this->modifiers);
     }
+
+    public function isUnsigned()
+    {
+        return in_array('unsigned', $this->modifiers);
+    }
 }
diff --git a/tests/Feature/Generator/FactoryGeneratorTest.php b/tests/Feature/Generator/FactoryGeneratorTest.php
@@ -153,6 +153,7 @@ public function modelTreeDataProvider()
             ['drafts/foreign-key-shorthand.yaml', 'database/factories/CommentFactory.php', 'factories/foreign-key-shorthand.php'],
             ['drafts/resource-statements.yaml', 'database/factories/UserFactory.php', 'factories/resource-statements.php'],
             ['drafts/factory-smallint-and-tinyint.yaml', 'database/factories/ModelFactory.php', 'factories/factory-smallint-and-tinyint.php'],
+            ['drafts/all-column-types.yaml', 'database/factories/AllTypeFactory.php', 'factories/all-column-types.php'],
         ];
     }
 }
diff --git a/tests/Unit/Generators/FactoryGeneratorTest.php b/tests/Unit/Generators/FactoryGeneratorTest.php
@@ -70,29 +70,57 @@ public function commonNameDataProvider()
     public function dataTypeDataProvider()
     {
         return [
-            ['biginteger', 'randomNumber()'],
+            ['biginteger', 'numberBetween(-100000, 100000)'],
+            ['binary', 'sha256'],
             ['boolean', 'boolean'],
+            ['char', 'randomLetter'],
             ['date', 'date()'],
             ['datetime', 'dateTime()'],
             ['datetimetz', 'dateTime()'],
-            ['double', 'randomFloat(/** double_attributes **/)'],
             ['decimal', 'randomFloat(/** decimal_attributes **/)'],
+            ['double', 'randomFloat(/** double_attributes **/)'],
             ['enum', 'randomElement(/** enum_attributes **/)'],
             ['float', 'randomFloat(/** float_attributes **/)'],
+            ['geometry', 'word'],
+            ['geometrycollection', 'word'],
             ['guid', 'uuid'],
             ['id', 'randomDigitNotNull'],
-            ['integer', 'randomNumber()'],
+            ['integer', 'numberBetween(-10000, 10000)'],
+            ['ipaddress', 'ipv4'],
+            ['linestring', 'word'],
             ['longtext', 'text'],
+            ['macaddress', 'macAddress'],
+            ['mediuminteger', 'numberBetween(-10000, 10000)'],
+            ['mediumtext', 'text'],
+            ['morphs_id', 'randomDigitNotNull'],
+            ['morphs_type', 'word'],
+            ['multilinestring', 'word'],
+            ['multipoint', 'word'],
+            ['multipolygon', 'word'],
+            ['nullablemorphs', null],
+            ['nullabletimestamps', null],
+            ['nullableuuidmorphs', null],
+            ['point', 'word'],
+            ['polygon', 'word'],
             ['set', 'randomElement(/** set_attributes **/)'],
-            ['smallint', 'randomNumber()'],
-            ['smallinteger', 'randomNumber()'],
+            ['smallint', 'numberBetween(-1000, 1000)'],
+            ['smallinteger', 'numberBetween(-1000, 1000)'],
             ['string', 'word'],
             ['text', 'text'],
             ['time', 'time()'],
             ['timestamp', 'dateTime()'],
-            ['tinyinteger', 'randomNumber()'],
-            ['unsignedsmallinteger', 'randomDigitNotNull'],
+            ['timestamptz', 'dateTime()'],
+            ['timetz', 'time()'],
+            ['tinyinteger', 'numberBetween(-8, 8)'],
+            ['unsignedbiginteger', 'randomNumber()'],
+            ['unsigneddecimal', 'randomNumber()'],
+            ['unsignedinteger', 'randomNumber()'],
+            ['unsignedmediuminteger', 'randomNumber()'],
+            ['unsignedsmallinteger', 'randomNumber()'],
+            ['unsignedtinyinteger', 'randomDigitNotNull'],
             ['uuid', 'uuid'],
+            ['uuidmorphs', 'word'],
+            ['year', 'year()'],
         ];
     }
 }
diff --git a/tests/fixtures/drafts/all-column-types.yaml b/tests/fixtures/drafts/all-column-types.yaml
@@ -0,0 +1,53 @@
+models:
+  AllType:
+    id: bigIncrements
+    bigInteger: bigInteger
+    binary: binary
+    boolean: boolean
+    char: char
+    date: date
+    dateTime: dateTime
+    dateTimeTz: dateTimeTz
+    decimal: decimal
+    double: double
+    enum: enum:1,2,3
+    float: float
+    geometry: geometry
+    geometryCollection: geometryCollection
+    integer: integer
+    ipAddress: ipAddress
+    json: json
+    jsonb: jsonb
+    lineString: lineString
+    longText: longText
+    macAddress: macAddress
+    mediumInteger: mediumInteger
+    mediumText: mediumText
+    morphs: morphs
+    uuidMorphs: uuidMorphs
+    multiLineString: multiLineString
+    multiPoint: multiPoint
+    multiPolygon: multiPolygon
+    nullableMorphs: nullableMorphs
+    nullableUuidMorphs: nullableUuidMorphs
+    nullableTimestamps: nullableTimestamps
+    point: point
+    polygon: polygon
+    rememberToken: rememberToken
+    set: set:1,2,3
+    smallInteger: smallInteger
+    string: string
+    text: text
+    time: time
+    timeTz: timeTz
+    timestamp: timestamp
+    timestampTz: timestampTz
+    tinyInteger: tinyInteger
+    unsignedBigInteger: unsignedBigInteger
+    unsignedDecimal: unsignedDecimal
+    unsignedInteger: unsignedInteger
+    unsignedMediumInteger: unsignedMediumInteger
+    unsignedSmallInteger: unsignedSmallInteger
+    unsignedTinyInteger: unsignedTinyInteger
+    uuid: uuid
+    year: year
diff --git a/tests/fixtures/factories/all-column-types.php b/tests/fixtures/factories/all-column-types.php
@@ -0,0 +1,60 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\AllType;
+use Faker\Generator as Faker;
+use Illuminate\Support\Str;
+
+$factory->define(AllType::class, function (Faker $faker) {
+    return [
+        'bigInteger' => $faker->numberBetween(-100000, 100000),
+        'binary' => $faker->sha256,
+        'boolean' => $faker->boolean,
+        'char' => $faker->randomLetter,
+        'date' => $faker->date(),
+        'dateTime' => $faker->dateTime(),
+        'dateTimeTz' => $faker->dateTime(),
+        'decimal' => $faker->randomFloat(0, 0, 9999999999.),
+        'double' => $faker->randomFloat(0, 0, 9999999999.),
+        'enum' => $faker->randomElement(["1","2","3"]),
+        'float' => $faker->randomFloat(0, 0, 9999999999.),
+        'geometry' => $faker->word,
+        'geometryCollection' => $faker->word,
+        'integer' => $faker->numberBetween(-10000, 10000),
+        'ipAddress' => $faker->ipv4,
+        'json' => '{}',
+        'jsonb' => '{}',
+        'lineString' => $faker->word,
+        'longText' => $faker->text,
+        'macAddress' => $faker->macAddress,
+        'mediumInteger' => $faker->numberBetween(-10000, 10000),
+        'mediumText' => $faker->text,
+        'morphs_id' => $faker->randomDigitNotNull,
+        'morphs_type' => $faker->word,
+        'uuidMorphs' => $faker->word,
+        'multiLineString' => $faker->word,
+        'multiPoint' => $faker->word,
+        'multiPolygon' => $faker->word,
+        'point' => $faker->word,
+        'polygon' => $faker->word,
+        'rememberToken' => Str::random(10),
+        'set' => $faker->randomElement(["1","2","3"]),
+        'smallInteger' => $faker->numberBetween(-1000, 1000),
+        'string' => $faker->word,
+        'text' => $faker->text,
+        'time' => $faker->time(),
+        'timeTz' => $faker->time(),
+        'timestamp' => $faker->dateTime(),
+        'timestampTz' => $faker->dateTime(),
+        'tinyInteger' => $faker->numberBetween(-8, 8),
+        'unsignedBigInteger' => $faker->randomNumber(),
+        'unsignedDecimal' => $faker->randomNumber(),
+        'unsignedInteger' => $faker->randomNumber(),
+        'unsignedMediumInteger' => $faker->randomNumber(),
+        'unsignedSmallInteger' => $faker->randomNumber(),
+        'unsignedTinyInteger' => $faker->randomDigitNotNull,
+        'uuid' => $faker->uuid,
+        'year' => $faker->year(),
+    ];
+});
diff --git a/tests/fixtures/factories/factory-smallint-and-tinyint.php b/tests/fixtures/factories/factory-smallint-and-tinyint.php
@@ -7,7 +7,7 @@
 
 $factory->define(Model::class, function (Faker $faker) {
     return [
-        'market_type' => $faker->randomNumber(),
+        'market_type' => $faker->numberBetween(-8, 8),
         'deposit' => $faker->randomNumber(),
     ];
 });

Original file line number	Diff line number	Diff line change
`@@ -57,4 +57,9 @@ public function isNullable()`
`57`	`57`	`{`
`58`	`58`	`return in_array('nullable', $this->modifiers);`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ public function isUnsigned()`
	`62`	`+ {`
	`63`	`+ return in_array('unsigned', $this->modifiers);`
	`64`	`+ }`
`60`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ public function modelTreeDataProvider()`
`153`	`153`	`['drafts/foreign-key-shorthand.yaml', 'database/factories/CommentFactory.php', 'factories/foreign-key-shorthand.php'],`
`154`	`154`	`['drafts/resource-statements.yaml', 'database/factories/UserFactory.php', 'factories/resource-statements.php'],`
`155`	`155`	`['drafts/factory-smallint-and-tinyint.yaml', 'database/factories/ModelFactory.php', 'factories/factory-smallint-and-tinyint.php'],`
	`156`	`+ ['drafts/all-column-types.yaml', 'database/factories/AllTypeFactory.php', 'factories/all-column-types.php'],`
`156`	`157`	`];`
`157`	`158`	`}`
`158`	`159`	`}`