Skip to content

Fix for issue #335 #421

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

Closed
wants to merge 1 commit into from
Closed

Fix for issue #335 #421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 28 additions & 10 deletions src/generators/model/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ public function rules()
{
return array_merge(parent::rules(), [
[['db', 'ns', 'tableName', 'modelClass', 'baseClass', 'queryNs', 'queryClass', 'queryBaseClass'], 'filter', 'filter' => 'trim'],
[['ns', 'queryNs'], 'filter', 'filter' => function ($value) { return trim($value, '\\'); }],
[['ns', 'queryNs'], 'filter', 'filter' => function ($value) {
return trim($value, '\\');
}],

[['db', 'ns', 'tableName', 'baseClass', 'queryNs', 'queryBaseClass'], 'required'],
[['db', 'modelClass', 'queryClass'], 'match', 'pattern' => '/^\w+$/', 'message' => 'Only word characters are allowed.'],
Expand Down Expand Up @@ -288,7 +290,7 @@ protected function generateProperties($table)
default:
$type = $column->phpType;
}
if ($column->allowNull){
if ($column->allowNull) {
$type .= '|null';
}
$properties[$column->name] = [
Expand Down Expand Up @@ -335,19 +337,24 @@ public function generateRules($table)
{
$types = [];
$lengths = [];
$defValues = [];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$defValues = [];
$defaultValues = [];

$driverName = $this->getDbDriverName();
foreach ($table->columns as $column) {
if ($column->autoIncrement) {
continue;
}
if (!$column->allowNull && $column->defaultValue === null) {
$types['required'][] = $column->name;
}

switch ($column->type) {
case Schema::TYPE_SMALLINT:
case Schema::TYPE_INTEGER:
case Schema::TYPE_BIGINT:
case Schema::TYPE_TINYINT:
$types['integer'][] = $column->name;

if ($driverName === 'pgsql' && !is_null($column->defaultValue)) {
$defValues[$column->type][$column->defaultValue][] = $column->name;
}

break;
case Schema::TYPE_BOOLEAN:
$types['boolean'][] = $column->name;
Expand All @@ -368,18 +375,29 @@ public function generateRules($table)
default: // strings
if ($column->size > 0) {
$lengths[$column->size][] = $column->name;
if ($driverName === 'pgsql' && !is_null($column->defaultValue)) {
$defValues[$column->type][$column->defaultValue][] = $column->name;
}
} else {
$types['string'][] = $column->name;
}
}

if (!$column->allowNull && $column->defaultValue === null) {
$types['required'][] = $column->name;
}
}
$rules = [];
$driverName = $this->getDbDriverName();
foreach ($types as $type => $columns) {
if ($driverName === 'pgsql' && $type === 'integer') {
$rules[] = "[['" . implode("', '", $columns) . "'], 'default', 'value' => null]";
$rules[] = "[['" . implode("', '", $columns) . "'], '$type']";

if ($driverName === 'pgsql' && $defValues && ($type === 'integer' || $type === 'string')) {
foreach ($defValues[$type] as $defValue => $columns) {
if ($type === 'integer') {
$rules[] = "[['" . implode("', '", $columns) . "'], 'default', 'value' => $defValue]";
} else {
$rules[] = "[['" . implode("', '", $columns) . "'], 'default', 'value' => '$defValue']";
}
}
$rules[] = "[['" . implode("', '", $columns) . "'], '$type']";
}
foreach ($lengths as $length => $columns) {
$rules[] = "[['" . implode("', '", $columns) . "'], 'string', 'max' => $length]";
Expand Down