Skip to content
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

Do not pass connection name to PrimaryReadReplicaConnection::connect() #1156

Merged
merged 2 commits into from
Apr 30, 2021
Merged

Do not pass connection name to PrimaryReadReplicaConnection::connect() #1156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4892f6
Do not pass connection name to `PrimaryReadReplicaConnection::connect()`
frankverhoeven Apr 28, 2021
5df115c
Call `ensureConnectedToPrimary()` instead of `connect()`
frankverhoeven Apr 28, 2021
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
2 changes: 1 addition & 1 deletion lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ private function isInitialized(): bool
}

if ($this->connection instanceof PrimaryReadReplicaConnection) {
$this->connection->connect('master');
$this->connection->connect();
Copy link
Member

Choose a reason for hiding this comment

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

The equivalent of the old ->connect('master') API of MasterSlaveConnection is ->ensureConnectedToPrimary(), not ->connect()

}

return $this->schemaManager->tablesExist([$this->configuration->getTableName()]);
Expand Down
3 changes: 1 addition & 2 deletions tests/Doctrine/Migrations/Tests/Metadata/Storage/ExistingTableMetadataStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ public function testPrimaryReadReplicaConnectionGetsConnected(): void
$connection = $this->createMock(PrimaryReadReplicaConnection::class);
$connection
->expects(self::atLeastOnce())
->method('connect')
->with('master');
->method('connect');

$connection
->expects(self::atLeastOnce())
Expand Down