| Index: trunk/phase3/includes/db/DatabaseMssql.php |
| — | — | @@ -271,15 +271,15 @@ |
| 272 | 272 | /** |
| 273 | 273 | * SELECT wrapper |
| 274 | 274 | * |
| 275 | | - * @param mixed $table Array or string, table name(s) (prefix auto-added) |
| 276 | | - * @param mixed $vars Array or string, field name(s) to be retrieved |
| 277 | | - * @param mixed $conds Array or string, condition(s) for WHERE |
| 278 | | - * @param string $fname Calling function name (use __METHOD__) for logs/profiling |
| 279 | | - * @param array $options Associative array of options (e.g. array('GROUP BY' => 'page_title')), |
| 280 | | - * see Database::makeSelectOptions code for list of supported stuff |
| | 275 | + * @param $table Mixed: array or string, table name(s) (prefix auto-added) |
| | 276 | + * @param $vars Mixed: array or string, field name(s) to be retrieved |
| | 277 | + * @param $conds Mixed: array or string, condition(s) for WHERE |
| | 278 | + * @param $fname String: calling function name (use __METHOD__) for logs/profiling |
| | 279 | + * @param $options Array: associative array of options (e.g. array('GROUP BY' => 'page_title')), |
| | 280 | + * see Database::makeSelectOptions code for list of supported stuff |
| 281 | 281 | * @param $join_conds Array: Associative array of table join conditions (optional) |
| 282 | 282 | * (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') ) |
| 283 | | - * @return mixed Database result resource (feed to Database::fetchObject or whatever), or false on failure |
| | 283 | + * @return Mixed: database result resource (feed to Database::fetchObject or whatever), or false on failure |
| 284 | 284 | */ |
| 285 | 285 | function select( $table, $vars, $conds = '', $fname = 'Database::select', $options = array(), $join_conds = array() ) |
| 286 | 286 | { |
| — | — | @@ -296,13 +296,13 @@ |
| 297 | 297 | * SELECT wrapper |
| 298 | 298 | * |
| 299 | 299 | * @param $table Mixed: Array or string, table name(s) (prefix auto-added) |
| 300 | | - * @param $vars Mixed: Array or string, field name(s) to be retrieved |
| | 300 | + * @param $vars Mixed: Array or string, field name(s) to be retrieved |
| 301 | 301 | * @param $conds Mixed: Array or string, condition(s) for WHERE |
| 302 | 302 | * @param $fname String: Calling function name (use __METHOD__) for logs/profiling |
| 303 | 303 | * @param $options Array: Associative array of options (e.g. array('GROUP BY' => 'page_title')), |
| 304 | | - * see Database::makeSelectOptions code for list of supported stuff |
| | 304 | + * see Database::makeSelectOptions code for list of supported stuff |
| 305 | 305 | * @param $join_conds Array: Associative array of table join conditions (optional) |
| 306 | | - * (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') ) |
| | 306 | + * (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') ) |
| 307 | 307 | * @return string, the SQL text |
| 308 | 308 | */ |
| 309 | 309 | function selectSQLText( $table, $vars, $conds = '', $fname = 'Database::select', $options = array(), $join_conds = array() ) { |
| — | — | @@ -531,7 +531,7 @@ |
| 532 | 532 | * themselves. Pass the canonical name to such functions. This is only needed |
| 533 | 533 | * when calling query() directly. |
| 534 | 534 | * |
| 535 | | - * @param string $name database table name |
| | 535 | + * @param $name String: database table name |
| 536 | 536 | */ |
| 537 | 537 | function tableName( $name ) { |
| 538 | 538 | global $wgSharedDB; |
| — | — | @@ -1008,9 +1008,9 @@ |
| 1009 | 1009 | /** |
| 1010 | 1010 | * @private |
| 1011 | 1011 | * |
| 1012 | | - * @param array $options an associative array of options to be turned into |
| 1013 | | - * an SQL query, valid keys are listed in the function. |
| 1014 | | - * @return array |
| | 1012 | + * @param $options Array: an associative array of options to be turned into |
| | 1013 | + * an SQL query, valid keys are listed in the function. |
| | 1014 | + * @return Array |
| 1015 | 1015 | */ |
| 1016 | 1016 | function makeSelectOptions( $options ) { |
| 1017 | 1017 | $tailOpts = ''; |