r90455 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r90454‎ | r90455 | r90456 >
Date:12:02, 20 June 2011
Author:tstarling
Status:ok
Tags:
Comment:
Extension updates for r90429: use query() instead of doQuery(), which has been marked private since r21359.
Modified paths:
  • /trunk/extensions/LastUserLogin/LastUserLogin.php (modified) (history)
  • /trunk/extensions/OracleTextSearch/maintainenceFixOTSLinks.php (modified) (history)
  • /trunk/extensions/SQL2Wiki/SQL2Wiki.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SQL2Wiki/SQL2Wiki.body.php
@@ -132,7 +132,7 @@
133133 $ignore = $this->mDB->ignoreErrors( true );
134134 $this->initDBMSOutput();
135135
136 - $this->mResult = $this->mDB->doQuery( $sql );
 136+ $this->mResult = $this->mDB->query( $sql );
137137
138138 $this->getDBMSOutput();
139139 $this->mDB->ignoreErrors( $ignore );
@@ -181,7 +181,7 @@
182182 return;
183183 }
184184
185 - $this->mDB->doQuery ('BEGIN dbms_output.enable(null); END;');
 185+ $this->mDB->query ('BEGIN dbms_output.enable(null); END;');
186186 }
187187
188188 private function disableDBMSOutput() {
@@ -189,7 +189,7 @@
190190 return;
191191 }
192192
193 - $this->mDB->doQuery ('BEGIN dbms_output.disable; END;');
 193+ $this->mDB->query ('BEGIN dbms_output.disable; END;');
194194 }
195195
196196 private function getDBMSOutput() {
@@ -199,7 +199,7 @@
200200
201201 $this->mOutput = array();
202202
203 - $ret = $dbObj->doQuery('SELECT column_value FROM TABLE(get_output_lines())');
 203+ $ret = $dbObj->query('SELECT column_value FROM TABLE(get_output_lines())');
204204 while(($line = $ret->fetchObject()) !== FALSE) {
205205 $this->mOutput[] = $line->column_value;
206206 }
Index: trunk/extensions/LastUserLogin/LastUserLogin.php
@@ -61,7 +61,7 @@
6262 if ( isset( $_COOKIE ) && isset( $_COOKIE["{$wgCookiePrefix}UserID"] ) ) {
6363 $dbw = wfGetDB( DB_MASTER );
6464 $query = "UPDATE " . $dbw->tableName( 'user' ) . " SET user_touched = '" . $dbw->timestamp() . "' WHERE user_id = " . intval( $_COOKIE["{$wgCookiePrefix}UserID"] );
65 - $dbw->doQuery( $query );
 65+ $dbw->query( $query );
6666 }
6767 }
6868
Index: trunk/extensions/OracleTextSearch/maintainenceFixOTSLinks.php
@@ -32,7 +32,7 @@
3333 $tbl_idx = $dbw->tableName( 'searchindex' );
3434
3535 $searchWhere = $all ? '' : ' AND NOT EXISTS (SELECT null FROM '.$tbl_idx.' WHERE si_page=p.page_id AND si_url IS NOT null)';
36 - $result = $dbw->doQuery('SELECT p.page_id FROM '.$tbl_pag.' p WHERE p.page_namespace = '.NS_FILE.$searchWhere );
 36+ $result = $dbw->query('SELECT p.page_id FROM '.$tbl_pag.' p WHERE p.page_namespace = '.NS_FILE.$searchWhere );
3737 $this->output( $result->numRows()." file(s) found\n" );
3838
3939 $syncIdx = false;

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r21359Documentation, mark public functions public, comment a presumably private fun...simetrical02:01, 19 April 2007
r90429In Database.php:...tstarling06:52, 20 June 2011

Status & tagging log