r78925 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r78924‎ | r78925 | r78926 >
Date:20:24, 23 December 2010
Author:demon
Status:ok (Comments)
Tags:
Comment:
* Fix r78774 for Oracle and Postgres, broke by method rename
* Get rid of Postgres version check, already handled by PostgresInstaller::submitConnectForm()
Modified paths:
  • /trunk/phase3/includes/db/DatabasePostgres.php (modified) (history)
  • /trunk/phase3/includes/installer/OracleInstaller.php (modified) (history)
  • /trunk/phase3/includes/installer/PostgresInstaller.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/db/DatabasePostgres.php
@@ -229,15 +229,6 @@
230230 // If this is the initial connection, setup the schema stuff and possibly create the user
231231 global $wgDBname, $wgDBuser, $wgDBpassword, $wgDBmwschema, $wgDBts2schema;
232232
233 - print '<li>Checking the version of Postgres...';
234 - $version = $this->getServerVersion();
235 - $PGMINVER = '8.1';
236 - if ( $version < $PGMINVER ) {
237 - print "<b>FAILED</b>. Required version is $PGMINVER. You have " . htmlspecialchars( $version ) . "</li>\n";
238 - dieout( );
239 - }
240 - print 'version ' . htmlspecialchars( $this->numeric_version ) . " is OK.</li>\n";
241 -
242233 $safeuser = $this->addIdentifierQuotes( $wgDBuser );
243234 // Are we connecting as a superuser for the first time?
244235 if ( $superuser ) {
Index: trunk/phase3/includes/installer/OracleInstaller.php
@@ -152,7 +152,7 @@
153153 'callback' => array( $this, 'setupUser' ),
154154 )
155155 );
156 - $this->parent->addInstallStepFollowing( "database", $callback );
 156+ $this->parent->addInstallStep( $callback, 'database' );
157157 }
158158
159159
Index: trunk/phase3/includes/installer/PostgresInstaller.php
@@ -113,7 +113,7 @@
114114 'name' => 'pg-commit',
115115 'callback' => array( $this, 'commitChanges' ),
116116 );
117 - $this->parent->addInstallStepFollowing( 'interwiki', $callback );
 117+ $this->parent->addInstallStep( $callback, 'interwiki' );
118118 }
119119
120120 function setupDatabase() {

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r78774Rewrite install steps again (cleanup r76390)...demon05:21, 22 December 2010

Comments

#Comment by 😂 (talk | contribs)   20:25, 23 December 2010

Somebody who knows Postgres (ping G_SabinoMullane and OverlordQ?) needs to port the rest of initial_setup() to a callback hook (probably 2?).

I could do it, but I'll probably break something trying...

Status & tagging log