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 "Added a separate error message for mkdir failures"
[lhc/web/wiklou.git]
/
includes
/
installer
/
PostgresInstaller.php
diff --git
a/includes/installer/PostgresInstaller.php
b/includes/installer/PostgresInstaller.php
index
6dfa28b
..
b501cb3
100644
(file)
--- a/
includes/installer/PostgresInstaller.php
+++ b/
includes/installer/PostgresInstaller.php
@@
-21,6
+21,10
@@
* @ingroup Deployment
*/
* @ingroup Deployment
*/
+use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\DBQueryError;
+use Wikimedia\Rdbms\DBConnectionError;
+
/**
* Class for setting up the MediaWiki database using Postgres.
*
/**
* Class for setting up the MediaWiki database using Postgres.
*
@@
-156,10
+160,13
@@
class PostgresInstaller extends DatabaseInstaller {
try {
$db = Database::factory( 'postgres', [
'host' => $this->getVar( 'wgDBserver' ),
try {
$db = Database::factory( 'postgres', [
'host' => $this->getVar( 'wgDBserver' ),
+ 'port' => $this->getVar( 'wgDBport' ),
'user' => $user,
'password' => $password,
'dbname' => $dbName,
'user' => $user,
'password' => $password,
'dbname' => $dbName,
- 'schema' => $schema ] );
+ 'schema' => $schema,
+ 'keywordTableMap' => [ 'user' => 'mwuser', 'text' => 'pagecontent' ],
+ ] );
$status->value = $db;
} catch ( DBConnectionError $e ) {
$status->fatal( 'config-connection-error', $e->getMessage() );
$status->value = $db;
} catch ( DBConnectionError $e ) {
$status->fatal( 'config-connection-error', $e->getMessage() );