Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Start rename of DatabaseBase => Database"

Browse source
This commit is contained in:
jenkins-bot 2015-10-05 23:45:36 +00:00 committed by Gerrit Code Review
commit c5ac11e2eb
7 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autoload.php
View file

@ -290,6 +290,7 @@ $wgAutoloadLocalClasses = array(
'DBSiteStore' => __DIR__ . '/includes/site/DBSiteStore.php',
'DBUnexpectedError' => __DIR__ . '/includes/db/DatabaseError.php',
'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
'Database' => __DIR__ . '/includes/db/Database.php',
'DatabaseBase' => __DIR__ . '/includes/db/Database.php',
'DatabaseInstaller' => __DIR__ . '/includes/installer/DatabaseInstaller.php',
'DatabaseLag' => __DIR__ . '/maintenance/lag.php',

5
includes/db/Database.php
View file

@ -4218,3 +4218,8 @@ abstract class DatabaseBase implements IDatabase {
}
}
}
abstract class Database extends DatabaseBase {
// B/C until nothing type hints for DatabaseBase
// @TODO: finish renaming DatabaseBase => Database
}

2
includes/db/DatabaseMssql.php
View file

@ -28,7 +28,7 @@
/**
* @ingroup Database
*/
class DatabaseMssql extends DatabaseBase {
class DatabaseMssql extends Database {
protected $mInsertId = null;
protected $mLastResult = null;
protected $mAffectedRows = null;

2
includes/db/DatabaseMysqlBase.php
View file

@ -29,7 +29,7 @@
* @since 1.22
* @see Database
*/
abstract class DatabaseMysqlBase extends DatabaseBase {
abstract class DatabaseMysqlBase extends Database {
/** @var MysqlMasterPos */
protected $lastKnownSlavePos;
/** @var string Method to detect slave lag */

2
includes/db/DatabaseOracle.php
View file

@ -185,7 +185,7 @@ class ORAField implements Field {
/**
* @ingroup Database
*/
class DatabaseOracle extends DatabaseBase {
class DatabaseOracle extends Database {
/** @var resource */
protected $mLastResult = null;

2
includes/db/DatabasePostgres.php
View file

@ -204,7 +204,7 @@ class SavepointPostgres {
/**
* @ingroup Database
*/
class DatabasePostgres extends DatabaseBase {
class DatabasePostgres extends Database {
/** @var resource */
protected $mLastResult = null;

2
includes/db/DatabaseSqlite.php
View file

@ -25,7 +25,7 @@
/**
* @ingroup Database
*/
class DatabaseSqlite extends DatabaseBase {
class DatabaseSqlite extends Database {
/** @var bool Whether full text is enabled */
private static $fulltextEnabled = null;