From 9c16319bdeb39986b28ce6bde64d19eae0bc0cff Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 12 Nov 2019 21:54:12 -0800 Subject: [PATCH] (dev/core#1387) Remove config_backend from sample/dev setup --- bin/regen.sh | 2 +- bin/setup.sh | 4 ++-- sql/civicrm_generated.mysql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/regen.sh b/bin/regen.sh index f975c2e88a..0af6490e58 100755 --- a/bin/regen.sh +++ b/bin/regen.sh @@ -48,7 +48,7 @@ cms_eval 'civicrm_initialize();' php GenerateData.php ## Prune local data -$MYSQLCMD -e "DROP TABLE zipcodes; DROP TABLE IF EXISTS civicrm_install_canary; UPDATE civicrm_domain SET config_backend = NULL; DELETE FROM civicrm_extension; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;" +$MYSQLCMD -e "DROP TABLE zipcodes; DROP TABLE IF EXISTS civicrm_install_canary; DELETE FROM civicrm_extension; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;" TABLENAMES=$( echo "show tables like 'civicrm_%'" | $MYSQLCMD | grep ^civicrm_ | xargs ) cd $CIVISOURCEDIR/sql diff --git a/bin/setup.sh b/bin/setup.sh index cabd301038..683bf5775c 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -211,9 +211,9 @@ fi if [ -n "$DO_FLUSH" ]; then pushd "$CALLEDPATH/.." - # reset config_backend and userFrameworkResourceURL which gets set + # reset userFrameworkResourceURL which gets set # when config object is initialized - $MYSQLCMD -e "UPDATE civicrm_domain SET config_backend = NULL; UPDATE civicrm_setting SET value = NULL WHERE name = 'userFrameworkResourceURL';" + $MYSQLCMD -e "UPDATE civicrm_setting SET value = NULL WHERE name = 'userFrameworkResourceURL';" popd fi diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index 028e6b5034..6a1ab8980c 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -399,7 +399,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; -INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.23.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); +INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.23.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; -- 2.25.1