Skip to content

Commit 156f4d9

Browse files
author
Marcel Pociot
committed
Fix issue with custom date attributes.
Consider SoftDelete trait Fixes issue #4
1 parent 610262c commit 156f4d9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/Console/GenerateCommand.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,15 +240,17 @@ protected function getPropertiesFromTable($model)
240240
foreach ($columns as $column) {
241241
$name = $column->getName();
242242
if (in_array($name, $model->getDates())) {
243-
$type = '\Carbon\Carbon';
243+
$type = 'datetime';
244244
} else {
245245
$type = $column->getType()->getName();
246246
}
247247
if (!($model->incrementing && $model->getKeyName() === $name) &&
248248
$name !== $model::CREATED_AT &&
249249
$name !== $model::UPDATED_AT
250250
) {
251-
$this->setProperty($name, $type);
251+
if(!method_exists($model,'getDeletedAtColumn') || (method_exists($model,'getDeletedAtColumn') && $name !== $model->getDeletedAtColumn())) {
252+
$this->setProperty($name, $type);
253+
}
252254
}
253255
}
254256
}

0 commit comments

Comments
 (0)