We have code like this in lots of tests now:
new RepoDomainDb( LBFactorySingle::newFromConnection( $this->db ), $this->db->getDomainID() )
It would be nice to extract it into a convenience method somewhere. I’m not sure where that method should live, though… would RepoDomainDb::newFromConnection() make sense?
| Status | Subtype | Assigned | Task | ||
|---|---|---|---|---|---|
| Resolved | Addshore | T281453 Abstract database connections between Client and Repository | |||
| Resolved | Addshore | T283246 Use DomainDB abstraction in all places in Wikibase where DB connections are created or ILBFactory / ILoadBalancer are otherwise used | |||
| Resolved | • toan | T285087 Add convenience methods to create RepoDomainDb/ClientDomainDb from IDatabase |
I’m also tempted to say the method should throw if it’s called outside of tests (i.e. when !defined( 'MW_PHPUNIT_TEST' )), but I’m not sure.
Change 700489 had a related patch set uploaded (by Tobias Andersson; author: Tobias Andersson):
[mediawiki/extensions/Wikibase@master] Add RepoDomainDB test convenience method
Change 700490 had a related patch set uploaded (by Tobias Andersson; author: Tobias Andersson):
[mediawiki/extensions/Wikibase@master] Use new RepoDomainDB convenience method
Change 700489 merged by jenkins-bot:
[mediawiki/extensions/Wikibase@master] Add RepoDomainDB test convenience method
Change 700490 merged by jenkins-bot:
[mediawiki/extensions/Wikibase@master] Use new RepoDomainDB convenience method
Some not done yet:
amsa@amsa-Latitude-7480:~/Wikibase$ grep -ri LBFactorySingle lib/tests/phpunit/Rdbms/LocalRepoDbTestHelper.php:use Wikimedia\Rdbms\LBFactorySingle; lib/tests/phpunit/Rdbms/LocalRepoDbTestHelper.php: $lbFactory = LBFactorySingle::newFromConnection( $db ); lib/tests/phpunit/Store/Sql/SiteLinkTableTest.php:use Wikimedia\Rdbms\LBFactorySingle; lib/tests/phpunit/Store/Sql/SiteLinkTableTest.php: LBFactorySingle::newFromConnection( $this->db ), lib/includes/Rdbms/RepoDomainDb.php:use Wikimedia\Rdbms\LBFactorySingle; lib/includes/Rdbms/RepoDomainDb.php: $lbFactory = LBFactorySingle::newFromConnection( $db ); client/tests/phpunit/integration/includes/Store/Sql/DirectSqlStoreTest.php:use Wikimedia\Rdbms\LBFactorySingle; client/tests/phpunit/integration/includes/Store/Sql/DirectSqlStoreTest.php: LBFactorySingle::newFromConnection( $this->db ), client/tests/phpunit/integration/includes/Usage/Sql/EntityUsageTableBuilderTest.php:use Wikimedia\Rdbms\LBFactorySingle; client/tests/phpunit/integration/includes/Usage/Sql/EntityUsageTableBuilderTest.php: LBFactorySingle::newFromConnection( $this->db ),
LocalRepoDbTestHelper is interesting because it looks like @Jakob_WMDE already did this task but for the factory. Wish i had noticed this before, now we have two ways of doing this in the test.
Change 700833 had a related patch set uploaded (by Tobias Andersson; author: Tobias Andersson):
[mediawiki/extensions/Wikibase@master] Use existing RepoDomainDb helper trait
Change 700833 merged by jenkins-bot:
[mediawiki/extensions/Wikibase@master] Use existing RepoDomainDb helper trait