diff --git a/modules/Develop/Models/Schemas.php b/modules/Develop/Models/Schemas.php index a7b7fbc..92c0e8b 100644 --- a/modules/Develop/Models/Schemas.php +++ b/modules/Develop/Models/Schemas.php @@ -92,14 +92,13 @@ class Schemas extends CatchModel $columns = []; - foreach (getTableColumns($schema->name) as $columnString) { - $column = DB::connection()->getDoctrineColumn(DB::connection()->getTablePrefix().$schema->name, $columnString); + foreach (\Illuminate\Support\Facades\Schema::getColumns($schema->name) as $column) { $columns[] = [ - 'name' => $column->getName(), - 'type' => $column->getType()->getName(), - 'nullable' => ! $column->getNotnull(), - 'default' => $column->getDefault(), - 'comment' => $column->getComment() + 'name' => $column['name'], + 'type' => $column['type_name'], + 'nullable' => $column['nullable'], + 'default' => $column['default'], + 'comment' => $column['comment'], ]; } diff --git a/modules/Develop/Support/Generate/Create/Model.php b/modules/Develop/Support/Generate/Create/Model.php index 2164782..9a5cd6a 100644 --- a/modules/Develop/Support/Generate/Create/Model.php +++ b/modules/Develop/Support/Generate/Create/Model.php @@ -130,6 +130,7 @@ use Catch\Traits\DB\BaseOperate; use Catch\Traits\DB\ScopeTrait; use Catch\Traits\DB\Trans; use Illuminate\Database\Eloquent\Model; +use Catch\Traits\DB\WithAttributes; Text; } else { return <<softDelete ? '' : 'use BaseOperate, Trans, ScopeTrait;'; + return $this->softDelete ? '' : 'use WithAttributes, BaseOperate, Trans, ScopeTrait;'; } /**