rdbms: Remove IDatabase::fieldName() method

Deprecated and unused,
https://codesearch.wmcloud.org/search/?q=%5CbfieldName%5C(&i=fosho&files=%5C.php&excludeFiles=&repos=

Bug: T296960
Bug: T286694
Change-Id: I3c1a1a90a904c9ead03b7158a87f6c4ee005b987

6 files changed, 1 insertions, 25 deletions

diff --git a/RELEASE-NOTES-1.38 b/RELEASE-NOTES-1.38
index f8d71cc25e07..27a6fbe3cc25 100644
--- a/RELEASE-NOTES-1.38
+++ b/RELEASE-NOTES-1.38
@@ -275,6 +275,7 @@ because of Phabricator reports.
   - ::masterPosWait() since 1.37
   - ::dataSeek() soft-deprecated since 1.37
   - ::numFields() soft-deprecated since 1.37
+  - ::fieldName() soft-deprecated since 1.37
   - ::onTransactionIdle() soft-deprecated since 1.32
   - ::getMasterPos() since 1.37
 * …
diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php
index 105ed953b7a7..6a0bb0631d17 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -231,10 +231,6 @@ class DBConnRef implements IDatabase {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
-	public function fieldName( $res, $n ) {
-		return $this->__call( __FUNCTION__, func_get_args() );
-	}
-
 	public function insertId() {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 2e5a875fecff..4927519b085a 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -872,10 +872,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		}
 	}
 
-	public function fieldName( IResultWrapper $res, $n ) {
-		return $res->getFieldNames()[$n];
-	}
-
 	public function freeResult( IResultWrapper $res ) {
 		$res->free();
 	}
diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index 3ec43598064c..5fec4f25825b 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -426,18 +426,6 @@ interface IDatabase {
 	public function numRows( $res );
 
 	/**
-	 * Get a field name in a result object
-	 * @see https://www.php.net/mysql_field_name
-	 *
-	 * @deprecated since 1.37
-	 *
-	 * @param IResultWrapper $res A SQL result
-	 * @param int $n
-	 * @return string
-	 */
-	public function fieldName( IResultWrapper $res, $n );
-
-	/**
 	 * Free a result object returned by query() or select()
 	 *
 	 * It's usually not necessary to call this, just use unset() or let the variable
diff --git a/tests/phpunit/includes/db/DatabaseTestHelper.php b/tests/phpunit/includes/db/DatabaseTestHelper.php
index 010c58bfe1a2..2d883012c624 100644
--- a/tests/phpunit/includes/db/DatabaseTestHelper.php
+++ b/tests/phpunit/includes/db/DatabaseTestHelper.php
@@ -195,10 +195,6 @@ class DatabaseTestHelper extends Database {
 		return -1;
 	}
 
-	public function fieldName( $res, $n ) {
-		return 'test';
-	}
-
 	public function insertId() {
 		return -1;
 	}
diff --git a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php
index 1d47319c81d5..789932b2af6c 100644
--- a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php
+++ b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php
@@ -448,7 +448,6 @@ class DatabaseTest extends PHPUnit\Framework\TestCase {
 			'fetchObject',
 			'fetchRow',
 			'fieldInfo',
-			'fieldName',
 			'getSoftwareLink',
 			'getServerVersion',
 			'getType',