jenkins-bot has submitted this change and it was merged.
Change subject: Remove long-since unused cruft methods from DatabaseBase
......................................................................
Remove long-since unused cruft methods from DatabaseBase
Change-Id: I4b28c15a8589504bdbbe79ba0d3aed1e52dbe65b
---
M includes/db/DatabaseMssql.php
M includes/db/DatabaseOracle.php
M includes/db/DatabasePostgres.php
M includes/libs/rdbms/database/DatabaseBase.php
M tests/phpunit/includes/db/DatabaseTest.php
5 files changed, 0 insertions(+), 208 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 1c58a9a..339174e 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -54,20 +54,12 @@
return false;
}
- public function realTimestamps() {
- return false;
- }
-
public function implicitGroupby() {
return false;
}
public function implicitOrderby() {
return false;
- }
-
- public function functionalIndexes() {
- return true;
}
public function unionSupportsOrderAndLimit() {
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index ec3336a..9e821a1 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -188,20 +188,12 @@
return true;
}
- function realTimestamps() {
- return true;
- }
-
function implicitGroupby() {
return false;
}
function implicitOrderby() {
return false;
- }
-
- function searchableIPs() {
- return true;
}
/**
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index cb95304..2773067 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -239,24 +239,12 @@
return true;
}
- function realTimestamps() {
- return true;
- }
-
function implicitGroupby() {
return false;
}
function implicitOrderby() {
return false;
- }
-
- function searchableIPs() {
- return true;
- }
-
- function functionalIndexes() {
- return true;
}
function hasConstraint( $name ) {
diff --git a/includes/libs/rdbms/database/DatabaseBase.php
b/includes/libs/rdbms/database/DatabaseBase.php
index 4f823b5..2c8e67cd 100644
--- a/includes/libs/rdbms/database/DatabaseBase.php
+++ b/includes/libs/rdbms/database/DatabaseBase.php
@@ -49,13 +49,6 @@
}
/**
- * @return string Command delimiter used by this database engine
- */
- public function getDelimiter() {
- return $this->delimiter;
- }
-
- /**
* Returns true if this database supports (and uses) cascading deletes
*
* @return bool
@@ -79,138 +72,6 @@
*/
public function strictIPs() {
return false;
- }
-
- /**
- * Returns true if this database can do a native search on IP columns
- * e.g. this works as expected: .. WHERE rc_ip = '127.42.12.102/32';
- *
- * @return bool
- */
- public function searchableIPs() {
- return false;
- }
-
- /**
- * Returns true if this database uses timestamps rather than integers
- *
- * @return bool
- */
- public function realTimestamps() {
- return false;
- }
-
- /**
- * Returns true if this database can use functional indexes
- *
- * @return bool
- */
- public function functionalIndexes() {
- return false;
- }
-
- /**
- * Intended to be compatible with the PEAR::DB wrapper functions.
- * http://pear.php.net/manual/en/package.database.db.intro-execute.php
- *
- * ? = scalar value, quoted as necessary
- * ! = raw SQL bit (a function for instance)
- * & = filename; reads the file and inserts as a blob
- * (we don't use this though...)
- *
- * @param string $sql
- * @param string $func
- *
- * @return array
- */
- protected function prepare( $sql, $func = __METHOD__ ) {
- /* MySQL doesn't support prepared statements (yet), so just
- * pack up the query for reference. We'll manually replace
- * the bits later.
- */
- return [ 'query' => $sql, 'func' => $func ];
- }
-
- /**
- * Free a prepared query, generated by prepare().
- * @param string $prepared
- */
- protected function freePrepared( $prepared ) {
- /* No-op by default */
- }
-
- /**
- * Execute a prepared query with the various arguments
- * @param string $prepared The prepared sql
- * @param mixed $args Either an array here, or put scalars as varargs
- *
- * @return ResultWrapper
- */
- public function execute( $prepared, $args = null ) {
- if ( !is_array( $args ) ) {
- # Pull the var args
- $args = func_get_args();
- array_shift( $args );
- }
-
- $sql = $this->fillPrepared( $prepared['query'], $args );
-
- return $this->query( $sql, $prepared['func'] );
- }
-
- /**
- * For faking prepared SQL statements on DBs that don't support it
directly.
- *
- * @param string $preparedQuery A 'preparable' SQL statement
- * @param array $args Array of Arguments to fill it with
- * @return string Executable SQL
- */
- public function fillPrepared( $preparedQuery, $args ) {
- reset( $args );
- $this->preparedArgs =& $args;
-
- return preg_replace_callback( '/(\\\\[?!&]|[?!&])/',
- [ &$this, 'fillPreparedArg' ], $preparedQuery );
- }
-
- /**
- * preg_callback func for fillPrepared()
- * The arguments should be in $this->preparedArgs and must not be
touched
- * while we're doing this.
- *
- * @param array $matches
- * @throws DBUnexpectedError
- * @return string
- */
- protected function fillPreparedArg( $matches ) {
- switch ( $matches[1] ) {
- case '\\?':
- return '?';
- case '\\!':
- return '!';
- case '\\&':
- return '&';
- }
-
- list( /* $n */, $arg ) = each( $this->preparedArgs );
-
- switch ( $matches[1] ) {
- case '?':
- return $this->addQuotes( $arg );
- case '!':
- return $arg;
- case '&':
- # return $this->addQuotes( file_get_contents(
$arg ) );
- throw new DBUnexpectedError(
- $this,
- '& mode is not implemented. If it\'s
really needed, uncomment the line above.'
- );
- default:
- throw new DBUnexpectedError(
- $this,
- 'Received invalid match. This should
never happen!'
- );
- }
}
/**
diff --git a/tests/phpunit/includes/db/DatabaseTest.php
b/tests/phpunit/includes/db/DatabaseTest.php
index 134caf4..846509c 100644
--- a/tests/phpunit/includes/db/DatabaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseTest.php
@@ -175,47 +175,6 @@
);
}
- public function testFillPreparedEmpty() {
- $sql = $this->db->fillPrepared(
- 'SELECT * FROM interwiki', [] );
- $this->assertEquals(
- "SELECT * FROM interwiki",
- $sql );
- }
-
- public function testFillPreparedQuestion() {
- $sql = $this->db->fillPrepared(
- 'SELECT * FROM cur WHERE cur_namespace=? AND
cur_title=?',
- [ 4, "Snicker's_paradox" ] );
-
- $check = "SELECT * FROM cur WHERE cur_namespace='4' AND
cur_title='Snicker''s_paradox'";
- if ( $this->db->getType() === 'mysql' ) {
- $check = "SELECT * FROM cur WHERE cur_namespace='4' AND
cur_title='Snicker\'s_paradox'";
- }
- $this->assertEquals( $check, $sql );
- }
-
- public function testFillPreparedBang() {
- $sql = $this->db->fillPrepared(
- 'SELECT user_id FROM ! WHERE user_name=?',
- [ '"user"', "Slash's Dot" ] );
-
- $check = "SELECT user_id FROM \"user\" WHERE
user_name='Slash''s Dot'";
- if ( $this->db->getType() === 'mysql' ) {
- $check = "SELECT user_id FROM \"user\" WHERE
user_name='Slash\'s Dot'";
- }
- $this->assertEquals( $check, $sql );
- }
-
- public function testFillPreparedRaw() {
- $sql = $this->db->fillPrepared(
- "SELECT * FROM cur WHERE
cur_title='This_\\&_that,_WTF\\?\\!'",
- [ '"user"', "Slash's Dot" ] );
- $this->assertEquals(
- "SELECT * FROM cur WHERE
cur_title='This_&_that,_WTF?!'",
- $sql );
- }
-
public function testStoredFunctions() {
if ( !in_array( wfGetDB( DB_MASTER )->getType(), [ 'mysql',
'postgres' ] ) ) {
$this->markTestSkipped( 'MySQL or Postgres required' );
--
To view, visit https://gerrit.wikimedia.org/r/311089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b28c15a8589504bdbbe79ba0d3aed1e52dbe65b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: Skizzerz <skizz...@skizzerz.net>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
