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

Schema handler fixes #18932

Merged
merged 2 commits into from
Nov 6, 2020
Merged

Schema handler fixes #18932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5efbfaf
SchemaHandler - Remove unused/deprecated function
colemanw Nov 5, 2020
03e3a32
CustomField - simplify tableName lookup during bulkSave and fix bug
colemanw Nov 5, 2020
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
18 changes: 5 additions & 13 deletions CRM/Core/BAO/CustomField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,25 +114,17 @@ public static function create($params) {
* @throws \CiviCRM_API3_Exception
*/
public static function bulkSave($bulkParams, $defaults = []) {
$addedColumns = $sql = $tables = $customFields = [];
$addedColumns = $sql = $customFields = [];
foreach ($bulkParams as $index => $fieldParams) {
$params = array_merge($defaults, $fieldParams);
$customField = self::createCustomFieldRecord($params);
$fieldSQL = self::getAlterFieldSQL($customField, empty($params['id']) ? 'add' : 'modify');
if (!isset($params['custom_group_id'])) {
$params['custom_group_id'] = civicrm_api3('CustomField', 'getvalue', ['id' => $customField->id, 'return' => 'custom_group_id']);
}
if (!isset($params['table_name'])) {
if (!isset($tables[$params['custom_group_id']])) {
$tables[$params['custom_group_id']] = civicrm_api3('CustomGroup', 'getvalue', [
'id' => $params['custom_group_id'],
'return' => 'table_name',
]);
}
$params['table_name'] = $tables[$params['custom_group_id']];
}
$sql[$params['table_name']][] = $fieldSQL;
$addedColumns[$params['table_name']][] = $customField->name;
$tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customField->custom_group_id, 'table_name');
$sql[$tableName][] = $fieldSQL;
$addedColumns[$tableName][] = $customField->name;
$customFields[$index] = $customField;
}

Expand All @@ -145,7 +137,7 @@ public static function bulkSave($bulkParams, $defaults = []) {
$logging->fixSchemaDifferencesFor($tableName, ['ADD' => $addedColumns[$tableName]]);
}

Civi::service('sql_triggers')->rebuild($params['table_name'], TRUE);
Civi::service('sql_triggers')->rebuild($tableName, TRUE);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eileenmcnaughton this looks like it was a real bug to me.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes - it would have only updated one - probably in practice that was enough

}
CRM_Utils_System::flushCache();
foreach ($customFields as $index => $customField) {
Expand Down
37 changes: 0 additions & 37 deletions CRM/Core/BAO/SchemaHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,43 +271,6 @@ public static function buildForeignKeySQL($params, $separator, $prefix, $tableNa
return $sql;
}

/**
* @deprecated
*
* @param array $params
* @param bool $indexExist
* @param bool $triggerRebuild
*
* @return bool
*/
public static function alterFieldSQL($params, $indexExist = FALSE, $triggerRebuild = TRUE) {
CRM_Core_Error::deprecatedFunctionWarning('function no longer in use / supported');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep - deprecated Jul 2019

// lets suppress the required flag, since that can cause sql issue
$params['required'] = FALSE;

$sql = self::buildFieldChangeSql($params, $indexExist);

// CRM-7007: do not i18n-rewrite this query
CRM_Core_DAO::executeQuery($sql, [], TRUE, NULL, FALSE, FALSE);

$config = CRM_Core_Config::singleton();
if ($config->logging) {
// CRM-16717 not sure why this was originally limited to add.
// For example custom tables can have field length changes - which need to flow through to logging.
// Are there any modifies we DON'T was to call this function for (& shouldn't it be clever enough to cope?)
if ($params['operation'] == 'add' || $params['operation'] == 'modify') {
$logging = new CRM_Logging_Schema();
$logging->fixSchemaDifferencesFor($params['table_name'], [trim(strtoupper($params['operation'])) => [$params['name']]]);
}
}

if ($triggerRebuild) {
Civi::service('sql_triggers')->rebuild($params['table_name'], TRUE);
}

return TRUE;
}

/**
* Delete a CiviCRM-table.
*
Expand Down