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

Move Field classes to Rdbms namespace

Browse source 
Update core callers and leave a class alias to \Field.

Change-Id: I4908282301d5de2a20baafe510557bd2c3867de5
This commit is contained in:
Aaron Schulz 2017-02-07 23:10:16 -08:00
parent 43a7b72ae0
commit 8a5d8c0c71
14 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
autoload.php
View file

@ -969,7 +969,6 @@ $wgAutoloadLocalClasses = [
'MoveLogFormatter' => __DIR__ . '/includes/logging/MoveLogFormatter.php',
'MovePage' => __DIR__ . '/includes/MovePage.php',
'MovePageForm' => __DIR__ . '/includes/specials/SpecialMovepage.php',
'MssqlField' => __DIR__ . '/includes/libs/rdbms/field/MssqlField.php',
'MssqlInstaller' => __DIR__ . '/includes/installer/MssqlInstaller.php',
'MssqlResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php',
'MssqlUpdater' => __DIR__ . '/includes/installer/MssqlUpdater.php',
@ -979,7 +978,6 @@ $wgAutoloadLocalClasses = [
'MutableConfig' => __DIR__ . '/includes/config/MutableConfig.php',
'MutableContext' => __DIR__ . '/includes/context/MutableContext.php',
'MwSql' => __DIR__ . '/maintenance/sql.php',
'MySQLField' => __DIR__ . '/includes/libs/rdbms/field/MySQLField.php',
'MySqlLockManager' => __DIR__ . '/includes/filebackend/lockmanager/MySqlLockManager.php',
'MysqlInstaller' => __DIR__ . '/includes/installer/MysqlInstaller.php',
'MysqlUpdater' => __DIR__ . '/includes/installer/MysqlUpdater.php',
@ -1004,7 +1002,7 @@ $wgAutoloadLocalClasses = [
'NullStatsdDataFactory' => __DIR__ . '/includes/libs/stats/NullStatsdDataFactory.php',
'NumericUppercaseCollation' => __DIR__ . '/includes/collation/NumericUppercaseCollation.php',
'OOUIHTMLForm' => __DIR__ . '/includes/htmlform/OOUIHTMLForm.php',
'ORAField' => __DIR__ . '/includes/libs/rdbms/field/ORAField.php',
'ORAField' => __DIR__ . '/includes/db/ORAField.php',
'ORAResult' => __DIR__ . '/includes/db/DatabaseOracle.php',
'ObjectCache' => __DIR__ . '/includes/objectcache/ObjectCache.php',
'ObjectFactory' => __DIR__ . '/includes/libs/ObjectFactory.php',
@ -1092,7 +1090,6 @@ $wgAutoloadLocalClasses = [
'PopulateRevisionLength' => __DIR__ . '/maintenance/populateRevisionLength.php',
'PopulateRevisionSha1' => __DIR__ . '/maintenance/populateRevisionSha1.php',
'PostgreSqlLockManager' => __DIR__ . '/includes/libs/lockmanager/PostgreSqlLockManager.php',
'PostgresField' => __DIR__ . '/includes/libs/rdbms/field/PostgresField.php',
'PostgresInstaller' => __DIR__ . '/includes/installer/PostgresInstaller.php',
'PostgresUpdater' => __DIR__ . '/includes/installer/PostgresUpdater.php',
'Preferences' => __DIR__ . '/includes/Preferences.php',
@ -1242,7 +1239,6 @@ $wgAutoloadLocalClasses = [
'RowUpdateGenerator' => __DIR__ . '/includes/utils/RowUpdateGenerator.php',
'RunJobs' => __DIR__ . '/maintenance/runJobs.php',
'RunningStat' => __DIR__ . '/includes/compat/RunningStatCompat.php',
'SQLiteField' => __DIR__ . '/includes/libs/rdbms/field/SQLiteField.php',
'SVGMetadataExtractor' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
'SVGReader' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
'SamplingStatsdClient' => __DIR__ . '/includes/libs/stats/SamplingStatsdClient.php',
@ -1583,6 +1579,7 @@ $wgAutoloadLocalClasses = [
'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
'Wikimedia\\Rdbms\\DBMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/DBMasterPos.php',
'Wikimedia\\Rdbms\\DatabaseDomain' => __DIR__ . '/includes/libs/rdbms/database/DatabaseDomain.php',
'Wikimedia\\Rdbms\\Field' => __DIR__ . '/includes/libs/rdbms/field/Field.php',
'Wikimedia\\Rdbms\\IBlob' => __DIR__ . '/includes/libs/rdbms/encasing/IBlob.php',
'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/ILBFactory.php',
'Wikimedia\\Rdbms\\ILoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/ILoadBalancer.php',
@ -1597,8 +1594,12 @@ $wgAutoloadLocalClasses = [
'Wikimedia\\Rdbms\\LoadMonitorMySQL' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php',
'Wikimedia\\Rdbms\\LoadMonitorNull' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php',
'Wikimedia\\Rdbms\\MssqlBlob' => __DIR__ . '/includes/libs/rdbms/encasing/MssqlBlob.php',
'Wikimedia\\Rdbms\\MssqlField' => __DIR__ . '/includes/libs/rdbms/field/MssqlField.php',
'Wikimedia\\Rdbms\\MySQLField' => __DIR__ . '/includes/libs/rdbms/field/MySQLField.php',
'Wikimedia\\Rdbms\\MySQLMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/MySQLMasterPos.php',
'Wikimedia\\Rdbms\\PostgresBlob' => __DIR__ . '/includes/libs/rdbms/encasing/PostgresBlob.php',
'Wikimedia\\Rdbms\\PostgresField' => __DIR__ . '/includes/libs/rdbms/field/PostgresField.php',
'Wikimedia\\Rdbms\\SQLiteField' => __DIR__ . '/includes/libs/rdbms/field/SQLiteField.php',
'Wikimedia\\Rdbms\\SessionConsistentConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php',
'Wikimedia\\Rdbms\\TransactionProfiler' => __DIR__ . '/includes/libs/rdbms/TransactionProfiler.php',
'WikitextContent' => __DIR__ . '/includes/content/WikitextContent.php',

3
includes/libs/rdbms/field/ORAField.php → includes/db/ORAField.php
View file

@ -1,4 +1,7 @@
<?php
use Wikimedia\Rdbms\Field;
class ORAField implements Field {
private $name, $tablename, $default, $max_length, $nullable,
$is_pk, $is_unique, $is_multiple, $is_key, $type;

2
includes/installer/MysqlUpdater.php
View file

@ -20,6 +20,8 @@
* @file
* @ingroup Deployment
*/
use Wikimedia\Rdbms\Field;
use Wikimedia\Rdbms\MySQLField;
use MediaWiki\MediaWikiServices;
/**

1
includes/libs/rdbms/database/DatabaseMssql.php
View file

@ -26,6 +26,7 @@
*/
use Wikimedia\Rdbms\Blob;
use Wikimedia\Rdbms\MssqlBlob;
use Wikimedia\Rdbms\MssqlField;
/**
* @ingroup Database

1
includes/libs/rdbms/database/DatabaseMysqlBase.php
View file

@ -22,6 +22,7 @@
*/
use Wikimedia\Rdbms\DBMasterPos;
use Wikimedia\Rdbms\MySQLMasterPos;
use Wikimedia\Rdbms\MySQLField;
/**
* Database abstraction object for MySQL.

1
includes/libs/rdbms/database/DatabasePostgres.php
View file

@ -23,6 +23,7 @@
use Wikimedia\WaitConditionLoop;
use Wikimedia\Rdbms\Blob;
use Wikimedia\Rdbms\PostgresBlob;
use Wikimedia\Rdbms\PostgresField;
/**
* @ingroup Database

1
includes/libs/rdbms/database/DatabaseSqlite.php
View file

@ -22,6 +22,7 @@
* @ingroup Database
*/
use Wikimedia\Rdbms\Blob;
use Wikimedia\Rdbms\SQLiteField;
/**
* @ingroup Database

1
includes/libs/rdbms/database/IDatabase.php
View file

@ -27,6 +27,7 @@ use Wikimedia\ScopedCallback;
use Wikimedia\Rdbms\Blob;
use Wikimedia\Rdbms\LikeMatch;
use Wikimedia\Rdbms\DBMasterPos;
use Wikimedia\Rdbms\Field;
/**
* Basic database interface for live and lazy-loaded relation database handles

5
includes/libs/rdbms/field/Field.php
View file

@ -1,4 +1,7 @@
<?php
namespace Wikimedia\Rdbms;
/**
* Base for all database-specific classes representing information about database fields
* @ingroup Database
@ -28,3 +31,5 @@ interface Field {
*/
function isNullable();
}
class_alias( 'Wikimedia\Rdbms\Field', 'Field' );

3
includes/libs/rdbms/field/MssqlField.php
View file

@ -1,4 +1,7 @@
<?php
namespace Wikimedia\Rdbms;
class MssqlField implements Field {
private $name, $tableName, $default, $max_length, $nullable, $type;

3
includes/libs/rdbms/field/MySQLField.php
View file

@ -1,4 +1,7 @@
<?php
namespace Wikimedia\Rdbms;
class MySQLField implements Field {
private $name, $tablename, $default, $max_length, $nullable,
$is_pk, $is_unique, $is_multiple, $is_key, $type, $binary,

5
includes/libs/rdbms/field/PostgresField.php
View file

@ -1,4 +1,9 @@
<?php
namespace Wikimedia\Rdbms;
use DatabasePostgres;
class PostgresField implements Field {
private $name, $tablename, $type, $nullable, $max_length, $deferred, $deferrable, $conname,
$has_default, $default;

3
includes/libs/rdbms/field/SQLiteField.php
View file

@ -1,4 +1,7 @@
<?php
namespace Wikimedia\Rdbms;
class SQLiteField implements Field {
private $info, $tableName;

2
includes/utils/AutoloadGenerator.php
View file

@ -298,6 +298,8 @@ EOD;
// Legacy aliases (1.29)
$this->forceClassPath( 'Blob',
$this->basepath . '/includes/libs/rdbms/encasing/Blob.php' );
$this->forceClassPath( 'Field',
$this->basepath . '/includes/libs/rdbms/field/Field.php' );
}
}