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.

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

CiviGrant - Don't auto-create any grant types #22913

Merged
merged 1 commit into from
Mar 9, 2022

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Mar 9, 2022

Port of #22905 for 5.48

@civibot
Copy link

civibot bot commented Mar 9, 2022

(Standard links)

@civibot civibot bot added the 5.48 label Mar 9, 2022
@colemanw colemanw merged commit 540ac54 into civicrm:5.48 Mar 9, 2022
@colemanw
Copy link
Member Author

colemanw commented Mar 9, 2022

The 5.47 PR has been merged. Merging this one.

@colemanw colemanw deleted the civiGrantTypes2 branch March 9, 2022 16:29
@demeritcowboy
Copy link
Contributor

Something got missed here - the sql file doesn't run without a corresponding task to runSQL. Since it's in beta1.mysql, it needs the corresponding php func. PR coming.

@colemanw
Copy link
Member Author

colemanw commented Mar 13, 2022

@demeritcowboy are you sure about that? This function says it grabs upgrade steps directly from the mysql.tpl files:

/**
* Get a list of all patch-versions that appear in upgrade steps, whether
* as *.mysql.tpl or as *.php.
*
* @return array
* @throws Exception
*/
public function getRevisionSequence() {
$revList = [];
foreach (self::incrementalPhpObjectVersions() as $majorMinor) {
$phpUpgrader = self::incrementalPhpObject($majorMinor);
$revList = array_merge($revList, array_values($phpUpgrader->getRevisionSequence()));
}
usort($revList, 'version_compare');
return $revList;
}

And down here, for each upgrade step it will run the php upgrader if it exists OR just the sql file:

if (is_callable([$versionObject, $phpFunctionName])) {
$versionObject->$phpFunctionName($rev, $originalVer, $latestVer);
}
else {
$upgrade->processSQL($rev);
}

@demeritcowboy
Copy link
Contributor

Something similar came up earlier too and I thought I had tracked it down to the upgrade steps not running. For this one, starting from 5.48.alpha1, if I run the upgrade, here are the steps that it logs. Maybe it's just a logging issue.

Mar 13 11:39:30  [info] Running task: Cleanup old files


Mar 13 11:39:30  [info] Running task: Checking extensions


Mar 13 11:39:30  [info] Running task: Begin Upgrade to 5.48.beta1


Mar 13 11:39:30  [info] Running task: Upgrade DB to 5.48.beta1


Mar 13 11:39:31  [info] Running task: Finish Upgrade DB to 5.48.beta1


Mar 13 11:39:31  [info] Running task: Begin Upgrade to 5.49.alpha1


Mar 13 11:39:31  [info] Running task: Upgrade DB to 5.49.alpha1


Mar 13 11:39:31  [info] Running task: Upgrade DB to 5.49.alpha1: SQL


Mar 13 11:39:32  [info] Running task: Finish Upgrade DB to 5.49.alpha1


Mar 13 11:39:32  [info] Running task: Finish core DB updates 5.49.alpha1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants