Index: trunk/phase3/includes/installer/PostgresInstaller.php |
— | — | @@ -220,7 +220,7 @@ |
221 | 221 | |
222 | 222 | $dbName = $this->getVar( 'wgDBname' ); |
223 | 223 | $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 ) ); |
225 | 225 | if( !$rows ) { |
226 | 226 | $schema = $this->getVar( 'wgDBmwschema' ); |
227 | 227 | $user = $this->getVar( 'wgDBuser' ); |
— | — | @@ -244,7 +244,7 @@ |
245 | 245 | |
246 | 246 | $result = $conn->schemaExists( $schema ); |
247 | 247 | if( !$result ) { |
248 | | - $result = $conn->doQuery( "CREATE SCHEMA $safeschema AUTHORIZATION $safeuser" ); |
| 248 | + $result = $conn->query( "CREATE SCHEMA $safeschema AUTHORIZATION $safeuser" ); |
249 | 249 | if( !$result ) { |
250 | 250 | $status->fatal( 'config-install-pg-schema-failed', $user, $schema ); |
251 | 251 | } |
— | — | @@ -259,8 +259,8 @@ |
260 | 260 | "pg_catalog.oidvectortypes(p.proargtypes)||') TO $safeuser;'\n". |
261 | 261 | "FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n\n". |
262 | 262 | "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" ); |
265 | 265 | } |
266 | 266 | } |
267 | 267 | return $status; |