Skip to content

Resolve: Bug: add/remove property and at the same time change it at x-indexes: #3 #5

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 7 commits into from
Nov 14, 2024
Merged

Resolve: Bug: add/remove property and at the same time change it at x-indexes: #3 #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8d8a90
Initial commit to create PR
SOHELAHMED7 Jun 27, 2024
f57ae6c
Add failing test
SOHELAHMED7 Jun 27, 2024
7cd81e8
Add potential fix
SOHELAHMED7 Jun 27, 2024
f5f2d79
Fix failing tests
SOHELAHMED7 Jun 27, 2024
a67e14a
Compare files in test
SOHELAHMED7 Jun 27, 2024
e422b00
Merge branches 'master' and '3-bug-addremove-property-and-at-the-same…
SOHELAHMED7 Nov 14, 2024
26c8a26
Fix failing tests
SOHELAHMED7 Nov 14, 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
Prev Previous commit
Next Next commit
Merge branches 'master' and '3-bug-addremove-property-and-at-the-same… 
…-time-change-it-at-x-indexes' of github.com:php-openapi/yii2-openapi into 3-bug-addremove-property-and-at-the-same-time-change-it-at-x-indexes
  • Loading branch information
@SOHELAHMED7
SOHELAHMED7 committed Nov 14, 2024
commit e422b001b371f30d73e55bc8fec2f95024dd9d06
4 changes: 3 additions & 1 deletion src/lib/migrations/BaseMigrationBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,9 @@ function (string $unknownColumn) {
} else {
$this->buildRelations();
}


$this->buildTablesDrop();

return $this->migration;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/specs/blog_v2/migrations_maria_db/m200000_000004_change_table_v2_users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function down()
$this->alterColumn('{{%v2_users}}', 'created_at', $this->timestamp()->null()->defaultExpression("current_timestamp()"));
$this->alterColumn('{{%v2_users}}', 'role', $this->string(20)->null()->defaultValue('reader'));
$this->alterColumn('{{%v2_users}}', 'email', $this->string(200)->notNull());
$this->addColumn('{{%v2_users}}', 'username', $this->string(200)->notNull());
$this->addColumn('{{%v2_users}}', 'username', $this->string(200)->notNull()->after('id'));
$this->dropIndex('v2_users_role_flags_hash_index', '{{%v2_users}}');
$this->dropIndex('v2_users_login_key', '{{%v2_users}}');
$this->createIndex('v2_users_username_key', '{{%v2_users}}', 'username', true);
Expand Down
2 changes: 1 addition & 1 deletion tests/specs/blog_v2/migrations_mysql_db/m200000_000004_change_table_v2_users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function down()
$this->alterColumn('{{%v2_users}}', 'created_at', $this->timestamp()->null()->defaultExpression("CURRENT_TIMESTAMP"));
$this->alterColumn('{{%v2_users}}', 'role', $this->string(20)->null()->defaultValue('reader'));
$this->alterColumn('{{%v2_users}}', 'email', $this->string(200)->notNull());
$this->addColumn('{{%v2_users}}', 'username', $this->string(200)->notNull());
$this->addColumn('{{%v2_users}}', 'username', $this->string(200)->notNull()->after('id'));
$this->dropIndex('v2_users_role_flags_hash_index', '{{%v2_users}}');
$this->dropIndex('v2_users_login_key', '{{%v2_users}}');
$this->createIndex('v2_users_username_key', '{{%v2_users}}', 'username', true);
Expand Down
1 change: 1 addition & 0 deletions tests/specs/postgres_custom/migrations_pgsql_db/m200000_000000_change_table_v3_pgcustom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public function safeUp()
$this->alterColumn('{{%v3_pgcustom}}', 'json4', "SET DEFAULT '{\"foo\":\"bar\",\"bar\":\"baz\"}'");
$this->alterColumn('{{%v3_pgcustom}}', 'status', "SET DEFAULT 'draft'");
$this->alterColumn('{{%v3_pgcustom}}', 'status_x', "SET DEFAULT 'draft'");
$this->createIndex('v3_pgcustom_search_gin_index', '{{%v3_pgcustom}}', 'to_tsvector(\'english\', search::text)', 'gin');
}

