dev/core#2961 fix upgrade bug on civicrm_note + logging

[eileenmcnaughton]

Overview

dev/core#2961 fix upgrade bug on civicrm_note + logging

Before

Reported issues with upgrade failure on 5.37 upgrade - these appear to be because we create a new field and then attempt to populate it before taking any action that would cause the corresponding log table field to be created

After

Create the new field in the log table straight after the field is created via the script

Technical Details

Normally we reconcile logging tables are the end - however in this case we try to populate it straight away ....

I did think we turned off logging before trying to upgrade?

ALTER TABLE civicrm_note ADD COLUMN `note_date` timestamp NULL  DEFAULT CURRENT_TIMESTAMP COMMENT 'Date attached to the note';
ALTER TABLE civicrm_note ADD COLUMN `created_date` timestamp NULL  DEFAULT CURRENT_TIMESTAMP COMMENT 'When the note was created';
UPDATE civicrm_note SET note_date = modified_date, created_date = modified_date, modified_date = modified_date;

Comments

https://lab.civicrm.org/dev/core/-/issues/2961

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[colemanw]

This looks like the right fix, but probably should be against the RC branch?

[eileenmcnaughton]

@colemanw yeah - it's not a very recent regression though

[eileenmcnaughton]

test this please

[totten]

@seamuslee001 and I both agreed the concept here is good. However, the test failures do seem relevant:

    CivicrmUpgradeTest.4_6_0-setupsh_sql_bz2
    CivicrmUpgradeTest.4_6_11-setupsh_sql_bz2
    CivicrmUpgradeTest.4_6_36-setupsh_sql_bz2
    CivicrmUpgradeTest.4_7_0-setupsh_sql_bz2

I think if we can fix this early during RC cycle, then we can switch it to RC.

[eileenmcnaughton]

closing for now - needs work

[J0WI]

Thanks, this fixed the upgrade to 5.37 for me.