Update upgrade process to support churchinfo 1.3.1 #6896

DawoudIO · 2024-02-28T17:27:30Z

Description & Issue number it closes

We only supported 1.3.0 of church info for upgrade, this add 1.3.1

Screenshots (if appropriate)

How to test the changes?

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

How Has This Been Tested?

Checklist:

My code follows the style guidelines of this project
I have performed a self-review of my code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes
Any dependent changes have been merged and published in downstream modules

DAcodedBEAT

Approved, just curious if this is tested or a best-effort case?

DawoudIO · 2024-02-28T21:02:06Z

it is not tested, the PR is to help with the person who is stuck and posted a Q... I hope he can share that it worked if not we will keep updating this PR.

DAcodedBEAT · 2024-03-08T17:20:45Z

src/mysql/upgrade/2.10.0.sql

-    ADD COLUMN `event_publicly_visible` BOOLEAN DEFAULT FALSE AFTER `event_grpid`;
-END IF;
+ALTER TABLE events_event
+    ADD COLUMN event_publicly_visible BOOLEAN DEFAULT FALSE AFTER event_grpid;


I added the IF NOT EXISTS conditional to ensure that the migrations are replayable so users facing upgrade issues can manually re-invoke the sql and not have to investigate every single change to the schema along the way.

DAcodedBEAT · 2024-03-08T17:23:04Z

src/mysql/upgrade/2.0.0.sql

+alter table version_ver add `ver_update_start` datetime DEFAULT NULL;
+
+alter table version_ver add `ver_update_end` datetime DEFAULT NULL;
+
+alter table version_ver drop column `ver_date`;


In the same spirit as #6831 , we should make our migrations replayable to avoid issues on re-run

DAcodedBEAT · 2024-03-08T17:23:33Z

src/mysql/upgrade/2.4.0.sql

-CALL DropColumnIfExists('user_usr', 'usr_BaseFontSize');
-CALL DropColumnIfExists('user_usr', 'usr_Communication');
-CALL DropColumnIfExists('user_usr', 'usr_Workspacewidth');
+alter table user_usr drop column `usr_BaseFontSize`;


why was this edited?

DAcodedBEAT · 2024-03-08T17:23:40Z

src/mysql/upgrade/2.6.0.sql

-CALL DropColumnIfExists('config_cfg', 'cfg_data');
-
-DROP PROCEDURE IF EXISTS DropColumnIfExists;
+alter table config_cfg drop column `cfg_type`;


why was this edited?

DAcodedBEAT · 2024-03-08T17:23:46Z

src/mysql/upgrade/2.7.0.sql

-
-CALL AddColumnIfNotExists('group_grp', 'grp_active', 'BOOLEAN NOT NULL DEFAULT 1 AFTER grp_hasSpecialProps');
-CALL AddColumnIfNotExists('group_grp', 'grp_include_email_export', 'BOOLEAN NOT NULL DEFAULT 1 AFTER grp_active');
+ALTER TABLE group_grp ADD grp_active BOOLEAN  DEFAULT 1 NOT NULL AFTER grp_hasSpecialProps;


why was this edited?

DAcodedBEAT · 2024-03-08T17:24:09Z

src/mysql/upgrade/2.9.0.sql

-- CALL AddColumnIfNotExists('person_per', 'per_FacebookID', 'bigint(20) unsigned default NULL AFTER per_Flags');
-CALL AddColumnIfNotExists('person_per', 'per_Twitter', 'varchar(50) default NULL AFTER per_Flags');
-CALL AddColumnIfNotExists('person_per', 'per_LinkedIn', 'varchar(50) default NULL AFTER per_Twitter');
+ALTER TABLE person_per ADD COLUMN per_Twitter varchar(50) default NULL AFTER per_Flags;


why was this edited?

DAcodedBEAT · 2024-03-08T17:24:16Z

src/mysql/upgrade/3.0.0.sql