public function safeDown()
Expand Down
114 changes: 114 additions & 0 deletions tests/unit/IssueFixTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,4 +577,118 @@ private function dropTestTableFor3BugAddRemovePropertyAndAtTheSameTimeChangeItAt
Yii::$app->db->createCommand()->dropIndex('addresses_shortName_postalCode_key', '{{%addresses}}')->execute();
Yii::$app->db->createCommand()->dropTable('{{%addresses}}')->execute();
}

// https://github.com/php-openapi/yii2-openapi/issues/29
public function test29ExtensionFkColumnNameCauseErrorInCaseOfColumnNameWithoutUnderscore()
{
$testFile = Yii::getAlias("@specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/index.php");
$this->runGenerator($testFile);
$actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
'recursive' => true,
]);
$expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql"), [
'recursive' => true,
]);
$this->checkFiles($actualFiles, $expectedFiles);
}

// https://github.com/php-openapi/yii2-openapi/issues/30
public function test30AddValidationRulesByAttributeNameOrPattern()
{
$testFile = Yii::getAlias("@specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/index.php");
$this->runGenerator($testFile);
$actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
'recursive' => true,
]);
$expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/mysql"), [
'recursive' => true,
]);
$this->checkFiles($actualFiles, $expectedFiles);
}

// https://github.com/php-openapi/yii2-openapi/issues/52
public function test52BugDependentonAllofWithXFakerFalse()
{
$testFile = Yii::getAlias("@specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/index.php");
$this->runGenerator($testFile);
$actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
'recursive' => true,
]);
$expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql"), [
'recursive' => true,
]);
$this->checkFiles($actualFiles, $expectedFiles);
}

// https://github.com/php-openapi/yii2-openapi/issues/53
public function test53BugInversedReferenceRequireCascade()
{
$testFile = Yii::getAlias("@specs/issue_fix/53_bug_inversed_reference_require_cascade/index.php");
$this->runGenerator($testFile);
$actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
'recursive' => true,
]);
$expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/53_bug_inversed_reference_require_cascade/mysql"), [
'recursive' => true,
]);
$this->checkFiles($actualFiles, $expectedFiles);
}


// https://github.com/cebe/yii2-openapi/issues/144
public function test144MethodsNamingForNonCrudActions()
{
$testFile = Yii::getAlias("@specs/issue_fix/144_methods_naming_for_non_crud_actions/index.php");
$this->runGenerator($testFile);
$actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
'recursive' => true,
]);
$expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/144_methods_naming_for_non_crud_actions/app"), [
'recursive' => true,
]);
$this->checkFiles($actualFiles, $expectedFiles);
}

// https://github.com/cebe/yii2-openapi/issues/84
public function test84HowToGenerateControllerCodeWithDistinctMethodNamesInCaseOfPrefixInPaths()
{
$testFile = Yii::getAlias("@specs/issue_fix/84_how_to_generate_controller_code_with_distinct_method_names_in_case_of_prefix_in_paths/index.php");
$this->runGenerator($testFile);
$actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
'recursive' => true,
]);
$expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/84_how_to_generate_controller_code_with_distinct_method_names_in_case_of_prefix_in_paths/app"), [
'recursive' => true,
]);
$this->checkFiles($actualFiles, $expectedFiles);
}

// https://github.com/php-openapi/yii2-openapi/issues/20
public function test20ConsiderOpenApiSpecExamplesInFakeCodeGeneration()
{
$testFile = Yii::getAlias("@specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/index.php");
$this->runGenerator($testFile);
$actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
'recursive' => true,
]);
$expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql"), [
'recursive' => true,
]);
$this->checkFiles($actualFiles, $expectedFiles);
}

// https://github.com/php-openapi/yii2-openapi/issues/25
public function test25GenerateInverseRelations()
{
$testFile = Yii::getAlias("@specs/issue_fix/25_generate_inverse_relations/index.php");
$this->runGenerator($testFile);
$this->runActualMigrations('mysql', 3);
$actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
'recursive' => true,
]);
$expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/25_generate_inverse_relations/mysql"), [
'recursive' => true,
]);
$this->checkFiles($actualFiles, $expectedFiles);
}
}
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.