| Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php |
| — | — | @@ -2318,20 +2318,20 @@ |
| 2319 | 2319 | |
| 2320 | 2320 | foreach ( self::getPropertyTables() as $proptable ) { |
| 2321 | 2321 | if ( $proptable->idsubject ) { |
| 2322 | | - $db->delete( $proptable->name, array( 's_id' => $id ), $fname ); |
| | 2322 | + $db->delete( $proptable->name, array( 's_id' => $id ), "$fname::deleteById" ); |
| 2323 | 2323 | } elseif ( $proptable->name != 'smw_redi2' ) { /// NOTE: redirects are handled by updateRedirects(), not here! |
| 2324 | | - $db->delete( $proptable->name, array( 's_title' => $subject->getDBkey(), 's_namespace' => $subject->getNamespace() ), $fname ); |
| | 2324 | + $db->delete( $proptable->name, array( 's_title' => $subject->getDBkey(), 's_namespace' => $subject->getNamespace() ), "$fname::deleteByTitle" ); |
| 2325 | 2325 | } |
| 2326 | 2326 | } |
| 2327 | 2327 | |
| 2328 | 2328 | // also find bnodes used by this ID ... |
| 2329 | | - $res = $db->select( 'smw_ids', 'smw_id', array( 'smw_title' => '', 'smw_namespace' => $id, 'smw_iw' => SMW_SQL2_SMWIW ), $fname ); |
| | 2329 | + $res = $db->select( 'smw_ids', 'smw_id', array( 'smw_title' => '', 'smw_namespace' => $id, 'smw_iw' => SMW_SQL2_SMWIW ), "$fname::selectBnodes" ); |
| 2330 | 2330 | |
| 2331 | 2331 | // ... and delete them as well |
| 2332 | 2332 | while ( $row = $db->fetchObject( $res ) ) { |
| 2333 | 2333 | foreach ( self::getPropertyTables() as $proptable ) { |
| 2334 | 2334 | if ( $proptable->idsubject ) { |
| 2335 | | - $db->delete( $proptable->name, array( 's_id' => $row->smw_id ), $fname ); |
| | 2335 | + $db->delete( $proptable->name, array( 's_id' => $row->smw_id ), "$fname::deleteBnodes" ); |
| 2336 | 2336 | } |
| 2337 | 2337 | } |
| 2338 | 2338 | } |
| — | — | @@ -2339,7 +2339,7 @@ |
| 2340 | 2340 | $db->freeResult( $res ); |
| 2341 | 2341 | |
| 2342 | 2342 | // free all affected bnodes in one call: |
| 2343 | | - $db->update( 'smw_ids', array( 'smw_namespace' => 0 ), array( 'smw_title' => '', 'smw_namespace' => $id, 'smw_iw' => SMW_SQL2_SMWIW ), $fname ); |
| | 2343 | + $db->update( 'smw_ids', array( 'smw_namespace' => 0 ), array( 'smw_title' => '', 'smw_namespace' => $id, 'smw_iw' => SMW_SQL2_SMWIW ), "$fname::updateBnodes" ); |
| 2344 | 2344 | |
| 2345 | 2345 | wfRunHooks( 'smwDeleteSemanticData', array( $subject ) ); |
| 2346 | 2346 | } |
| — | — | @@ -2549,4 +2549,4 @@ |
| 2550 | 2550 | return self::$prop_tables; |
| 2551 | 2551 | } |
| 2552 | 2552 | |
| 2553 | | -} |
| \ No newline at end of file |
| | 2553 | +} |