From 1b67a929ab74b87de186a58bd5c6c62f2f6604e2 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 4 Oct 2015 12:17:57 -0700
Subject: [PATCH] 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
---
 autoload.php                      | 1 +
 includes/db/Database.php          | 5 +++++
 includes/db/DatabaseMssql.php     | 2 +-
 includes/db/DatabaseMysqlBase.php | 2 +-
 includes/db/DatabaseOracle.php    | 2 +-
 includes/db/DatabasePostgres.php  | 2 +-
 includes/db/DatabaseSqlite.php    | 2 +-
 7 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/autoload.php b/autoload.php
index 9c859b7d18..9a34b035f1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -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',
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 05d1934797..a87c763a8e 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -4246,3 +4246,8 @@ abstract class DatabaseBase implements IDatabase {
 		}
 	}
 }
+
+abstract class Database extends DatabaseBase {
+	// B/C until nothing type hints for DatabaseBase
+	// @TODO: finish renaming DatabaseBase => Database
+}
diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 354afc5ae8..5acbc6ca7f 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 ac7ce1086b..988b5e496c 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 ad38c1dcf6..66004ec578 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -185,7 +185,7 @@ class ORAField implements Field {
 /**
  * @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 aaa1c6ec74..f2d1e9f65a 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -291,7 +291,7 @@ class SavepointPostgres {
 /**
  * @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 e9095970a7..77de972dcb 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;
 
-- 
2.20.1