[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move DatabasePostgres to /libs/rdbms

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Move DatabasePostgres to /libs/rdbms
..


Move DatabasePostgres to /libs/rdbms

Fixed all IDEA warnings in the postgres classes too.

Change-Id: I06b4c5b2c581fb65552d980cc106aa10fed40285
---
M autoload.php
M includes/db/loadbalancer/LBFactoryMW.php
R includes/libs/rdbms/database/DatabasePostgres.php
A includes/libs/rdbms/database/utils/SavepointPostgres.php
A includes/libs/rdbms/field/PostgresField.php
5 files changed, 265 insertions(+), 229 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/autoload.php b/autoload.php
index 55c42c6..198e477 100644
--- a/autoload.php
+++ b/autoload.php
@@ -327,7 +327,7 @@
'DatabaseMysqlBase' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqlBase.php',
'DatabaseMysqli' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqli.php',
'DatabaseOracle' => __DIR__ . '/includes/db/DatabaseOracle.php',
-   'DatabasePostgres' => __DIR__ . '/includes/db/DatabasePostgres.php',
+   'DatabasePostgres' => __DIR__ . 
'/includes/libs/rdbms/database/DatabasePostgres.php',
'DatabaseSqlite' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseSqlite.php',
'DatabaseUpdater' => __DIR__ . 
'/includes/installer/DatabaseUpdater.php',
'DateFormats' => __DIR__ . '/maintenance/language/date-formats.php',
@@ -1071,7 +1071,7 @@
'PopulateRevisionSha1' => __DIR__ . 
'/maintenance/populateRevisionSha1.php',
'PostgreSqlLockManager' => __DIR__ . 
'/includes/filebackend/lockmanager/PostgreSqlLockManager.php',
'PostgresBlob' => __DIR__ . 
'/includes/libs/rdbms/encasing/PostgresBlob.php',
-   'PostgresField' => __DIR__ . '/includes/db/DatabasePostgres.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',
@@ -1226,7 +1226,7 @@
'SVGReader' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
'SamplingStatsdClient' => __DIR__ . 
'/includes/libs/SamplingStatsdClient.php',
'Sanitizer' => __DIR__ . '/includes/Sanitizer.php',
-   'SavepointPostgres' => __DIR__ . '/includes/db/DatabasePostgres.php',
+   'SavepointPostgres' => __DIR__ . 
'/includes/libs/rdbms/database/utils/SavepointPostgres.php',
'ScopedCallback' => __DIR__ . '/includes/libs/ScopedCallback.php',
'ScopedLock' => __DIR__ . 
'/includes/filebackend/lockmanager/ScopedLock.php',
'SearchApi' => __DIR__ . '/includes/api/SearchApi.php',
diff --git a/includes/db/loadbalancer/LBFactoryMW.php 
b/includes/db/loadbalancer/LBFactoryMW.php
index e943a8a..e90cd67 100644
--- a/includes/db/loadbalancer/LBFactoryMW.php
+++ b/includes/db/loadbalancer/LBFactoryMW.php
@@ -62,6 +62,8 @@
foreach ( $mainConfig->get( 'DBservers' ) as $i 
=> $server ) {
if ( $server['type'] === 'sqlite' ) {
$server += [ 'dbDirectory' => 
$mainConfig->get( 'SQLiteDataDir' ) ];
+   } elseif ( $server['type'] === 
'postgres' ) {
+   $server += [ 'port' => 
$mainConfig->get( 'DBport' ) ];
}
$lbConf['servers'][$i] = $server + [
'schema' => $mainConfig->get( 
'DBmwschema' ),
@@ -91,6 +93,8 @@
];
if ( $server['type'] === 'sqlite' ) {
$server[ 'dbDirectory'] = 
$mainConfig->get( 'SQLiteDataDir' );
+   } elseif ( $server['type'] === 'postgres' ) {
+   $server['port'] = $mainConfig->get( 
'DBport' );
}
$lbConf['servers'] = [ $server ];
}
diff --git a/includes/db/DatabasePostgres.php 
b/includes/libs/rdbms/database/DatabasePostgres.php
similarity index 85%
rename from includes/db/DatabasePostgres.php
rename to includes/libs/rdbms/database/DatabasePostgres.php
index 1907bab..b07ac16 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -21,207 +21,31 @@
  * @ingroup Database
  */
 
-class PostgresField implements Field {
-   private $name, $tablename, $type, $nullable, $max_length, $deferred, 
$deferrable, $conname,
-   $has_default, $default;
-
-   /**
-* @param IDatabase $db
-* @param string $table
-* @param string $field
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move DatabasePostgres to /libs/rdbms

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311471

Change subject: Move DatabasePostgres to /libs/rdbms
..

Move DatabasePostgres to /libs/rdbms

Fixed all IDEA warnings in the postgres classes too.

Change-Id: I06b4c5b2c581fb65552d980cc106aa10fed40285
---
M autoload.php
M includes/db/loadbalancer/LBFactoryMW.php
R includes/libs/rdbms/database/DatabasePostgres.php
A includes/libs/rdbms/database/utils/SavepointPostgres.php
A includes/libs/rdbms/field/PostgresField.php
5 files changed, 267 insertions(+), 229 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/71/311471/1

diff --git a/autoload.php b/autoload.php
index 55c42c6..198e477 100644
--- a/autoload.php
+++ b/autoload.php
@@ -327,7 +327,7 @@
'DatabaseMysqlBase' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqlBase.php',
'DatabaseMysqli' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqli.php',
'DatabaseOracle' => __DIR__ . '/includes/db/DatabaseOracle.php',
-   'DatabasePostgres' => __DIR__ . '/includes/db/DatabasePostgres.php',
+   'DatabasePostgres' => __DIR__ . 
'/includes/libs/rdbms/database/DatabasePostgres.php',
'DatabaseSqlite' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseSqlite.php',
'DatabaseUpdater' => __DIR__ . 
'/includes/installer/DatabaseUpdater.php',
'DateFormats' => __DIR__ . '/maintenance/language/date-formats.php',
@@ -1071,7 +1071,7 @@
'PopulateRevisionSha1' => __DIR__ . 
'/maintenance/populateRevisionSha1.php',
'PostgreSqlLockManager' => __DIR__ . 
'/includes/filebackend/lockmanager/PostgreSqlLockManager.php',
'PostgresBlob' => __DIR__ . 
'/includes/libs/rdbms/encasing/PostgresBlob.php',
-   'PostgresField' => __DIR__ . '/includes/db/DatabasePostgres.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',
@@ -1226,7 +1226,7 @@
'SVGReader' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
'SamplingStatsdClient' => __DIR__ . 
'/includes/libs/SamplingStatsdClient.php',
'Sanitizer' => __DIR__ . '/includes/Sanitizer.php',
-   'SavepointPostgres' => __DIR__ . '/includes/db/DatabasePostgres.php',
+   'SavepointPostgres' => __DIR__ . 
'/includes/libs/rdbms/database/utils/SavepointPostgres.php',
'ScopedCallback' => __DIR__ . '/includes/libs/ScopedCallback.php',
'ScopedLock' => __DIR__ . 
'/includes/filebackend/lockmanager/ScopedLock.php',
'SearchApi' => __DIR__ . '/includes/api/SearchApi.php',
diff --git a/includes/db/loadbalancer/LBFactoryMW.php 
b/includes/db/loadbalancer/LBFactoryMW.php
index e943a8a..e90cd67 100644
--- a/includes/db/loadbalancer/LBFactoryMW.php
+++ b/includes/db/loadbalancer/LBFactoryMW.php
@@ -62,6 +62,8 @@
foreach ( $mainConfig->get( 'DBservers' ) as $i 
=> $server ) {
if ( $server['type'] === 'sqlite' ) {
$server += [ 'dbDirectory' => 
$mainConfig->get( 'SQLiteDataDir' ) ];
+   } elseif ( $server['type'] === 
'postgres' ) {
+   $server += [ 'port' => 
$mainConfig->get( 'DBport' ) ];
}
$lbConf['servers'][$i] = $server + [
'schema' => $mainConfig->get( 
'DBmwschema' ),
@@ -91,6 +93,8 @@
];
if ( $server['type'] === 'sqlite' ) {
$server[ 'dbDirectory'] = 
$mainConfig->get( 'SQLiteDataDir' );
+   } elseif ( $server['type'] === 'postgres' ) {
+   $server['port'] = $mainConfig->get( 
'DBport' );
}
$lbConf['servers'] = [ $server ];
}
diff --git a/includes/db/DatabasePostgres.php 
b/includes/libs/rdbms/database/DatabasePostgres.php
similarity index 85%
rename from includes/db/DatabasePostgres.php
rename to includes/libs/rdbms/database/DatabasePostgres.php
index e5ce283..cca0a640 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -21,207 +21,31 @@
  * @ingroup Database
  */
 
-class PostgresField implements Field {
-   private $name, $tablename, $type, $nullable, $max_length, $deferred, 
$deferrable, $conname,
-   $has_default, $default;
-
-   /**
-* @param IDatabase $db
-* @param string