| Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore.php |
| — | — | @@ -50,33 +50,39 @@ |
| 51 | 51 | $result = array(); |
| 52 | 52 | if ($specialprop === SMW_SP_HAS_CATEGORY) { // category membership |
| 53 | 53 | $sql = 'cl_from=' . $db->addQuotes($subject->getArticleID()); |
| 54 | | - $res = $db->select( $db->tableName('categorylinks'), |
| | 54 | + $res = $db->select( 'categorylinks', |
| 55 | 55 | 'DISTINCT cl_to', |
| 56 | 56 | $sql, 'SMW::getSpecialValues', $this->getSQLOptions($requestoptions) ); |
| 57 | 57 | // rewrite result as array |
| 58 | | - if($db->numRows( $res ) > 0) { |
| 59 | | - while($row = $db->fetchObject($res)) { |
| 60 | | - $result[] = Title::newFromText($row->cl_to, NS_CATEGORY); |
| 61 | | - } |
| | 58 | + while($row = $db->fetchObject($res)) { |
| | 59 | + $result[] = Title::newFromText($row->cl_to, NS_CATEGORY); |
| 62 | 60 | } |
| 63 | 61 | $db->freeResult($res); |
| 64 | 62 | } elseif ($specialprop === SMW_SP_REDIRECTS_TO) { // redirections |
| 65 | 63 | $sql = 'rd_from=' . $db->addQuotes($subject->getArticleID()); |
| 66 | | - $res = $db->select( $db->tableName('redirect'), |
| | 64 | + $res = $db->select( 'redirect', |
| 67 | 65 | 'rd_namespace,rd_title', |
| 68 | 66 | $sql, 'SMW::getSpecialValues', $this->getSQLOptions($requestoptions) ); |
| 69 | | - |
| 70 | | - // reqrite results as array |
| 71 | | - if($db->numRows( $res ) > 0) { |
| 72 | | - while($row = $db->fetchObject($res)) { |
| 73 | | - $result[] = Title::makeTitle($row->rd_namespace, $row->rd_title); |
| 74 | | - } |
| | 67 | + // rewrite results as array |
| | 68 | + while($row = $db->fetchObject($res)) { |
| | 69 | + $result[] = Title::makeTitle($row->rd_namespace, $row->rd_title); |
| 75 | 70 | } |
| 76 | 71 | $db->freeResult($res); |
| | 72 | + } elseif ($specialprop === SMW_SP_SUBPROPERTY_OF) { // subproperty |
| | 73 | + $sql = 'subject_title=' . $db->addQuotes($subject->getDBKey()) . |
| | 74 | + 'AND namespace=' . $db->addQuotes($subject->getNamespace()); |
| | 75 | + $res = $db->select( 'smw_subprops', |
| | 76 | + 'object_title', |
| | 77 | + $sql, 'SMW::getSpecialValues', $this->getSQLOptions($requestoptions) ); |
| | 78 | + // rewrite results as array |
| | 79 | + while($row = $db->fetchObject($res)) { |
| | 80 | + $result[] = Title::makeTitle($subject->namespace, $row->object_title); |
| | 81 | + } |
| | 82 | + $db->freeResult($res); |
| 77 | 83 | } else { // "normal" special property |
| 78 | 84 | $sql = 'subject_id=' . $db->addQuotes($subject->getArticleID()) . |
| 79 | 85 | 'AND property_id=' . $db->addQuotes($specialprop); |
| 80 | | - $res = $db->select( $db->tableName('smw_specialprops'), |
| | 86 | + $res = $db->select( 'smw_specialprops', |
| 81 | 87 | 'value_string', |
| 82 | 88 | $sql, 'SMW::getSpecialValues', $this->getSQLOptions($requestoptions) ); |
| 83 | 89 | // rewrite result as array |
| — | — | @@ -107,34 +113,36 @@ |
| 108 | 114 | return array(); |
| 109 | 115 | } |
| 110 | 116 | $sql = 'cl_to=' . $db->addQuotes($value->getDBKey()); |
| 111 | | - $res = $db->select( $db->tableName('categorylinks'), |
| | 117 | + $res = $db->select( 'categorylinks', |
| 112 | 118 | 'DISTINCT cl_from', |
| 113 | 119 | $sql, 'SMW::getSpecialValues', $this->getSQLOptions($requestoptions) ); |
| 114 | | - |
| 115 | 120 | // rewrite result as array |
| 116 | | - if($db->numRows( $res ) > 0) { |
| 117 | | - while($row = $db->fetchObject($res)) { |
| 118 | | - $result[] = Title::newFromID($row->cl_from); |
| 119 | | - } |
| | 121 | + while($row = $db->fetchObject($res)) { |
| | 122 | + $result[] = Title::newFromID($row->cl_from); |
| 120 | 123 | } |
| 121 | 124 | $db->freeResult($res); |
| 122 | | - |
| 123 | 125 | } elseif ($specialprop === SMW_SP_REDIRECTS_TO) { // redirections |
| 124 | | - |
| 125 | 126 | $sql = 'rd_title=' . $db->addQuotes($value->getDBKey()) |
| 126 | 127 | . ' AND rd_namespace=' . $db->addQuotes($value->getNamespace()); |
| 127 | | - $res = $db->select( $db->tableName('redirect'), |
| | 128 | + $res = $db->select( 'redirect', |
| 128 | 129 | 'rd_from', |
| 129 | 130 | $sql, 'SMW::getSpecialValues', $this->getSQLOptions($requestoptions) ); |
| 130 | | - |
| 131 | 131 | // reqrite results as array |
| 132 | | - if($db->numRows( $res ) > 0) { |
| 133 | | - while($row = $db->fetchObject($res)) { |
| 134 | | - $result[] = Title::newFromID($row->rd_from); |
| 135 | | - } |
| | 132 | + while($row = $db->fetchObject($res)) { |
| | 133 | + $result[] = Title::newFromID($row->rd_from); |
| 136 | 134 | } |
| 137 | 135 | $db->freeResult($res); |
| 138 | | - |
| | 136 | + } elseif ($specialprop === SMW_SP_SUBPROPERTY_OF) { // subproperties |
| | 137 | + $sql = 'object_title=' . $db->addQuotes($value->getDBKey()) . |
| | 138 | + 'AND namespace=' . $db->addQuotes($value->getNamespace()); |
| | 139 | + $res = $db->select( 'smw_subprops', |
| | 140 | + 'subject_title', |
| | 141 | + $sql, 'SMW::getSpecialValues', $this->getSQLOptions($requestoptions) ); |
| | 142 | + // reqrite results as array |
| | 143 | + while($row = $db->fetchObject($res)) { |
| | 144 | + $result[] = Title::makeTitle($value->namespace, $row->subject_title); |
| | 145 | + } |
| | 146 | + $db->freeResult($res); |
| 139 | 147 | } else { |
| 140 | 148 | |
| 141 | 149 | if ($value instanceof SMWDataValue) { |
| — | — | @@ -157,15 +165,13 @@ |
| 158 | 166 | ' AND value_string=' . $db->addQuotes($stringvalue) . |
| 159 | 167 | $this->getSQLConditions($requestoptions,'subject_title','subject_title'); |
| 160 | 168 | |
| 161 | | - $res = $db->select( $db->tableName('smw_specialprops'), |
| | 169 | + $res = $db->select( 'smw_specialprops', |
| 162 | 170 | 'DISTINCT subject_id', |
| 163 | 171 | $sql, 'SMW::getSpecialSubjects', $this->getSQLOptions($requestoptions,'subject_title') ); |
| 164 | 172 | |
| 165 | 173 | // rewrite result as array |
| 166 | | - if($db->numRows( $res ) > 0) { |
| 167 | | - while($row = $db->fetchObject($res)) { |
| 168 | | - $result[] = Title::newFromID($row->subject_id); |
| 169 | | - } |
| | 174 | + while($row = $db->fetchObject($res)) { |
| | 175 | + $result[] = Title::newFromID($row->subject_id); |
| 170 | 176 | } |
| 171 | 177 | $db->freeResult($res); |
| 172 | 178 | } |
| — | — | @@ -418,18 +424,23 @@ |
| 419 | 425 | |
| 420 | 426 | function deleteSubject(Title $subject) { |
| 421 | 427 | $db =& wfGetDB( DB_MASTER ); |
| 422 | | - $db->delete($db->tableName('smw_relations'), |
| | 428 | + $db->delete('smw_relations', |
| 423 | 429 | array('subject_id' => $subject->getArticleID()), |
| 424 | 430 | 'SMW::deleteSubject::Relations'); |
| 425 | | - $db->delete($db->tableName('smw_attributes'), |
| | 431 | + $db->delete('smw_attributes', |
| 426 | 432 | array('subject_id' => $subject->getArticleID()), |
| 427 | 433 | 'SMW::deleteSubject::Attributes'); |
| 428 | | - $db->delete($db->tableName('smw_longstrings'), |
| | 434 | + $db->delete('smw_longstrings', |
| 429 | 435 | array('subject_id' => $subject->getArticleID()), |
| 430 | 436 | 'SMW::deleteSubject::Longstrings'); |
| 431 | | - $db->delete($db->tableName('smw_specialprops'), |
| | 437 | + $db->delete('smw_specialprops', |
| 432 | 438 | array('subject_id' => $subject->getArticleID()), |
| 433 | 439 | 'SMW::deleteSubject::Specialprops'); |
| | 440 | + if ( ($subject->getNamespace() == SMW_NS_ATTRIBUTE) || ($subject->getNamespace() == SMW_NS_RELATION) ) { |
| | 441 | + $db->delete('smw_subprops', |
| | 442 | + array('subject_title' => $subject->getDBKey(), 'namespace' => $subject->getNamespace()), |
| | 443 | + 'SMW::deleteSubject::Subprops'); |
| | 444 | + } |
| 434 | 445 | } |
| 435 | 446 | |
| 436 | 447 | function updateData(SMWSemanticData $data) { |
| — | — | @@ -442,6 +453,7 @@ |
| 443 | 454 | $up_attributes = array(); |
| 444 | 455 | $up_longstrings = array(); |
| 445 | 456 | $up_specials = array(); |
| | 457 | + $up_subprops = array(); |
| 446 | 458 | |
| 447 | 459 | // relations |
| 448 | 460 | foreach($data->getRelations() as $relation) { |
| — | — | @@ -485,46 +497,69 @@ |
| 486 | 498 | |
| 487 | 499 | //special properties |
| 488 | 500 | foreach ($data->getSpecialProperties() as $special) { |
| 489 | | - if ($special == SMW_SP_IMPORTED_FROM) { // don't store this, just used for display; TODO: filtering it here is bad |
| 490 | | - continue; |
| 491 | | - } |
| 492 | | - $valueArray = $data->getSpecialValues($special); |
| 493 | | - foreach($valueArray as $value) { |
| 494 | | - if ($value instanceof SMWDataValue) { |
| 495 | | - if ($value->getXSDValue() !== false) { // filters out error-values etc. |
| 496 | | - $stringvalue = $value->getXSDValue(); |
| | 501 | + switch ($special) { |
| | 502 | + case SMW_SP_IMPORTED_FROM: case SMW_SP_HAS_CATEGORY: case SMW_SP_REDIRECTS_TO: |
| | 503 | + // don't store this, just used for display; |
| | 504 | + // TODO: filtering here is bad for fully neglected properties (IMPORTED FROM) |
| | 505 | + break; |
| | 506 | + case SMW_SP_SUBPROPERTY_OF: |
| | 507 | + if ( ($subject->getNamespace() != SMW_NS_RELATION) && |
| | 508 | + ($subject->getNamespace() != SMW_NS_ATTRIBUTE) ) { |
| | 509 | + break; |
| 497 | 510 | } |
| 498 | | - } elseif ($value instanceof Title) { |
| 499 | | - if ( $special == SMW_SP_HAS_TYPE ) { // special handling, TODO: change this to use type ids |
| 500 | | - $stringvalue = $value->getText(); |
| 501 | | - } else { |
| 502 | | - $stringvalue = $value->getPrefixedText(); |
| | 511 | + $valueArray = $data->getSpecialValues($special); |
| | 512 | + foreach($valueArray as $value) { |
| | 513 | + if ( $subject->getNamespace() == $value->getNamespace()) { |
| | 514 | + $up_subprops[] = |
| | 515 | + array('subject_title' => $subject->getDBkey(), |
| | 516 | + 'namespace' => $subject->getNamespace(), |
| | 517 | + 'object_title' => $value->getDBKey()); |
| | 518 | + } |
| 503 | 519 | } |
| 504 | | - } else { |
| 505 | | - $stringvalue = $value; |
| 506 | | - } |
| 507 | | - $up_specials[] = |
| 508 | | - array('subject_id' => $subject->getArticleID(), |
| 509 | | - 'subject_namespace' => $subject->getNamespace(), |
| 510 | | - 'subject_title' => $subject->getDBkey(), |
| 511 | | - 'property_id' => $special, |
| 512 | | - 'value_string' => $stringvalue); |
| | 520 | + break; |
| | 521 | + default: // normal special value |
| | 522 | + $valueArray = $data->getSpecialValues($special); |
| | 523 | + foreach($valueArray as $value) { |
| | 524 | + if ($value instanceof SMWDataValue) { |
| | 525 | + if ($value->getXSDValue() !== false) { // filters out error-values etc. |
| | 526 | + $stringvalue = $value->getXSDValue(); |
| | 527 | + } |
| | 528 | + } elseif ($value instanceof Title) { |
| | 529 | + if ( $special == SMW_SP_HAS_TYPE ) { /// TODO: ensure that all types are given as DVs! |
| | 530 | + $stringvalue = $value->getDBKey(); |
| | 531 | + } else { |
| | 532 | + $stringvalue = $value->getPrefixedText(); |
| | 533 | + } |
| | 534 | + } else { |
| | 535 | + $stringvalue = $value; |
| | 536 | + } |
| | 537 | + $up_specials[] = |
| | 538 | + array('subject_id' => $subject->getArticleID(), |
| | 539 | + 'subject_namespace' => $subject->getNamespace(), |
| | 540 | + 'subject_title' => $subject->getDBkey(), |
| | 541 | + 'property_id' => $special, |
| | 542 | + 'value_string' => $stringvalue); |
| | 543 | + } |
| | 544 | + break; |
| 513 | 545 | } |
| 514 | 546 | } |
| 515 | 547 | |
| 516 | 548 | // write to DB: |
| 517 | 549 | if (count($up_relations) > 0) { |
| 518 | | - $db->insert( $db->tableName('smw_relations'), $up_relations, 'SMW::updateRelData'); |
| | 550 | + $db->insert( 'smw_relations', $up_relations, 'SMW::updateRelData'); |
| 519 | 551 | } |
| 520 | 552 | if (count($up_attributes) > 0) { |
| 521 | | - $db->insert( $db->tableName('smw_attributes'), $up_attributes, 'SMW::updateAttData'); |
| | 553 | + $db->insert( 'smw_attributes', $up_attributes, 'SMW::updateAttData'); |
| 522 | 554 | } |
| 523 | 555 | if (count($up_longstrings) > 0) { |
| 524 | | - $db->insert( $db->tableName('smw_longstrings'), $up_longstrings, 'SMW::updateLongData'); |
| | 556 | + $db->insert( 'smw_longstrings', $up_longstrings, 'SMW::updateLongData'); |
| 525 | 557 | } |
| 526 | 558 | if (count($up_specials) > 0) { |
| 527 | | - $db->insert( $db->tableName('smw_specialprops'), $up_specials, 'SMW::updateSpecData'); |
| | 559 | + $db->insert( 'smw_specialprops', $up_specials, 'SMW::updateSpecData'); |
| 528 | 560 | } |
| | 561 | + if (count($up_subprops) > 0) { |
| | 562 | + $db->insert( 'smw_subprops', $up_subprops, 'SMW::updateSubPropData'); |
| | 563 | + } |
| 529 | 564 | } |
| 530 | 565 | |
| 531 | 566 | function changeTitle(Title $oldtitle, Title $newtitle, $keepid = true) { |
| — | — | @@ -534,7 +569,7 @@ |
| 535 | 570 | 'subject_namespace' => $oldtitle->getNamespace() ); |
| 536 | 571 | $val_array = array( 'subject_title' => $newtitle->getDBkey(), |
| 537 | 572 | 'subject_namespace' => $newtitle->getNamespace() ); |
| 538 | | - |
| | 573 | + |
| 539 | 574 | // don't do this by default, since the ids you get when moving articles |
| 540 | 575 | // are not the ones from the old article and the new one (in reality, the |
| 541 | 576 | // $old_title refers to the newly generated redirect article, which does |
| — | — | @@ -550,10 +585,18 @@ |
| 551 | 586 | } |
| 552 | 587 | } |
| 553 | 588 | |
| 554 | | - $db->update($db->tableName('smw_relations'), $val_array, $cond_array, 'SMW::changeTitle'); |
| 555 | | - $db->update($db->tableName('smw_attributes'), $val_array, $cond_array, 'SMW::changeTitle'); |
| 556 | | - $db->update($db->tableName('smw_longstrings'), $val_array, $cond_array, 'SMW::changeTitle'); |
| 557 | | - $db->update($db->tableName('smw_specialprops'), $val_array, $cond_array, 'SMW::changeTitle'); |
| | 589 | + $db->update('smw_relations', $val_array, $cond_array, 'SMW::changeTitle'); |
| | 590 | + $db->update('smw_attributes', $val_array, $cond_array, 'SMW::changeTitle'); |
| | 591 | + $db->update('smw_longstrings', $val_array, $cond_array, 'SMW::changeTitle'); |
| | 592 | + $db->update('smw_specialprops', $val_array, $cond_array, 'SMW::changeTitle'); |
| | 593 | + |
| | 594 | + if ( ($oldtitle->getNamespace() == SMW_NS_ATTRIBUTE) || ($oldtitle->getNamespace() == SMW_NS_RELATION) ) { |
| | 595 | + if ( $oldtitle->getNamespace() == $newtitle->getNamespace() ) { |
| | 596 | + $db->update('smw_subprops', array('subject_title' => $newtitle->getDBkey()), array('subject_title' => $oldtitle->getDBkey()), 'SMW::changeTitle'); |
| | 597 | + } else { |
| | 598 | + $db->delete('smw_subprops', array('subject_title' => $oldtitle->getDBKey()), 'SMW::changeTitle'); |
| | 599 | + } |
| | 600 | + } |
| 558 | 601 | } |
| 559 | 602 | |
| 560 | 603 | ///// Query answering ///// |
| — | — | @@ -688,52 +731,57 @@ |
| 689 | 732 | function setup($verbose = true) { |
| 690 | 733 | global $wgDBname; |
| 691 | 734 | $this->reportProgress("Setting up standard database configuration for SMW ...\n\n",$verbose); |
| 692 | | - |
| 693 | | - $fname = 'SMW::setupDatabase'; |
| 694 | 735 | $db =& wfGetDB( DB_MASTER ); |
| 695 | 736 | |
| 696 | | - extract( $db->tableNames('smw_relations','smw_attributes','smw_longstrings','smw_specialprops') ); |
| | 737 | + extract( $db->tableNames('smw_relations','smw_attributes','smw_longstrings','smw_specialprops','smw_subprops') ); |
| 697 | 738 | |
| 698 | 739 | // create relation table |
| 699 | 740 | $this->setupTable($smw_relations, |
| 700 | 741 | array('subject_id' => 'INT(8) UNSIGNED NOT NULL', |
| 701 | | - 'subject_namespace' => 'INT(11) NOT NULL', |
| 702 | | - 'subject_title' => 'VARCHAR(255) NOT NULL', |
| 703 | | - 'relation_title' => 'VARCHAR(255) NOT NULL', |
| 704 | | - 'object_namespace' => 'INT(11) NOT NULL', |
| 705 | | - 'object_title' => 'VARCHAR(255) NOT NULL'), $db, $verbose); |
| | 742 | + 'subject_namespace' => 'INT(11) NOT NULL', |
| | 743 | + 'subject_title' => 'VARCHAR(255) NOT NULL', |
| | 744 | + 'relation_title' => 'VARCHAR(255) NOT NULL', |
| | 745 | + 'object_namespace' => 'INT(11) NOT NULL', |
| | 746 | + 'object_title' => 'VARCHAR(255) NOT NULL'), $db, $verbose); |
| 706 | 747 | $this->setupIndex($smw_relations, array('subject_id','relation_title','object_title,object_namespace'), $db); |
| 707 | 748 | |
| 708 | 749 | // create attribute table |
| 709 | 750 | $this->setupTable($smw_attributes, |
| 710 | 751 | array('subject_id' => 'INT(8) UNSIGNED NOT NULL', |
| 711 | | - 'subject_namespace' => 'INT(11) NOT NULL', |
| 712 | | - 'subject_title' => 'VARCHAR(255) NOT NULL', |
| 713 | | - 'attribute_title' => 'VARCHAR(255) NOT NULL', |
| 714 | | - 'value_unit' => 'VARCHAR(63)', |
| 715 | | - 'value_datatype' => 'VARCHAR(31) NOT NULL', /// TODO: remove value_datatype column |
| 716 | | - 'value_xsd' => 'VARCHAR(255) NOT NULL', |
| 717 | | - 'value_num' => 'DOUBLE'), $db, $verbose); |
| | 752 | + 'subject_namespace' => 'INT(11) NOT NULL', |
| | 753 | + 'subject_title' => 'VARCHAR(255) NOT NULL', |
| | 754 | + 'attribute_title' => 'VARCHAR(255) NOT NULL', |
| | 755 | + 'value_unit' => 'VARCHAR(63)', |
| | 756 | + 'value_datatype' => 'VARCHAR(31) NOT NULL', /// TODO: remove value_datatype column |
| | 757 | + 'value_xsd' => 'VARCHAR(255) NOT NULL', |
| | 758 | + 'value_num' => 'DOUBLE'), $db, $verbose); |
| 718 | 759 | $this->setupIndex($smw_attributes, array('subject_id','attribute_title','value_num','value_xsd'), $db); |
| 719 | 760 | |
| 720 | 761 | // create table for long string attributes |
| 721 | 762 | $this->setupTable($smw_longstrings, |
| 722 | 763 | array('subject_id' => 'INT(8) UNSIGNED NOT NULL', |
| 723 | | - 'subject_namespace' => 'INT(11) NOT NULL', |
| 724 | | - 'subject_title' => 'VARCHAR(255) NOT NULL', |
| 725 | | - 'attribute_title' => 'VARCHAR(255) NOT NULL', |
| 726 | | - 'value_blob' => 'MEDIUMBLOB'), $db, $verbose); |
| | 764 | + 'subject_namespace' => 'INT(11) NOT NULL', |
| | 765 | + 'subject_title' => 'VARCHAR(255) NOT NULL', |
| | 766 | + 'attribute_title' => 'VARCHAR(255) NOT NULL', |
| | 767 | + 'value_blob' => 'MEDIUMBLOB'), $db, $verbose); |
| 727 | 768 | $this->setupIndex($smw_longstrings, array('subject_id','attribute_title'), $db); |
| 728 | 769 | |
| 729 | 770 | // create table for special properties |
| 730 | 771 | $this->setupTable($smw_specialprops, |
| 731 | 772 | array('subject_id' => 'INT(8) UNSIGNED NOT NULL', |
| 732 | | - 'subject_namespace' => 'INT(11) NOT NULL', |
| 733 | | - 'subject_title' => 'VARCHAR(255) NOT NULL', |
| 734 | | - 'property_id' => 'SMALLINT(6) NOT NULL', |
| 735 | | - 'value_string' => 'VARCHAR(255) NOT NULL'), $db, $verbose); |
| | 773 | + 'subject_namespace' => 'INT(11) NOT NULL', |
| | 774 | + 'subject_title' => 'VARCHAR(255) NOT NULL', |
| | 775 | + 'property_id' => 'SMALLINT(6) NOT NULL', |
| | 776 | + 'value_string' => 'VARCHAR(255) NOT NULL'), $db, $verbose); |
| 736 | 777 | $this->setupIndex($smw_specialprops, array('subject_id', 'property_id'), $db); |
| 737 | 778 | |
| | 779 | + // create table for subproperty relationships |
| | 780 | + $this->setupTable($smw_subprops, |
| | 781 | + array('subject_title' => 'VARCHAR(255) NOT NULL', |
| | 782 | + 'namespace' => 'INT(11) NOT NULL', // will be obsolete when collapsing attribs+rels |
| | 783 | + 'object_title' => 'VARCHAR(255) NOT NULL'), $db, $verbose); |
| | 784 | + $this->setupIndex($smw_subprops, array('subject_title', 'namespace', 'object_title'), $db); |
| | 785 | + |
| 738 | 786 | $this->reportProgress("Database initialised successfully.\n",$verbose); |
| 739 | 787 | return true; |
| 740 | 788 | } |
| — | — | @@ -1235,8 +1283,8 @@ |
| 1236 | 1284 | * in the given DB table. |
| 1237 | 1285 | */ |
| 1238 | 1286 | protected function setupIndex($table, $columns, $db) { |
| 1239 | | - $fname = 'SMW::SetupIndex'; |
| 1240 | | - $res = $db->query( 'SHOW INDEX FROM ' . $table , $fname); |
| | 1287 | + $table = $db->tableName($table); |
| | 1288 | + $res = $db->query( 'SHOW INDEX FROM ' . $table , 'SMW::SetupIndex'); |
| 1241 | 1289 | if ( !$res ) { |
| 1242 | 1290 | return false; |
| 1243 | 1291 | } |
| — | — | @@ -1252,13 +1300,13 @@ |
| 1253 | 1301 | if ( $id !== false ) { |
| 1254 | 1302 | $columns[$id] = false; |
| 1255 | 1303 | } else { // duplicate or unrequired index |
| 1256 | | - $db->query( 'DROP INDEX ' . $key . ' ON ' . $table); |
| | 1304 | + $db->query( 'DROP INDEX ' . $key . ' ON ' . $table, 'SMW::SetupIndex'); |
| 1257 | 1305 | } |
| 1258 | 1306 | } |
| 1259 | 1307 | |
| 1260 | 1308 | foreach ($columns as $column) { // add remaining indexes |
| 1261 | 1309 | if ($column != false) { |
| 1262 | | - $db->query( "ALTER TABLE $table ADD INDEX ( $column )", $fname ); |
| | 1310 | + $db->query( "ALTER TABLE $table ADD INDEX ( $column )", 'SMW::SetupIndex'); |
| 1263 | 1311 | } |
| 1264 | 1312 | } |
| 1265 | 1313 | return true; |