Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352115 )
Change subject: Rename "hasFullEntityIdColumn" to "writeFullEntityIdColumn"
......................................................................
Rename "hasFullEntityIdColumn" to "writeFullEntityIdColumn"
Bug: T162673
Change-Id: I2b8050a60bcd98bcaae0befaf3f6c16c0216e579
---
M client/config/WikibaseClient.default.php
M client/includes/Store/Sql/DirectSqlStore.php
M lib/includes/Store/Sql/TermSqlIndex.php
M repo/config/Wikibase.default.php
M repo/includes/Store/Sql/SqlStore.php
5 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/15/352115/1
diff --git a/client/config/WikibaseClient.default.php
b/client/config/WikibaseClient.default.php
index 25eb5e1..711c595 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -91,7 +91,7 @@
'foreignRepositories' => [],
// Enable use of term_full_entity_id column in wb_terms table.
- 'hasFullEntityIdColumn' => true,
+ 'writeFullEntityIdColumn' => true,
];
// Some defaults depend on information not available at this time.
diff --git a/client/includes/Store/Sql/DirectSqlStore.php
b/client/includes/Store/Sql/DirectSqlStore.php
index 44830ca..b87a048 100644
--- a/client/includes/Store/Sql/DirectSqlStore.php
+++ b/client/includes/Store/Sql/DirectSqlStore.php
@@ -163,7 +163,7 @@
/**
* @var bool
*/
- private $hasFullEntityIdColumn;
+ private $writeFullEntityIdColumn;
/**
* @param EntityChangeFactory $entityChangeFactory
@@ -201,7 +201,7 @@
$this->cacheType = $settings->getSetting( 'sharedCacheType' );
$this->cacheDuration = $settings->getSetting(
'sharedCacheDuration' );
$this->siteId = $settings->getSetting( 'siteGlobalID' );
- $this->hasFullEntityIdColumn = $settings->getSetting(
'hasFullEntityIdColumn' );
+ $this->writeFullEntityIdColumn = $settings->getSetting(
'writeFullEntityIdColumn' );
}
/**
@@ -372,7 +372,7 @@
$this->entityIdComposer,
$this->repoWiki,
'',
- $this->hasFullEntityIdColumn
+ $this->writeFullEntityIdColumn
);
}
diff --git a/lib/includes/Store/Sql/TermSqlIndex.php
b/lib/includes/Store/Sql/TermSqlIndex.php
index 10ac82e..f1e523f 100644
--- a/lib/includes/Store/Sql/TermSqlIndex.php
+++ b/lib/includes/Store/Sql/TermSqlIndex.php
@@ -51,7 +51,7 @@
/**
* @var bool
*/
- private $hasFullEntityIdColumn;
+ private $writeFullEntityIdColumn;
/**
* @var int
@@ -63,21 +63,21 @@
* @param EntityIdComposer $entityIdComposer
* @param string|bool $wikiDb
* @param string $repositoryName
- * @param bool $hasFullEntityIdColumn Allow use (e.g. writing) of
column.
+ * @param bool $writeFullEntityIdColumn Allow writing of the column.
*/
public function __construct(
StringNormalizer $stringNormalizer,
EntityIdComposer $entityIdComposer,
$wikiDb = false,
$repositoryName = '',
- $hasFullEntityIdColumn = true
+ $writeFullEntityIdColumn = true
) {
RepositoryNameAssert::assertParameterIsValidRepositoryName(
$repositoryName, '$repositoryName' );
parent::__construct( $wikiDb );
$this->repositoryName = $repositoryName;
$this->stringNormalizer = $stringNormalizer;
$this->entityIdComposer = $entityIdComposer;
- $this->hasFullEntityIdColumn = $hasFullEntityIdColumn;
+ $this->writeFullEntityIdColumn = $writeFullEntityIdColumn;
$this->tableName = 'wb_terms';
}
@@ -185,7 +185,7 @@
'term_weight' => $this->getWeight( $entity ),
);
- if ( $this->hasFullEntityIdColumn === true ) {
+ if ( $this->writeFullEntityIdColumn === true ) {
$entityIdentifiers['term_full_entity_id'] =
$entityId->getSerialization();
}
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 6050679..cf6c235 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -220,5 +220,5 @@
'dispatchingLockManager' => null,
// Enable use (e.g. writing) of term_full_entity_id column in wb_terms
table.
- 'hasFullEntityIdColumn' => true,
+ 'writeFullEntityIdColumn' => true,
];
diff --git a/repo/includes/Store/Sql/SqlStore.php
b/repo/includes/Store/Sql/SqlStore.php
index f6b021b..73354b5 100644
--- a/repo/includes/Store/Sql/SqlStore.php
+++ b/repo/includes/Store/Sql/SqlStore.php
@@ -182,7 +182,7 @@
/**
* @var bool
*/
- private $hasFullEntityIdColumn;
+ private $writeFullEntityIdColumn;
/**
* @param EntityChangeFactory $entityChangeFactory
@@ -221,7 +221,7 @@
$this->cacheType = $settings->getSetting( 'sharedCacheType' );
$this->cacheDuration = $settings->getSetting(
'sharedCacheDuration' );
$this->idBlacklist = $settings->getSetting( 'idBlacklist' );
- $this->hasFullEntityIdColumn = $settings->getSetting(
'hasFullEntityIdColumn' );
+ $this->writeFullEntityIdColumn = $settings->getSetting(
'writeFullEntityIdColumn' );
}
/**
@@ -258,7 +258,7 @@
$this->entityIdComposer,
false,
'',
- $this->hasFullEntityIdColumn
+ $this->writeFullEntityIdColumn
);
}
--
To view, visit https://gerrit.wikimedia.org/r/352115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b8050a60bcd98bcaae0befaf3f6c16c0216e579
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
