r80016 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r80015‎ | r80016 | r80017 >
Date:16:02, 11 January 2011
Author:demon
Status:ok
Tags:
Comment:
Fix a few doQuery() -> query()
Modified paths:
  • /trunk/phase3/includes/installer/PostgresInstaller.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/PostgresInstaller.php
@@ -220,7 +220,7 @@
221221
222222 $dbName = $this->getVar( 'wgDBname' );
223223 $SQL = "SELECT 1 FROM pg_catalog.pg_database WHERE datname = " . $conn->addQuotes( $dbName );
224 - $rows = $conn->numRows( $conn->doQuery( $SQL ) );
 224+ $rows = $conn->numRows( $conn->query( $SQL ) );
225225 if( !$rows ) {
226226 $schema = $this->getVar( 'wgDBmwschema' );
227227 $user = $this->getVar( 'wgDBuser' );
@@ -244,7 +244,7 @@
245245
246246 $result = $conn->schemaExists( $schema );
247247 if( !$result ) {
248 - $result = $conn->doQuery( "CREATE SCHEMA $safeschema AUTHORIZATION $safeuser" );
 248+ $result = $conn->query( "CREATE SCHEMA $safeschema AUTHORIZATION $safeuser" );
249249 if( !$result ) {
250250 $status->fatal( 'config-install-pg-schema-failed', $user, $schema );
251251 }
@@ -259,8 +259,8 @@
260260 "pg_catalog.oidvectortypes(p.proargtypes)||') TO $safeuser;'\n".
261261 "FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n\n".
262262 "WHERE p.pronamespace = n.oid AND n.nspname = $safeschema2";
263 - $res = $conn->doQuery( $SQL );
264 - $conn->doQuery( "SET search_path = $safeschema" );
 263+ $res = $conn->query( $SQL );
 264+ $conn->query( "SET search_path = $safeschema" );
265265 }
266266 }
267267 return $status;

Follow-up revisions

RevisionCommit summaryAuthorDate
r81182MFT a bunch of installer fixes. r80238, r80128, r80124, r80083, r80080, r800...demon01:59, 29 January 2011

Status & tagging log