Skip to content

remove doctrine #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 1, 2024
Merged

remove doctrine #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90d98fd
chore!: remove doctrine/dbal, require Laravel 11
macbookandrew Jul 19, 2024
221092a
chore!: remove reliance on doctrine/dbal
macbookandrew Jul 19, 2024
968e0c8
chore: add 2.0.0 changelog
macbookandrew Jul 19, 2024
24206c7
fix: add uuid case
macbookandrew Jul 19, 2024
85750b7
chore: Revert "chore: add 2.0.0 changelog"
macbookandrew Jul 29, 2024
79732ce
Merge branch 'main' into chore/remove-doctrine
TartanLeGrand Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
"require": {
"php": "^8.0",
"ext-json": "*",
"doctrine/dbal": "^2.6|^3.0",
"goldspecdigital/oooas": "^2.7.1",
"laravel/framework": "5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"laravel/framework": "^11.0",
"phpdocumentor/reflection-docblock": "^5.0"
},
"require-dev": {
Expand Down
72 changes: 32 additions & 40 deletions src/Console/SchemaFactoryMakeCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

namespace Vyuldashev\LaravelOpenApi\Console;

use Doctrine\DBAL\Types\BooleanType;
use Doctrine\DBAL\Types\DateTimeType;
use Doctrine\DBAL\Types\DateType;
use Doctrine\DBAL\Types\DecimalType;
use Doctrine\DBAL\Types\IntegerType;
use Illuminate\Console\GeneratorCommand;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Schema as SchemaFacade;
Expand Down Expand Up @@ -46,63 +41,60 @@ protected function buildModel($output, $model)
/** @var Model $model */
$model = app($model);

$columns = SchemaFacade::connection($model->getConnectionName())->getColumnListing(config('database.connections.' . config('database.default') . '.prefix', '') . $model->getTable());
$connection = $model->getConnection();

$tableName = config('database.connections.' . config('database.default') . '.prefix', '') . $model->getTable();

$connection->getSchemaGrammar();
$columns = SchemaFacade::getColumns($model->getTable());

$definition = 'return Schema::object(\'' . class_basename($model) . '\')' . PHP_EOL;
$definition .= ' ->properties(' . PHP_EOL;

$properties = collect($columns)
->map(static function ($columnName) use ($model, $connection, $tableName) {
$columnType = null;
$default = null;
$notNull = false;

// Use the schema builder to get the columns of the table
$tableColumns = $connection->getSchemaBuilder()->getColumns($tableName);

// Iterate over each column in the table
foreach ($tableColumns as $column) {
// Check if the current column is the one we're interested in
if ($column['name'] == $columnName) {
// If it is, then retrieve its type, default value, and nullability
// If these values are not set, provide a default value
$columnType = $column['type'] ?? "";
$defaultValue = $column['default'] ?? null;
$isNotNull = ($column['nullable'] ?? false) === false;

// Once we've found our column, we don't need to check the others
break;
}
}

$name = $columnName;
->map(static function (array $column) {
$columnType = $column['type_name'];
$default = $column['default'] ?? null;
$notNull = ! $column['nullable'];
$name = $column['name'];

switch ($columnType) {
case IntegerType::class:
case 'integer':
case 'bigint':
case 'smallint':
$format = 'Schema::integer(%s)->default(%s)';
$args = [$name, $notNull ? (int)$default : null];
break;
case BooleanType::class:
case 'boolean':
$format = 'Schema::boolean(%s)->default(%s)';
$args = [$name, $notNull ? $default : null];
break;
case DateType::class:
case 'date':
case 'date_immutable':
$format = 'Schema::string(%s)->format(Schema::FORMAT_DATE)->default(%s)';
$args = [$name, $notNull ? $default : null];
break;
case DateTimeType::class:
case 'datetime':
case 'datetime_immutable':
case 'datetimetz':
case 'datetimetz_immutable':
$format = 'Schema::string(%s)->format(Schema::FORMAT_DATE_TIME)->default(%s)';
$args = [$name, $notNull ? $default : null];
break;
case DecimalType::class:
case 'decimal':
case 'float':
$format = 'Schema::number(%s)->format(Schema::FORMAT_FLOAT)->default(%s)';
$args = [$name, $notNull ? (float)$default : null];
break;
case 'array':
case 'json':
$format = 'Schema::array(%s)->default(%s)';
$args = [$name, $notNull ? (array)$default : null];
break;
case 'guid':
case 'uuid':
$format = 'Schema::string(%s)->format(Schema::FORMAT_UUID)->default(%s)';
$args = [$name, $notNull ? (array)$default : null];
break;
case 'binary':
$format = 'Schema::string(%s)->format(Schema::FORMAT_BINARY)->default(%s)';
$args = [$name, $notNull ? $default : null];
break;
default:
$format = 'Schema::string(%s)->default(%s)';
$args = [$name, $default];
Expand Down