WMDE-leszek has submitted this change and it was merged.
Change subject: Pass db name into cognate store
......................................................................
Pass db name into cognate store
Change-Id: I458f4b20bd92a5069f461e31e0e4e8b26109b489
---
M src/CognateStore.php
M src/ServiceWiring.php
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
WMDE-Fisch: Looks good to me, but someone else must approve
Jonas Kress (WMDE): Looks good to me, approved
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/CognateStore.php b/src/CognateStore.php
index f8bdd7c..ae5c7c9 100644
--- a/src/CognateStore.php
+++ b/src/CognateStore.php
@@ -27,13 +27,16 @@
/**
* @param ILoadBalancer $loadBalancer
+ * @param string $databaseName
* @param StringNormalizer $stringNormalizer
*/
public function __construct(
ILoadBalancer $loadBalancer,
+ $databaseName,
StringNormalizer $stringNormalizer
) {
$this->loadBalancer = $loadBalancer;
+ $this->databaseName = $databaseName;
$this->stringNormalizer = $stringNormalizer;
}
@@ -50,7 +53,7 @@
'cgti_namespace' => $linkTarget->getNamespace(),
'cgti_key' => $this->stringNormalizer->normalize(
$linkTarget->getDBkey() ),
];
- $dbw = $this->loadBalancer->getConnectionRef( DB_MASTER );
+ $dbw = $this->loadBalancer->getConnectionRef( DB_MASTER, [],
$this->databaseName );
$result = $dbw->insert( self::TITLES_TABLE_NAME, $pageData,
__METHOD__, [ 'IGNORE' ] );
return $result;
@@ -68,7 +71,7 @@
'cgti_title' => $linkTarget->getDBkey(),
'cgti_namespace' => $linkTarget->getNamespace(),
];
- $dbw = $this->loadBalancer->getConnectionRef( DB_MASTER );
+ $dbw = $this->loadBalancer->getConnectionRef( DB_MASTER, [],
$this->databaseName );
$result = $dbw->delete( self::TITLES_TABLE_NAME, $pageData,
__METHOD__ );
return (bool)$result;
@@ -80,7 +83,7 @@
* @return string[] language codes, excluding the language passed into
this method.
*/
public function getLinksForPage( $languageCode, LinkTarget $linkTarget
) {
- $dbr = $this->loadBalancer->getConnectionRef( DB_SLAVE );
+ $dbr = $this->loadBalancer->getConnectionRef( DB_SLAVE, [],
$this->databaseName );
$result = $dbr->select(
self::TITLES_TABLE_NAME,
[ 'cgti_site' ],
diff --git a/src/ServiceWiring.php b/src/ServiceWiring.php
index d14d591..529ba50 100644
--- a/src/ServiceWiring.php
+++ b/src/ServiceWiring.php
@@ -35,6 +35,7 @@
return new CognateStore(
$lb,
+ $cognateDb,
new StringNormalizer()
);
},
--
To view, visit https://gerrit.wikimedia.org/r/317651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I458f4b20bd92a5069f461e31e0e4e8b26109b489
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/Cognate
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
