Migrate to use CreateWiki's virtual domains (#535)

miraheze · Nov 20, 2024 · 334d0dd · 334d0dd
1 parent b62d575
commit 334d0dd
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/maintenance/checkSwiftContainers.php b/maintenance/checkSwiftContainers.php
@@ -135,9 +135,8 @@ private function getSwiftContainers(): array {
 	}
 
 	private function findUnmatchedContainers( array $containers ): array {
-		$dbr = $this->getServiceContainer()->getConnectionProvider()->getReplicaDatabase(
-			$this->getConfig()->get( 'CreateWikiDatabase' )
-		);
+		$dbr = $this->getServiceContainer()->getConnectionProvider()
+			->getReplicaDatabase( 'virtual-createwiki' );
 
 		$suffix = $this->getConfig()->get( 'CreateWikiDatabaseSuffix' );
 

diff --git a/maintenance/checkWikiDatabases.php b/maintenance/checkWikiDatabases.php
@@ -116,9 +116,8 @@ private function getWikiDatabasesFromClusters( array $clusters ): array {
 	}
 
 	private function findMissingDatabases( array $wikiDatabases ): array {
-		$dbr = $this->getServiceContainer()->getConnectionProvider()->getReplicaDatabase(
-			$this->getConfig()->get( 'CreateWikiDatabase' )
-		);
+		$dbr = $this->getServiceContainer()->getConnectionProvider()
+			->getReplicaDatabase( 'virtual-createwiki' );
 
 		$missingDatabases = [];
 		foreach ( $wikiDatabases as $dbName => $cluster ) {
@@ -142,7 +141,7 @@ private function checkGlobalTableEntriesWithoutDatabase( array $wikiDatabases ):
 		$suffix = $this->getConfig()->get( 'CreateWikiDatabaseSuffix' );
 
 		$tablesToCheck = [
-			'CreateWikiDatabase' => [
+			'virtual-createwiki' => [
 				'cw_wikis' => 'wiki_dbname',
 				'gnf_files' => 'files_dbname',
 				'localnames' => 'ln_wiki',
@@ -151,20 +150,19 @@ private function checkGlobalTableEntriesWithoutDatabase( array $wikiDatabases ):
 				'mw_permissions' => 'perm_dbname',
 				'mw_settings' => 's_dbname',
 			],
-			'EchoSharedTrackingDB' => [
+			$this->getConfig()->get( 'EchoSharedTrackingDB' ) => [
 				'echo_unread_wikis' => 'euw_wiki',
 			],
-			'GlobalUsageDatabase' => [
+			$this->getConfig()->get( 'GlobalUsageDatabase' ) => [
 				'globalimagelinks' => 'gil_wiki',
 			],
 		];
 
 		$missingInCluster = [];
 
-		foreach ( $tablesToCheck as $dbConfigKey => $tables ) {
-			$dbr = $this->getServiceContainer()->getConnectionProvider()->getReplicaDatabase(
-				$this->getConfig()->get( $dbConfigKey )
-			);
+		foreach ( $tablesToCheck as $database => $tables ) {
+			$dbr = $this->getServiceContainer()->getConnectionProvider()
+				->getReplicaDatabase( $database );
 
 			foreach ( $tables as $table => $field ) {
 				$this->output( "Checking table: $table, field: $field...\n" );
@@ -225,10 +223,9 @@ private function deleteEntries(
 	): void {
 		$suffix = $this->getConfig()->get( 'CreateWikiDatabaseSuffix' );
 
-		foreach ( $tablesToCheck as $dbConfigKey => $tables ) {
-			$dbw = $this->getServiceContainer()->getConnectionProvider()->getPrimaryDatabase(
-				$this->getConfig()->get( $dbConfigKey )
-			);
+		foreach ( $tablesToCheck as $database => $tables ) {
+			$dbw = $this->getServiceContainer()->getConnectionProvider()
+				->getPrimaryDatabase( $database );
 
 			foreach ( $tables as $table => $field ) {
 				$this->output( "Deleting missing entries from table: $table, field: $field...\n" );

diff --git a/maintenance/generateExtensionDatabaseList.php b/maintenance/generateExtensionDatabaseList.php
@@ -29,7 +29,8 @@ public function execute() {
 		$extArray = $this->getOption( 'extension' );
 		$directory = $this->getOption( 'directory' );
 
-		$dbr = $this->getDB( DB_REPLICA, [], $this->getConfig()->get( 'CreateWikiDatabase' ) );
+		$connectionProvider = $this->getServiceContainer()->getConnectionProvider();
+		$dbr = $connectionProvider->getReplicaDatabase( 'virtual-createwiki' );
 
 		foreach ( $extArray as $ext ) {
 			$list = [];

diff --git a/maintenance/generateManageWikiBackup.php b/maintenance/generateManageWikiBackup.php
@@ -44,23 +44,25 @@ public function __construct() {
 
 	public function execute() {
 		$dbname = $this->getConfig()->get( MainConfigNames::DBname );
-		$dbw = $this->getDB( DB_PRIMARY, [], $this->getConfig()->get( 'CreateWikiDatabase' ) );
+
+		$connectionProvider = $this->getServiceContainer()->getConnectionProvider();
+		$dbr = $connectionProvider->getReplicaDatabase( 'virtual-createwiki' );
 
 		$buildArray = [];
 
-		$nsObjects = $dbw->select(
+		$nsObjects = $dbr->select(
 			'mw_namespaces',
 			'*',
 			[ 'ns_dbname' => $dbname ]
 		);
 
-		$permObjects = $dbw->select(
+		$permObjects = $dbr->select(
 			'mw_permissions',
 			'*',
 			[ 'perm_dbname' => $dbname ]
 		);
 
-		$settingsObjects = $dbw->selectRow(
+		$settingsObjects = $dbr->selectRow(
 			'mw_settings',
 			'*',
 			[ 's_dbname' => $dbname ],

diff --git a/maintenance/renameDatabase.php b/maintenance/renameDatabase.php
@@ -66,7 +66,7 @@ public function execute(): void {
 		$this->output( "Renaming database: $oldDatabaseName to $newDatabaseName\n" );
 
 		$dbr = $this->getServiceContainer()->getConnectionProvider()
-			->getReplicaDatabase( $this->getConfig()->get( 'CreateWikiDatabase' ) );
+			->getReplicaDatabase( 'virtual-createwiki' );
 
 		// Fetch the specific cluster from cw_wikis based on the old database name
 		$cluster = $dbr->newSelectQueryBuilder()

diff --git a/maintenance/resetWiki.php b/maintenance/resetWiki.php
@@ -62,7 +62,7 @@ public function execute(): void {
 		$this->output( "Resetting database: $databaseName\n" );
 
 		$dbr = $this->getServiceContainer()->getConnectionProvider()
-			->getReplicaDatabase( $this->getConfig()->get( 'CreateWikiDatabase' ) );
+			->getReplicaDatabase( 'virtual-createwiki' );
 
 		// Fetch the original data
 		$row = $dbr->newSelectQueryBuilder()

diff --git a/maintenance/restoreManageWikiBackup.php b/maintenance/restoreManageWikiBackup.php
@@ -52,7 +52,8 @@ public function execute() {
 			$this->fatalError( 'Invalid wiki. You can not overwrite default.' );
 		}
 
-		$dbw = $this->getDB( DB_PRIMARY, [], $this->getConfig()->get( 'CreateWikiDatabase' ) );
+		$connectionProvider = $this->getServiceContainer()->getConnectionProvider();
+		$dbw = $connectionProvider->getPrimaryDatabase( 'virtual-createwiki' );
 
 		$backupFile = $this->getOption( 'filename' );
 		if ( !file_exists( $backupFile ) ) {