Skip to content

Commit ccd7794

Browse files
committed
Fix relation name in targetRelation bug
1 parent e1e5f84 commit ccd7794

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/lib/ValidationRulesBuilder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
use cebe\yii2openapi\lib\items\Attribute;
1111
use cebe\yii2openapi\lib\items\DbModel;
1212
use cebe\yii2openapi\lib\items\ValidationRule;
13-
use yii\helpers\VarDumper;
14-
use yii\validators\DateValidator;
1513
use function count;
1614
use function implode;
1715
use function in_array;
@@ -162,10 +160,12 @@ private function addExistRules(array $relations):void
162160
} elseif ($attribute->phpType === 'string') {
163161
$this->addStringRule($attribute);
164162
}
163+
164+
$targetRelation = AttributeResolver::relationName($attribute->columnName, $attribute->propertyName);
165165
$this->rules[$attribute->columnName . '_exist'] = new ValidationRule(
166166
[$attribute->columnName],
167167
'exist',
168-
['targetRelation' => $attribute->camelName()]
168+
['targetRelation' => $targetRelation]
169169
);
170170
}
171171
}

tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
return [
44
'openApiPath' => '@specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/index.yaml',
5-
'generateUrls' => true,
5+
'generateUrls' => false,
66
'generateModels' => true,
77
'excludeModels' => [
88
'Error',
99
],
10-
'generateControllers' => true,
10+
'generateControllers' => false,
1111
'generateMigrations' => true,
1212
'generateModelFaker' => true,
1313
];

tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/index.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,3 @@ components:
3131
allOf:
3232
- $ref: '#/components/schemas/User'
3333
- x-fk-column-name: user
34-

0 commit comments

Comments
 (0)