From 643910b01e8873d0cea57d347401c5c2d8a66c1f Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Wed, 21 Oct 2020 14:44:36 +1100 Subject: [PATCH] [REF] Include contributioncancelactions extension in dismaker and regenerate civicrm_generated --- bin/regen.sh | 2 +- distmaker/dists/common.sh | 1 + sql/civicrm_generated.mysql | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/regen.sh b/bin/regen.sh index 42cb64cdc3..84f49fd034 100755 --- a/bin/regen.sh +++ b/bin/regen.sh @@ -47,7 +47,7 @@ php GenerateData.php ## Prune local data $MYSQLCMD -e "DROP TABLE IF EXISTS civicrm_install_canary; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;" -$MYSQLCMD -e "DELETE FROM civicrm_extension WHERE full_name NOT IN ('sequentialcreditnotes', 'eventcart', 'greenwich', 'search', 'flexmailer', 'financialacls');" +$MYSQLCMD -e "DELETE FROM civicrm_extension WHERE full_name NOT IN ('sequentialcreditnotes', 'eventcart', 'greenwich', 'search', 'flexmailer', 'financialacls', 'contributioncancelactions');" TABLENAMES=$( echo "show tables like 'civicrm_%'" | $MYSQLCMD | grep ^civicrm_ | xargs ) cd $CIVISOURCEDIR/sql diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh index e882e0a16d..c54cec4215 100644 --- a/distmaker/dists/common.sh +++ b/distmaker/dists/common.sh @@ -126,6 +126,7 @@ function dm_core_exts() { echo ext/financialacls echo ext/afform echo ext/greenwich + echo ext/contributioncancelactions } ## Copy all packages diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index 59e1f9d52b..9dc4f82281 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -495,7 +495,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_extension` WRITE; /*!40000 ALTER TABLE `civicrm_extension` DISABLE KEYS */; -INSERT INTO `civicrm_extension` (`id`, `type`, `full_name`, `name`, `label`, `file`, `schema_version`, `is_active`) VALUES (1,'module','sequentialcreditnotes','Sequential credit notes','Sequential credit notes','sequentialcreditnotes',NULL,1),(2,'module','greenwich','Theme: Greenwich','Theme: Greenwich','greenwich',NULL,1),(3,'module','eventcart','Event cart','Event cart','eventcart',NULL,1),(4,'module','financialacls','Financial ACLs','Financial ACLs','financialacls',NULL,1); +INSERT INTO `civicrm_extension` (`id`, `type`, `full_name`, `name`, `label`, `file`, `schema_version`, `is_active`) VALUES (1,'module','sequentialcreditnotes','Sequential credit notes','Sequential credit notes','sequentialcreditnotes',NULL,1),(2,'module','greenwich','Theme: Greenwich','Theme: Greenwich','greenwich',NULL,1),(3,'module','eventcart','Event cart','Event cart','eventcart',NULL,1),(4,'module','financialacls','Financial ACLs','Financial ACLs','financialacls',NULL,1),(5,'module','contributioncancelactions','Contribution cancel actions','Contribution cancel actions','contributioncancelactions',NULL,1); /*!40000 ALTER TABLE `civicrm_extension` ENABLE KEYS */; UNLOCK TABLES; -- 2.25.1