jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/336579 )
Change subject: Move Field classes to Rdbms namespace
......................................................................
Move Field classes to Rdbms namespace
Update core callers and leave a class alias to \Field.
Change-Id: I4908282301d5de2a20baafe510557bd2c3867de5
---
M autoload.php
R includes/db/ORAField.php
M includes/installer/MysqlUpdater.php
M includes/libs/rdbms/database/DatabaseMssql.php
M includes/libs/rdbms/database/DatabaseMysqlBase.php
M includes/libs/rdbms/database/DatabasePostgres.php
M includes/libs/rdbms/database/DatabaseSqlite.php
M includes/libs/rdbms/database/IDatabase.php
M includes/libs/rdbms/field/Field.php
M includes/libs/rdbms/field/MssqlField.php
M includes/libs/rdbms/field/MySQLField.php
M includes/libs/rdbms/field/PostgresField.php
M includes/libs/rdbms/field/SQLiteField.php
M includes/utils/AutoloadGenerator.php
14 files changed, 37 insertions(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index 0e719ae..35ccf8e 100644
--- a/autoload.php
+++ b/autoload.php
@@ -969,7 +969,6 @@
'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 @@
'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 @@
'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 @@
'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 @@
'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 @@
'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 @@
'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',
diff --git a/includes/libs/rdbms/field/ORAField.php b/includes/db/ORAField.php
similarity index 97%
rename from includes/libs/rdbms/field/ORAField.php
rename to includes/db/ORAField.php
index e48310d..df31000 100644
--- a/includes/libs/rdbms/field/ORAField.php
+++ b/includes/db/ORAField.php
@@ -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;
diff --git a/includes/installer/MysqlUpdater.php
b/includes/installer/MysqlUpdater.php
index 7fa5a3d..49bfac1 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -20,6 +20,8 @@
* @file
* @ingroup Deployment
*/
+use Wikimedia\Rdbms\Field;
+use Wikimedia\Rdbms\MySQLField;
use MediaWiki\MediaWikiServices;
/**
diff --git a/includes/libs/rdbms/database/DatabaseMssql.php
b/includes/libs/rdbms/database/DatabaseMssql.php
index c1dfdb4..7c82479 100644
--- a/includes/libs/rdbms/database/DatabaseMssql.php
+++ b/includes/libs/rdbms/database/DatabaseMssql.php
@@ -26,6 +26,7 @@
*/
use Wikimedia\Rdbms\Blob;
use Wikimedia\Rdbms\MssqlBlob;
+use Wikimedia\Rdbms\MssqlField;
/**
* @ingroup Database
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php
b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 361fc50..61ba498 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -22,6 +22,7 @@
*/
use Wikimedia\Rdbms\DBMasterPos;
use Wikimedia\Rdbms\MySQLMasterPos;
+use Wikimedia\Rdbms\MySQLField;
/**
* Database abstraction object for MySQL.
diff --git a/includes/libs/rdbms/database/DatabasePostgres.php
b/includes/libs/rdbms/database/DatabasePostgres.php
index b54ada7..109f848 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -23,6 +23,7 @@
use Wikimedia\WaitConditionLoop;
use Wikimedia\Rdbms\Blob;
use Wikimedia\Rdbms\PostgresBlob;
+use Wikimedia\Rdbms\PostgresField;
/**
* @ingroup Database
diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php
b/includes/libs/rdbms/database/DatabaseSqlite.php
index bf61671..30bfcf8 100644
--- a/includes/libs/rdbms/database/DatabaseSqlite.php
+++ b/includes/libs/rdbms/database/DatabaseSqlite.php
@@ -22,6 +22,7 @@
* @ingroup Database
*/
use Wikimedia\Rdbms\Blob;
+use Wikimedia\Rdbms\SQLiteField;
/**
* @ingroup Database
diff --git a/includes/libs/rdbms/database/IDatabase.php
b/includes/libs/rdbms/database/IDatabase.php
index 591c797..cdfe88a 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -27,6 +27,7 @@
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
diff --git a/includes/libs/rdbms/field/Field.php
b/includes/libs/rdbms/field/Field.php
index ed102f4..7a25f03 100644
--- a/includes/libs/rdbms/field/Field.php
+++ b/includes/libs/rdbms/field/Field.php
@@ -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 @@
*/
function isNullable();
}
+
+class_alias( 'Wikimedia\Rdbms\Field', 'Field' );
diff --git a/includes/libs/rdbms/field/MssqlField.php
b/includes/libs/rdbms/field/MssqlField.php
index 500b2ef..98cc2b1 100644
--- a/includes/libs/rdbms/field/MssqlField.php
+++ b/includes/libs/rdbms/field/MssqlField.php
@@ -1,4 +1,7 @@
<?php
+
+namespace Wikimedia\Rdbms;
+
class MssqlField implements Field {
private $name, $tableName, $default, $max_length, $nullable, $type;
diff --git a/includes/libs/rdbms/field/MySQLField.php
b/includes/libs/rdbms/field/MySQLField.php
index 02d3589..709c61e 100644
--- a/includes/libs/rdbms/field/MySQLField.php
+++ b/includes/libs/rdbms/field/MySQLField.php
@@ -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,
diff --git a/includes/libs/rdbms/field/PostgresField.php
b/includes/libs/rdbms/field/PostgresField.php
index d34c125..c5819a3 100644
--- a/includes/libs/rdbms/field/PostgresField.php
+++ b/includes/libs/rdbms/field/PostgresField.php
@@ -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;
diff --git a/includes/libs/rdbms/field/SQLiteField.php
b/includes/libs/rdbms/field/SQLiteField.php
index 0a2389b..39f8f01 100644
--- a/includes/libs/rdbms/field/SQLiteField.php
+++ b/includes/libs/rdbms/field/SQLiteField.php
@@ -1,4 +1,7 @@
<?php
+
+namespace Wikimedia\Rdbms;
+
class SQLiteField implements Field {
private $info, $tableName;
diff --git a/includes/utils/AutoloadGenerator.php
b/includes/utils/AutoloadGenerator.php
index aada013..0bfd4a27 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -298,6 +298,8 @@
// 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' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/336579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4908282301d5de2a20baafe510557bd2c3867de5
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Skizzerz <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
