From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 10 Apr 2019 01:46:47 +0000 (-0700)
Subject: rdbms: drop inappropriate and poorly documented "DatabaseOraclePostInit" hook
X-Git-Tag: 1.34.0-rc.0~2035
X-Git-Url: https://git.cyclocoop.org//%22%7B%7Blocalurle:Project:Pol%C3%ADtica_de_imagens%7D%7D/%22?a=commitdiff_plain;h=2775ad190c5841d69d7b868f77e47f68a9f53de5;p=lhc%2Fweb%2Fwiklou.git

rdbms: drop inappropriate and poorly documented "DatabaseOraclePostInit" hook

Change-Id: I3152e80d99b040b7918927e6c2a215cab59a9b10
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 161713bac9..ba4ac51a0a 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -83,7 +83,7 @@ because of Phabricator reports.
   configuration changes from after they were created, so you must reset
   services after any configuration change. Even if your code works now, it is
   likely to break in future versions as more code is moved to services.
-* …
+* The ill-defined "DatabaseOraclePostInit" hook has been removed.
 
 === Deprecations in 1.34 ===
 * The MWNamespace class is deprecated. Use MediaWikiServices::getNamespaceInfo.
diff --git a/docs/hooks.txt b/docs/hooks.txt
index d3d04ba78c..b2f1e816b5 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1193,9 +1193,6 @@ a custom editor, e.g. for a special namespace, etc.
 $article: Article being edited
 $user: User performing the edit
 
-'DatabaseOraclePostInit': Called after initialising an Oracle database
-$db: the DatabaseOracle object
-
 'DeletedContribsPager::reallyDoQuery': Called before really executing the query
 for Special:DeletedContributions
 Similar to ContribsPager::reallyDoQuery
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index d6e1df492f..dedaf2190e 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -64,7 +64,6 @@ class DatabaseOracle extends Database {
 		$this->keywordTableMap = $params['keywordTableMap'] ?? [];
 		$params['tablePrefix'] = strtoupper( $params['tablePrefix'] );
 		parent::__construct( $params );
-		Hooks::run( 'DatabaseOraclePostInit', [ $this ] );
 	}
 
 	function __destruct() {
@@ -650,7 +649,7 @@ class DatabaseOracle extends Database {
 	 * Return sequence_name if table has a sequence
 	 *
 	 * @param string $table
-	 * @return bool
+	 * @return string[]|bool
 	 */
 	private function getSequenceData( $table ) {
 		if ( $this->sequenceData == null ) {