Merge "EntitySourceDefinitions: use false as DB name if pointing to current wiki"

Author: jenkins-bot

client/WikibaseClient.ServiceWiring.php

@@ -13,6 +13,7 @@
 use MediaWiki\Site\Site;
 use MediaWiki\StubObject\StubObject;
 use MediaWiki\User\ExternalUserNames;
+use MediaWiki\WikiMap\WikiMap;
 use Psr\Log\LoggerInterface;
 use Serializers\DispatchingSerializer;
 use Serializers\Serializer;
@@ -446,7 +447,7 @@ function ( EntityNamespaceLookup $nsLookup, DatabaseEntitySource $source ): Enti
 		$subEntityTypesMapper = new SubEntityTypesMapper( WikibaseClient::getEntityTypeDefinitions( $services )
 			->get( EntityTypeDefinitions::SUB_ENTITY_TYPES ) );
 
-		$configParser = new EntitySourceDefinitionsConfigParser();
+		$configParser = new EntitySourceDefinitionsConfigParser( WikiMap::getCurrentWikiId() );
 
 		return $configParser->newDefinitionsFromConfigArray( $settings->getSetting( 'entitySources' ), $subEntityTypesMapper );
 	},

data-access/src/EntitySourceDefinitionsConfigParser.php

@@ -15,6 +15,9 @@
  */
 class EntitySourceDefinitionsConfigParser {
 
+	public function __construct( private string $mediawikiCurrentWikiId ) {
+	}
+
 	/**
 	 * @param array[] $sourceConfig
 	 * @param SubEntityTypesMapper $subEntityTypesMapper
@@ -37,9 +40,14 @@ public function newDefinitionsFromConfigArray( array $sourceConfig, SubEntityTyp
 					];
 
 				}
+				$repoDatabase = $sourceData['repoDatabase'];
+				if ( $repoDatabase === $this->mediawikiCurrentWikiId ) {
+					$repoDatabase = false;
+				}
+
 				$sources[] = new DatabaseEntitySource(
 					$sourceName,
-					$sourceData['repoDatabase'],
+					$repoDatabase,
 					$namespaceSlotData,
 					$sourceData['baseUri'],
 					$sourceData['rdfNodeNamespacePrefix'],

data-access/tests/phpunit/EntitySourceDefinitionsConfigParserTest.php

@@ -30,7 +30,7 @@ public function testGivenSingleSourceConfig_newDefinitionsFromConfigArrayParsesS
 			],
 		];
 
-		$parser = new EntitySourceDefinitionsConfigParser();
+		$parser = new EntitySourceDefinitionsConfigParser( $paramIrrelevantForTest = 'mywikidb' );
 
 		$sourceDefinitions = $parser->newDefinitionsFromConfigArray( $config, new SubEntityTypesMapper( [] ) );
 
@@ -74,7 +74,7 @@ public function testGivenMultipleSourceConfig_newDefinitionsFromConfigArrayParse
 			],
 		];
 
-		$parser = new EntitySourceDefinitionsConfigParser();
+		$parser = new EntitySourceDefinitionsConfigParser( $paramIrrelevantForTest = 'mywikidb' );
 
 		$sourceDefinitions = $parser->newDefinitionsFromConfigArray( $config, new SubEntityTypesMapper( [] ) );
 
@@ -103,11 +103,34 @@ public function testGivenMultipleSourceConfig_newDefinitionsFromConfigArrayParse
 		$this->assertInstanceOf( ApiEntitySource::class, $sources[2] );
 	}
 
+	public function testGivenLocalDatabaseName_getDatabaseNameOfSourceReturnsFalse() {
+		$localDatabaseName = 'local';
+
+		$config = [
+			'local' => [
+				'entityNamespaces' => [ 'item' => 100, 'property' => 200 ],
+				'repoDatabase' => $localDatabaseName,
+				'baseUri' => 'http://example.com/entity/',
+				'rdfNodeNamespacePrefix' => 'wd',
+				'rdfPredicateNamespacePrefix' => '',
+				'interwikiPrefix' => 'localwiki',
+			],
+		];
+
+		$parser = new EntitySourceDefinitionsConfigParser( $localDatabaseName );
+
+		$sourceDefinitions = $parser->newDefinitionsFromConfigArray( $config, new SubEntityTypesMapper( [] ) );
+
+		$sources = $sourceDefinitions->getSources();
+
+		$this->assertFalse( $sources[0]->getDatabaseName() );
+	}
+
 	/**
 	 * @dataProvider provideInvalidConfig
 	 */
 	public function testGivenInvalidConfig_throwsException( $config ) {
-		$parser = new EntitySourceDefinitionsConfigParser();
+		$parser = new EntitySourceDefinitionsConfigParser( $paramIrrelevantForTest = 'mywikidb' );
 
 		$this->expectException( \InvalidArgumentException::class );
 

repo/WikibaseRepo.ServiceWiring.php

@@ -17,6 +17,7 @@
 use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Site\MediaWikiPageNameNormalizer;
 use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\WikiMap\WikiMap;
 use Psr\Log\LoggerInterface;
 use Serializers\DispatchingSerializer;
 use Serializers\Serializer;
@@ -1031,7 +1032,7 @@ function ( EntityNamespaceLookup $nsLookup, DatabaseEntitySource $source ): Enti
 		$settings = WikibaseRepo::getSettings( $services );
 		$subEntityTypesMapper = WikibaseRepo::getSubEntityTypesMapper( $services );
 
-		$configParser = new EntitySourceDefinitionsConfigParser();
+		$configParser = new EntitySourceDefinitionsConfigParser( WikiMap::getCurrentWikiId() );
 
 		$entitySourceDefinitions = $configParser->newDefinitionsFromConfigArray(
 			$settings->getSetting( 'entitySources' ),