Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-20533 - avoid errors when creating missing indices. #10414

Closed
wants to merge 3 commits into from
Closed

CRM-20533 - avoid errors when creating missing indices. #10414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49043f5
CRM-20533 - avoid errors when creating missing indices.
jmcclelland May 24, 2017
32d6e82
CRM-20533 - style fixes.
jmcclelland May 24, 2017
32770ae
CRM-20533 - take advantage of code that detects duplicate indexes
jmcclelland Jul 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 47 additions & 5 deletions CRM/Core/BAO/SchemaHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,15 +759,57 @@ public static function getMissingIndices() {
*
* @param array $missingIndices as returned by getMissingIndices()
*/
public static function createMissingIndices($missingIndices) {
public static function createMissingIndices($missingIndices, $existingKeyIndices = array()) {
$queries = array();
foreach ($missingIndices as $table => $indexList) {
// Iterate over each missing index for this table.
foreach ($indexList as $index) {
$queries[] = "CREATE " .
(array_key_exists('unique', $index) && $index['unique'] ? 'UNIQUE ' : '') .
"INDEX {$index['name']} ON {$table} (" .
implode(", ", $index['field']) .
// If an index is used for a foreign key, we have to remove the
// foreign key before we can remove the index. We have to keep
// track of any foreign keys we remove so we can put them back
// when we are done.
$existing_foreign_keys = array();

// An index can reference multiple fields, check each field for a
// correspending foreign key.
foreach ($index['field'] as $field) {
$sql = "SELECT u.CONSTRAINT_NAME, u.COLUMN_NAME, u.REFERENCED_COLUMN_NAME,
u.REFERENCED_TABLE_NAME, UPDATE_RULE, DELETE_RULE FROM
information_schema.KEY_COLUMN_USAGE u JOIN information_schema.REFERENTIAL_CONSTRAINTS c ON
u.CONSTRAINT_NAME = c.CONSTRAINT_NAME
WHERE u.COLUMN_NAME = %0 AND u.TABLE_NAME = %1";
$params = array(0 => array($field, 'String'), 1 => array($table, 'String'));
$dao = CRM_Core_DAO::executeQuery($sql, $params);
while ($dao->fetch()) {
// Keep track of this foreign key.
$existing_foreign_keys[$dao->CONSTRAINT_NAME] = array(
'table_name' => $dao->REFERENCED_TABLE_NAME,
'column_name' => $dao->COLUMN_NAME,
'referenced_column_name' => $dao->REFERENCED_COLUMN_NAME,
'on_delete' => $dao->DELETE_RULE,
);
// And now kill it.
CRM_Core_BAO_SchemaHandler::safeRemoveFK($table, $dao->CONSTRAINT_NAME);
}
}
// If the index exists, we preface with a DROP statement.
// See if the index exists.
$index_exists = FALSE;
if (array_key_exists($table, $existingKeyIndices) && in_array($index['name'], $existingKeyIndices[$table])) {
$index_exists = TRUE;
}
$queries[] = "ALTER TABLE $table " .
($index_exists ? 'DROP INDEX ' . $index['name'] . ', ' : '') .
'ADD ' .
(array_key_exists('unique', $index) && $index['unique'] ? 'UNIQUE ' : '') .
"INDEX {$index['name']} (" . implode(", ", $index['field']) .
")";
foreach ($existing_foreign_keys as $foreign_key_name => $foreign_key) {
$queries[] = "ALTER TABLE {$table} ADD CONSTRAINT `{$foreign_key_name}`
FOREIGN KEY (`{$foreign_key['column_name']}`) REFERENCES
`{$foreign_key['table_name']}` (`{$foreign_key['referenced_column_name']}`)
ON DELETE {$foreign_key['on_delete']};";
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions api/v3/System.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ function civicrm_api3_system_updatelogtables() {
* This adds any indexes that exist in the schema but not the database.
*/
function civicrm_api3_system_updateindexes() {
list($missingIndices) = CRM_Core_BAO_SchemaHandler::getMissingIndices();
CRM_Core_BAO_SchemaHandler::createMissingIndices($missingIndices);
list($missingIndices, $existingKeyIndices) = CRM_Core_BAO_SchemaHandler::getMissingIndices();
CRM_Core_BAO_SchemaHandler::createMissingIndices($missingIndices, $existingKeyIndices);
return civicrm_api3_create_success(1);
}