-CALL AddColumnIfNotExists('events_event', 'primary_contact_person_id', 'INT DEFAULT NULL AFTER `location_id`');
-CALL AddColumnIfNotExists('events_event', 'secondary_contact_person_id', 'INT DEFAULT NULL AFTER `primary_contact_person_id`');
-CALL AddColumnIfNotExists('events_event', 'event_url', 'text DEFAULT NULL AFTER `secondary_contact_person_id`');
+ALTER TABLE events_event ADD COLUMN location_id INT DEFAULT NULL AFTER `event_typename`;


why was this edited?

DAcodedBEAT · 2024-03-08T17:24:22Z

src/mysql/upgrade/4.0.0-TwoFactorAuth.sql

-CALL AddColumnIfNotExists('user_usr', 'usr_TwoFactorAuthRecoveryCodes', 'TEXT NULL AFTER `usr_TwoFactorAuthLastKeyTimestamp');
-
-DROP PROCEDURE IF EXISTS AddColumnIfNotExists;
+ALTER TABLE user_usr ADD COLUMN usr_TwoFactorAuthSecret VARCHAR(255) NULL AFTER `usr_Canvasser`;


why was this edited?

DAcodedBEAT · 2024-03-08T17:24:31Z

src/mysql/upgrade/4.1.0-cleanup.sql

-
-/* drop the procedure after usage */
-DROP PROCEDURE IF EXISTS DropIndexIfExists;
+ALTER TABLE canvassdata_can DROP INDEX can_ID;


why was this edited?

DAcodedBEAT · 2024-03-08T17:24:38Z

src/mysql/upgrade/4.4.0-FB.sql

-    column_name = 'per_Facebook'
-)  THEN
-    ALTER TABLE person_per
+ALTER TABLE person_per


why was this edited?

DawoudIO · 2024-03-08T19:03:34Z

Main issue is all these functions did not work with our upgrade script, something changes in how we load the SQL from the files and It was faster to move from functions to just standard SQL.

Update upgrade.json

3873c39

DawoudIO requested review from MrClever and DAcodedBEAT as code owners February 28, 2024 17:27

DAcodedBEAT approved these changes Feb 28, 2024

View reviewed changes

DawoudIO added the Installation / Upgrade label Feb 28, 2024

DawoudIO added this to the 5.6.0 milestone Feb 28, 2024

DAcodedBEAT modified the milestones: 5.6.0, vNext Feb 29, 2024

DawoudIO added 2 commits March 8, 2024 08:51

working upgrade from 1.3.1 ChurchInfo to 5.5 ChurcCRM

cb71a7b

Merge branch 'master' into churchinfo/1.3.1

9d93bc0

DawoudIO modified the milestones: vNext, 6.7.0 Mar 8, 2024

DAcodedBEAT requested changes Mar 8, 2024

View reviewed changes

DawoudIO modified the milestones: 6.7.0, 5.7.0 Mar 8, 2024

DawoudIO merged commit cc97add into master Mar 13, 2024
4 checks passed

DawoudIO deleted the churchinfo/1.3.1 branch March 13, 2024 02:18

DAcodedBEAT added the php Pull requests that update Php code label Apr 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update upgrade process to support churchinfo 1.3.1 #6896

Update upgrade process to support churchinfo 1.3.1 #6896

DawoudIO commented Feb 28, 2024

DAcodedBEAT left a comment

DawoudIO commented Feb 28, 2024

DAcodedBEAT Mar 8, 2024

DAcodedBEAT Mar 8, 2024

DAcodedBEAT Mar 8, 2024

DAcodedBEAT Mar 8, 2024

DAcodedBEAT Mar 8, 2024

DAcodedBEAT Mar 8, 2024

DAcodedBEAT Mar 8, 2024

DAcodedBEAT Mar 8, 2024

DAcodedBEAT Mar 8, 2024

DAcodedBEAT Mar 8, 2024

DawoudIO commented Mar 8, 2024

Update upgrade process to support churchinfo 1.3.1 #6896

Update upgrade process to support churchinfo 1.3.1 #6896

Conversation

DawoudIO commented Feb 28, 2024

Description & Issue number it closes

Screenshots (if appropriate)

How to test the changes?

Type of change

How Has This Been Tested?

Checklist:

DAcodedBEAT left a comment

Choose a reason for hiding this comment

DawoudIO commented Feb 28, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DawoudIO commented Mar 8, 2024