Skip to content

Commit 3d4de89

Browse files
committed
=Fixes a bug with create:fields-file command
1 parent 3de3f5e commit 3d4de89

File tree

4 files changed

+28
-21
lines changed

4 files changed

+28
-21
lines changed

src/Commands/CreateResourcesCommand.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace CrestApps\CodeGenerator\Commands;
44

5+
use Exception;
56
use Illuminate\Console\Command;
67
use CrestApps\CodeGenerator\Support\Helpers;
78
use CrestApps\CodeGenerator\Traits\CommonCommand;

src/DatabaseParsers/MysqlParser.php

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,28 @@ protected function getColumn()
3838
*
3939
* @return CrestApps\CodeGenerator\Model\Field;
4040
*/
41-
protected function getTransfredField($column)
41+
protected function getTransfredFields(array $columns)
4242
{
43-
$field = new Field($column->COLUMN_NAME);
44-
45-
$this->setIsNullable($field, $column->IS_NULLABLE)
46-
->setMaxLength($field, $column->CHARACTER_MAXIMUM_LENGTH)
47-
->setDefault($field, $column->COLUMN_DEFAULT)
48-
->setDataType($field, $column->DATA_TYPE)
49-
->setKey($field, $column->COLUMN_KEY, $column->EXTRA)
50-
->setLabel($field, $column->COLUMN_NAME)
51-
->setComment($field, $column->COLUMN_COMMENT)
52-
->setOptions($field, $column->COLUMN_TYPE)
53-
->setUnsigned($field, $column->COLUMN_TYPE)
54-
->setHtmlType($field, $column->DATA_TYPE);
55-
56-
return $field;
43+
$fields = [];
44+
45+
foreach($columns as $column)
46+
{
47+
$field = new Field($column->COLUMN_NAME);
48+
$this->setIsNullable($field, $column->IS_NULLABLE)
49+
->setMaxLength($field, $column->CHARACTER_MAXIMUM_LENGTH)
50+
->setDefault($field, $column->COLUMN_DEFAULT)
51+
->setDataType($field, $column->DATA_TYPE)
52+
->setKey($field, $column->COLUMN_KEY, $column->EXTRA)
53+
->setLabel($field, $column->COLUMN_NAME)
54+
->setComment($field, $column->COLUMN_COMMENT)
55+
->setOptions($field, $column->COLUMN_TYPE)
56+
->setUnsigned($field, $column->COLUMN_TYPE)
57+
->setHtmlType($field, $column->DATA_TYPE);
58+
59+
$fields[] = $field;
60+
}
61+
62+
return $fields;
5763
}
5864

5965
/**

src/DatabaseParsers/ParserBase.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public function getFields()
9292
protected function transfer(array $columns)
9393
{
9494
$fields = array_map(function ($field) {
95-
return new FieldMapper($field, null);
96-
}, $this->getTransfredField($column));
95+
return new FieldMapper($field);
96+
}, $this->getTransfredFields($columns));
9797

9898
$optimizer = new FieldsOptimizer($fields);
9999

@@ -329,9 +329,9 @@ protected function setComment(Field & $field, $comment)
329329
abstract protected function getColumn();
330330

331331
/**
332-
* Gets the field after transfering it from a giving query object.
332+
* Transfers every column in the giving array to a collection of fields.
333333
*
334-
* @return CrestApps\CodeGenerator\Models\Field;
334+
* @return array of CrestApps\CodeGenerator\Models\Field;
335335
*/
336-
abstract protected function getTransfredField($column);
336+
abstract protected function getTransfredFields(array $columns);
337337
}

src/Models/FieldMapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class FieldMapper
2020
*/
2121
public $meta;
2222

23-
public function __construct(Field $field, array $meta = null)
23+
public function __construct(Field $field, array $meta = [])
2424
{
2525
$this->field = $field;
2626
$this->meta = $meta;

0 commit comments

Comments
 (0)