dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Revert "Use display name in category page subheadings if provided""
[lhc/web/wiklou.git]
/
includes
/
installer
/
PostgresInstaller.php
diff --git
a/includes/installer/PostgresInstaller.php
b/includes/installer/PostgresInstaller.php
index
0728415
..
6dfa28b
100644
(file)
--- a/
includes/installer/PostgresInstaller.php
+++ b/
includes/installer/PostgresInstaller.php
@@
-114,7
+114,7
@@
class PostgresInstaller extends DatabaseInstaller {
return $status;
}
/**
return $status;
}
/**
- * @var $conn Database
Base
+ * @var $conn Database
*/
$conn = $status->value;
*/
$conn = $status->value;
@@
-154,7
+154,7
@@
class PostgresInstaller extends DatabaseInstaller {
protected function openConnectionWithParams( $user, $password, $dbName, $schema ) {
$status = Status::newGood();
try {
protected function openConnectionWithParams( $user, $password, $dbName, $schema ) {
$status = Status::newGood();
try {
- $db = Database
Base
::factory( 'postgres', [
+ $db = Database::factory( 'postgres', [
'host' => $this->getVar( 'wgDBserver' ),
'user' => $user,
'password' => $password,
'host' => $this->getVar( 'wgDBserver' ),
'user' => $user,
'password' => $password,
@@
-181,7
+181,7
@@
class PostgresInstaller extends DatabaseInstaller {
if ( $status->isOK() ) {
/**
if ( $status->isOK() ) {
/**
- * @var $conn Database
Base
+ * @var $conn Database
*/
$conn = $status->value;
$conn->clearFlag( DBO_TRX );
*/
$conn = $status->value;
$conn->clearFlag( DBO_TRX );
@@
-233,7
+233,7
@@
class PostgresInstaller extends DatabaseInstaller {
$status = $this->openPgConnection( 'create-schema' );
if ( $status->isOK() ) {
/**
$status = $this->openPgConnection( 'create-schema' );
if ( $status->isOK() ) {
/**
- * @var $conn Database
Base
+ * @var $conn Database
*/
$conn = $status->value;
$safeRole = $conn->addIdentifierQuotes( $this->getVar( 'wgDBuser' ) );
*/
$conn = $status->value;
$safeRole = $conn->addIdentifierQuotes( $this->getVar( 'wgDBuser' ) );
@@
-264,7
+264,7
@@
class PostgresInstaller extends DatabaseInstaller {
'password' => $password,
'dbname' => $db
];
'password' => $password,
'dbname' => $db
];
- $conn = Database
Base
::factory( 'postgres', $p );
+ $conn = Database::factory( 'postgres', $p );
} catch ( DBConnectionError $error ) {
$conn = false;
$status->fatal( 'config-pg-test-error', $db,
} catch ( DBConnectionError $error ) {
$conn = false;
$status->fatal( 'config-pg-test-error', $db,
@@
-287,7
+287,7
@@
class PostgresInstaller extends DatabaseInstaller {
return false;
}
/**
return false;
}
/**
- * @var $conn Database
Base
+ * @var $conn Database
*/
$conn = $status->value;
$superuser = $this->getVar( '_InstallUser' );
*/
$conn = $status->value;
$superuser = $this->getVar( '_InstallUser' );
@@
-413,7
+413,7
@@
class PostgresInstaller extends DatabaseInstaller {
/**
* Recursive helper for canCreateObjectsForWebUser().
/**
* Recursive helper for canCreateObjectsForWebUser().
- * @param Database
Base
$conn
+ * @param Database $conn
* @param int $targetMember Role ID of the member to look for
* @param int $group Role ID of the group to look for
* @param int $maxDepth Maximum recursive search depth
* @param int $targetMember Role ID of the member to look for
* @param int $group Role ID of the group to look for
* @param int $maxDepth Maximum recursive search depth
@@
-587,9
+587,7
@@
class PostgresInstaller extends DatabaseInstaller {
return $status;
}
return $status;
}
- /**
- * @var $conn DatabaseBase
- */
+ /** @var $conn DatabasePostgres */
$conn = $status->value;
if ( $conn->tableExists( 'archive' ) ) {
$conn = $status->value;
if ( $conn->tableExists( 'archive' ) ) {
@@
-606,7
+604,7
@@
class PostgresInstaller extends DatabaseInstaller {
return $status;
}
return $status;
}
- $error = $conn->sourceFile( $
conn->getSchemaPath(
) );
+ $error = $conn->sourceFile( $
this->getSchemaPath( $conn
) );
if ( $error !== true ) {
$conn->reportQueryError( $error, 0, '', __METHOD__ );
$conn->rollback( __METHOD__ );
if ( $error !== true ) {
$conn->reportQueryError( $error, 0, '', __METHOD__ );
$conn->rollback( __METHOD__ );
@@
-638,7
+636,7
@@
class PostgresInstaller extends DatabaseInstaller {
return $status;
}
/**
return $status;
}
/**
- * @var $conn Database
Base
+ * @var $conn Database
*/
$conn = $status->value;
*/
$conn = $status->value;