Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/243528
Change subject: Start rename of DatabaseBase => Database ...................................................................... Start rename of DatabaseBase => Database This gives static method callers the option to use methods like Database::factory() instead of having to use the uglier DatabaseBase::factory(). Change-Id: I61800626b71ad2803a897df060059dbaf8778679 --- M includes/db/Database.php M includes/db/DatabaseMssql.php M includes/db/DatabaseMysqlBase.php M includes/db/DatabaseOracle.php M includes/db/DatabasePostgres.php M includes/db/DatabaseSqlite.php 6 files changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/28/243528/1 diff --git a/includes/db/Database.php b/includes/db/Database.php index 05d1934..c1ca59c 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -4246,3 +4246,8 @@ } } } + +abstract class Database extends DatabaseBase { + // B/C until nothing type hints for DatabaseBase + // @TODO: finish renaming DatabaseBase => Database +} \ No newline at end of file diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php index 354afc5..5acbc6c 100644 --- a/includes/db/DatabaseMssql.php +++ b/includes/db/DatabaseMssql.php @@ -28,7 +28,7 @@ /** * @ingroup Database */ -class DatabaseMssql extends DatabaseBase { +class DatabaseMssql extends Database { protected $mInsertId = null; protected $mLastResult = null; protected $mAffectedRows = null; diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php index ac7ce10..988b5e4 100644 --- a/includes/db/DatabaseMysqlBase.php +++ b/includes/db/DatabaseMysqlBase.php @@ -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 */ diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index ad38c1d..66004ec 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -185,7 +185,7 @@ /** * @ingroup Database */ -class DatabaseOracle extends DatabaseBase { +class DatabaseOracle extends Database { /** @var resource */ protected $mLastResult = null; diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index aaa1c6e..f2d1e9f 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -291,7 +291,7 @@ /** * @ingroup Database */ -class DatabasePostgres extends DatabaseBase { +class DatabasePostgres extends Database { /** @var resource */ protected $mLastResult = null; diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php index e909597..77de972 100644 --- a/includes/db/DatabaseSqlite.php +++ b/includes/db/DatabaseSqlite.php @@ -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; -- To view, visit https://gerrit.wikimedia.org/r/243528 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61800626b71ad2803a897df060059dbaf8778679 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits