CRM-15361, CRM-15857 - Set default location_type_id

The default value of '0' is invalid. It should be NULL.

In the original UI for location_type_id (patched but unreleased for 4.6),
the default behavior was to set the value to NULL, so it seems implicit that
NULL is an acceptable value.

diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha7.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha7.mysql.tpl
index 38d8c389ea9ee02513f2578d15fcb561ec18b074..d27ff06717d63cb00435cc7b839860160e68499a 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha7.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha7.mysql.tpl
@@ -1 +1,4 @@
-{* file to handle db changes in 4.6.alpha7 during upgrade *}
\ No newline at end of file
+{* file to handle db changes in 4.6.alpha7 during upgrade *}
+
+-- location_type_id should have default NULL, not invalid id 0
+ALTER TABLE civicrm_mailing CHANGE `location_type_id` `location_type_id` int(10) unsigned DEFAULT NULL COMMENT 'With email_selection_method, determines which email address to use';

diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml
index 32dc35f45529033f6e704184453a36aadfef7a8e..872f7de10fcc276399f6f5142efe6701c9d2a0d3 100644 (file)
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@ -399,7 +399,6 @@
     <name>location_type_id</name>
     <title>Location Type</title>
     <type>int unsigned</type>
-    <default>0</default>
     <comment>With email_selection_method, determines which email address to use</comment>
     <pseudoconstant>
       <table>civicrm_location_type</table>