Skip to content
Snippets Groups Projects
Unverified Commit aceb0383 authored by Eileen McNaughton's avatar Eileen McNaughton Committed by GitHub
Browse files

Merge pull request #18244 from colemanw/drop 

Remove old dropped items from the schema xml
parents 8a29c312 1f7272b1
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 576 deletions
xml/schema/Activity/Activity.xml
+ 0
− 84
View file @ aceb0383
......@@ -21,30 +21,6 @@
<name>id</name>
<autoincrement>true</autoincrement>
</primaryKey>
<field>
<name>source_contact_id</name>
<type>int unsigned</type>
<title>Source Contact</title>
<import>true</import>
<headerPattern>/(activity.)?source(.contact(.id)?)?/i</headerPattern>
<comment>Contact ID of the person scheduling or logging this Activity. Usually the authenticated user.</comment>
<add>1.1</add>
<drop>4.4</drop>
</field>
<foreignKey>
<name>source_contact_id</name>
<table>civicrm_contact</table>
<key>id</key>
<add>1.1</add>
<drop>4.4</drop>
<onDelete>SET NULL</onDelete>
</foreignKey>
<index>
<name>UI_source_contact_id</name>
<fieldName>source_contact_id</fieldName>
<add>2.0</add>
<drop>3.2</drop>
</index>
<field>
<name>source_record_id</name>
<type>int unsigned</type>
......@@ -81,23 +57,6 @@
<fieldName>activity_type_id</fieldName>
<add>1.6</add>
</index>
<field>
<name>target_entity_table</name>
<type>varchar</type>
<length>64</length>
<required>true</required>
<comment>Name of table where item being referenced is stored.</comment>
<add>1.1</add>
<drop>2.0</drop>
</field>
<field>
<name>target_entity_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>Foreign key to the referenced item.</comment>
<add>1.1</add>
<drop>2.0</drop>
</field>
<field>
<name>subject</name>
<uniqueName>activity_subject</uniqueName>
......@@ -113,13 +72,6 @@
<add>1.1</add>
<change>2.0</change>
</field>
<field>
<name>scheduled_date</name>
<type>datetime</type>
<comment>Date and time meeting is scheduled to occur.</comment>
<add>1.1</add>
<drop>2.0</drop>
</field>
<field>
<name>activity_date_time</name>
<import>true</import>
......@@ -141,27 +93,6 @@
<fieldName>activity_date_time</fieldName>
<add>4.7</add>
</index>
<field>
<name>due_date_time</name>
<type>datetime</type>
<comment>Date and time this activity is due.</comment>
<add>2.0</add>
<drop>3.0</drop>
</field>
<field>
<name>duration_hours</name>
<type>int unsigned</type>
<comment>Planned or actual duration of meeting - hours.</comment>
<add>1.1</add>
<drop>2.0</drop>
</field>
<field>
<name>duration_minutes</name>
<type>int unsigned</type>
<comment>Planned or actual duration of meeting - minutes.</comment>
<add>1.1</add>
<drop>2.0</drop>
</field>
<field>
<name>duration</name>
<uniqueName>activity_duration</uniqueName>
......@@ -233,15 +164,6 @@
</html>
<add>1.1</add>
</field>
<field>
<name>status</name>
<type>enum</type>
<title>Status</title>
<values>Scheduled, Completed</values>
<comment>What is the status of this meeting? Completed meeting status results in activity history entry.</comment>
<add>1.1</add>
<drop>2.0</drop>
</field>
<field>
<name>status_id</name>
<uniqueName>activity_status_id</uniqueName>
......@@ -376,12 +298,6 @@
<add>2.2</add>
<onDelete>CASCADE</onDelete>
</foreignKey>
<index>
<name>UI_original_id</name>
<fieldName>original_id</fieldName>
<add>2.2</add>
<drop>3.2</drop>
</index>
<field>
<name>result</name>
<uniqueName>activity_result</uniqueName>
......
xml/schema/Activity/ActivityAssignment.xml
+ 0
− 53
View file @ aceb0383
......@@ -18,59 +18,6 @@
<name>id</name>
<autoincrement>true</autoincrement>
</primaryKey>
<field>
<name>activity_entity_table</name>
<type>varchar</type>
<length>64</length>
<required>true</required>
<comment>Name of table where item being referenced is stored (activity, phonecall or meeting).</comment>
<add>1.8</add>
<drop>2.0</drop>
</field>
<field>
<name>activity_entity_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>Entity (activity, phonecall or meeting) id for which the assigment is created</comment>
<add>1.8</add>
<drop>2.0</drop>
</field>
<dynamicForeignKey>
<idColumn>activity_entity_id</idColumn>
<typeColumn>activity_entity_table</typeColumn>
<add>1.8</add>
<drop>2.0</drop>
</dynamicForeignKey>
<field>
<name>target_entity_table</name>
<type>varchar</type>
<length>64</length>
<required>true</required>
<comment>Name of table where item being referenced is stored (contact assigned to given activity).</comment>
<add>1.8</add>
<drop>2.0</drop>
</field>
<field>
<name>target_entity_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>Foreign key to the referenced item.</comment>
<add>1.1</add>
<drop>2.0</drop>
</field>
<dynamicForeignKey>
<idColumn>target_entity_id</idColumn>
<typeColumn>target_entity_table</typeColumn>
<add>1.8</add>
<drop>2.0</drop>
</dynamicForeignKey>
<field>
<name>activity_id</name>
<type>int unsigned</type>
......
xml/schema/Batch/Batch.xml
+ 0
− 9
View file @ aceb0383
......@@ -35,15 +35,6 @@
<unique>true</unique>
<add>4.2</add>
</index>
<field>
<name>label</name>
<type>varchar</type>
<length>64</length>
<localizable>true</localizable>
<comment>Friendly Name.</comment>
<add>3.3</add>
<drop>4.2</drop>
</field>
<field>
<name>title</name>
<title>Batch Title</title>
......
xml/schema/Case/Case.xml
+ 0
− 62
View file @ aceb0383
......@@ -24,23 +24,6 @@
<name>id</name>
<autoincrement>true</autoincrement>
</primaryKey>
<field>
<name>contact_id</name>
<type>int unsigned</type>
<uniqueName>case_contact_id</uniqueName>
<required>true</required>
<comment>Contact ID of contact record given case belongs to.</comment>
<add>1.8</add>
<drop>2.1</drop>
</field>
<foreignKey>
<name>contact_id</name>
<table>civicrm_contact</table>
<key>id</key>
<add>1.8</add>
<drop>2.1</drop>
<onDelete>CASCADE</onDelete>
</foreignKey>
<field>
<name>case_type_id</name>
<type>int unsigned</type>
......@@ -70,51 +53,6 @@
<key>id</key>
<add>4.5</add>
</foreignKey>
<field>
<name>casetag1_id</name>
<type>varchar</type>
<length>128</length>
<required>true</required>
<comment>Id of first case category.</comment>
<add>1.8</add>
<drop>2.0</drop>
</field>
<index>
<name>index_casetag1_id</name>
<fieldName>casetag1_id</fieldName>
<add>1.8</add>
<drop>2.0</drop>
</index>
<field>
<name>casetag2_id</name>
<type>varchar</type>
<length>128</length>
<required>true</required>
<comment>Id of second case category.</comment>
<add>1.8</add>
<drop>2.0</drop>
</field>
<index>
<name>index_casetag2_id</name>
<fieldName>casetag2_id</fieldName>
<add>1.8</add>
<drop>2.0</drop>
</index>
<field>
<name>casetag3_id</name>
<type>varchar</type>
<length>128</length>
<required>true</required>
<comment>Id of third case category.</comment>
<add>1.8</add>
<drop>2.0</drop>
</field>
<index>
<name>index_casetag3_id</name>
<fieldName>casetag3_id</fieldName>
<add>1.8</add>
<drop>2.0</drop>
</index>
<field>
<name>subject</name>
<type>varchar</type>
......
xml/schema/Case/CaseActivity.xml
+ 0
− 27
View file @ aceb0383
......@@ -54,31 +54,4 @@
<fieldName>activity_id</fieldName>
<add>2.0</add>
</index>
<field>
<name>activity_entity_table</name>
<type>varchar</type>
<length>64</length>
<required>true</required>
<comment>Name of table where item being referenced is stored (activity, phonecall or meeting).</comment>
<add>1.8</add>
<drop>2.0</drop>
</field>
<field>
<name>activity_entity_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>Entity (activity, phonecall or meeting) id for which the assigment is created</comment>
<add>1.8</add>
<drop>2.0</drop>
</field>
<dynamicForeignKey>
<idColumn>activity_entity_id</idColumn>
<typeColumn>activity_entity_table</typeColumn>
<add>1.8</add>
<drop>2.0</drop>
</dynamicForeignKey>
</table>
xml/schema/Contact/Contact.xml
+ 0
− 62
View file @ aceb0383
......@@ -246,19 +246,6 @@
<fulltext/>
<add>1.1</add>
</field>
<field>
<name>home_URL</name>
<rule>url</rule>
<title>Website</title>
<type>varchar</type>
<length>128</length>
<import>true</import>
<headerPattern>/^(home\sURL)|URL|web|site/i</headerPattern>
<dataPattern>/^[\w\/\:\.]+$/</dataPattern>
<comment>optional "home page" URL for this contact.</comment>
<add>1.1</add>
<drop>3.2</drop>
</field>
<field>
<name>image_URL</name>
<type>text</type>
......@@ -509,32 +496,6 @@
<fieldName>communication_style_id</fieldName>
<add>4.4</add>
</index>
<field>
<name>greeting_type</name>
<type>varchar</type>
<length>128</length>
<import>true</import>
<comment>Preferred greeting format.</comment>
<add>1.1</add>
<drop>2.2</drop>
</field>
<field>
<name>greeting_type_id</name>
<title>Greeting Type</title>
<type>int unsigned</type>
<comment>FK to civicrm_option_value.id, that has to be valid, registered Greeting type.</comment>
<add>2.2</add>
<drop>3.0</drop>
</field>
<field>
<name>custom_greeting</name>
<type>varchar</type>
<length>128</length>
<import>true</import>
<comment>Custom greeting message.</comment>
<add>1.1</add>
<drop>3.0</drop>
</field>
<field>
<name>email_greeting_id</name>
<type>int unsigned</type>
......@@ -722,23 +683,6 @@
</html>
<contactType>Individual</contactType>
</field>
<field>
<name>mail_to_household_id</name>
<title>Mail to Household ID</title>
<type>int unsigned</type>
<comment>OPTIONAL FK to civicrm_contact_household record. If NOT NULL, direct mail communications to household rather than individual location. </comment>
<export>true</export>
<add>1.1</add>
<drop>3.3</drop>
</field>
<foreignKey>
<name>mail_to_household_id</name>
<table>civicrm_contact</table>
<key>id</key>
<add>2.1</add>
<onDelete>SET NULL</onDelete>
<drop>3.3</drop>
</foreignKey>
<field>
<name>household_name</name>
<type>varchar</type>
......@@ -859,12 +803,6 @@
</html>
<permission>access deleted contacts</permission>
</field>
<index>
<name>index_is_deleted</name>
<fieldName>is_deleted</fieldName>
<add>3.2</add>
<drop>4.4</drop>
</index>
<index>
<name>index_is_deleted_sort_name</name>
<fieldName>is_deleted</fieldName>
......
xml/schema/Contact/Individual.xml
+ 0
− 34
View file @ aceb0383
......@@ -74,14 +74,6 @@
<fieldName>last_name</fieldName>
<add>1.8</add>
</index>
<field>
<name>gender</name>
<type>enum</type>
<import>true</import>
<values>Female, Male, Other</values>
<add>1.1</add>
<drop>1.2</drop>
</field>
<field>
<name>prefix_id</name>
<type>int unsigned</type>
......@@ -108,32 +100,6 @@
<fieldName>suffix_id</fieldName>
<add>1.6</add>
</index>
<field>
<name>prefix</name>
<type>varchar</type>
<length>64</length>
<import>true</import>
<comment>Prefix to Name.</comment>
<add>1.1</add>
<drop>1.2</drop>
</field>
<field>
<name>suffix</name>
<type>varchar</type>
<length>64</length>
<import>true</import>
<comment>Suffix to Name.</comment>
<add>1.1</add>
<drop>1.2</drop>
</field>
<field>
<name>greeting_type</name>
<type>varchar</type>
<length>128</length>
<comment>Preferred greeting format.</comment>
<add>1.1</add>
<drop>2.2</drop>
</field>
<field>
<name>greeting_type_id</name>
<title>Greeting Type</title>
......
xml/schema/Contact/SavedSearch.xml
+ 0
− 17
View file @ aceb0383
......@@ -18,15 +18,6 @@
<name>id</name>
<autoincrement>false</autoincrement>
</primaryKey>
<field>
<name>query</name>
<title>SQL Query</title>
<type>text</type>
<import>true</import>
<comment>SQL query for this search</comment>
<add>1.1</add>
<drop>1.5</drop>
</field>
<field>
<name>form_values</name>
<title>Submitted Form Values</title>
......@@ -36,14 +27,6 @@
<serialize>PHP</serialize>
<add>1.1</add>
</field>
<field>
<name>is_active</name>
<type>boolean</type>
<title>Saved Search Enabled</title>
<comment>Is this entry active?</comment>
<add>1.1</add>
<drop>1.5</drop>
</field>
<field>
<name>mapping_id</name>
<type>int unsigned</type>
......
xml/schema/Contribute/Contribution.xml
+ 0
− 43
View file @ aceb0383
......@@ -46,39 +46,6 @@
<add>1.3</add>
<onDelete>CASCADE</onDelete>
</foreignKey>
<field>
<name>solicitor_id</name>
<title>Solicitor ID</title>
<type>int unsigned</type>
<comment>FK to Solicitor ID</comment>
<add>1.4</add>
<drop>2.2</drop>
</field>
<foreignKey>
<name>solicitor_id</name>
<table>civicrm_contact</table>
<key>id</key>
<add>1.4</add>
<drop>2.2</drop>
<onDelete>SET NULL</onDelete>
</foreignKey>
<field>
<name>contribution_type_id</name>
<title>Contribution Type</title>
<export>false</export>
<type>int unsigned</type>
<comment>FK to Contribution Type</comment>
<add>1.3</add>
<drop>4.3</drop>
</field>
<foreignKey>
<name>contribution_type_id</name>
<table>civicrm_contribution_type</table>
<key>id</key>
<add>1.3</add>
<drop>4.3</drop>
<onDelete>SET NULL</onDelete>
</foreignKey>
<field>
<name>financial_type_id</name>
<title>Financial Type ID</title>
......@@ -361,16 +328,6 @@
<type>Text</type>
</html>
</field>
<field>
<name>note</name>
<type>text</type>
<comment>Note and/or Comment.</comment>
<import>true</import>
<headerPattern>/Note|Comment/i</headerPattern>
<dataPattern>//</dataPattern>
<add>1.4</add>
<drop>1.7</drop>
</field>
<index>
<name>UI_contrib_trxn_id</name>
<fieldName>trxn_id</fieldName>
......
xml/schema/Contribute/ContributionPage.xml
+ 0
− 14
View file @ aceb0383
......@@ -41,20 +41,6 @@
<comment>Text and html allowed. Displayed below title.</comment>
<add>1.3</add>
</field>
<field>
<name>contribution_type_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>default Contribution type assigned to contributions submitted via this page, e.g. Contribution, Campaign Contribution</comment>
<add>1.3</add>
<drop>4.3</drop>
</field>
<foreignKey>
<name>contribution_type_id</name>
<table>civicrm_contribution_type</table>
<key>id</key>
<drop>4.3</drop>
</foreignKey>
<field>
<name>financial_type_id</name>
<title>Financial Type</title>
......
xml/schema/Contribute/ContributionProduct.xml
+ 0
− 11
View file @ aceb0383
......@@ -55,17 +55,6 @@
<comment></comment>
<add>1.4</add>
</field>
<field>
<name>total_cost</name>
<type>decimal</type>
<required>true</required>
<import>true</import>
<headerPattern>/^total|(.?^am(ou)?nt)/i</headerPattern>
<dataPattern>/^\d+(\.\d{2})?$/</dataPattern>
<comment>quantity X civicrm_product.cost.</comment>
<add>1.3</add>
<drop>4.1</drop>
</field>
<field>
<name>fulfilled_date</name>
<type>date</type>
......
xml/schema/Contribute/ContributionRecur.xml
+ 0
− 24
View file @ aceb0383
......@@ -286,13 +286,6 @@
<html>
<type>Text</type>
</html>
</field>
<field>
<name>next_sched_contribution</name>
<type>datetime</type>
<comment>At Groundspring this was used by the cron job which triggered payments. If we''re not doing that but we know about payments, it might still be useful to store for display to org andor contributors.</comment>
<add>1.6</add>
<drop>4.4</drop>
</field>
<field>
<name>next_sched_contribution_date</name>
......@@ -366,23 +359,6 @@
<add>3.3</add>
<onDelete>SET NULL</onDelete>
</foreignKey>
<field>
<name>contribution_type_id</name>
<title>Contribution Type</title>
<export>false</export>
<type>int unsigned</type>
<comment>FK to Contribution Type</comment>
<add>4.1</add>
<drop>4.3</drop>
</field>
<foreignKey>
<name>contribution_type_id</name>
<table>civicrm_contribution_type</table>
<key>id</key>
<add>4.1</add>
<drop>4.3</drop>
<onDelete>SET NULL</onDelete>
</foreignKey>
<field>
<name>financial_type_id</name>
<title>Financial Type</title>
......
xml/schema/Contribute/PremiumsProduct.xml
+ 0
− 8
View file @ aceb0383
......@@ -47,14 +47,6 @@
<key>id</key>
<add>1.4</add>
</foreignKey>
<field>
<name>sort_position</name>
<title>Sort Position</title>
<type>int unsigned</type>
<required>true</required>
<add>1.4</add>
<drop>2.0</drop>
</field>
<field>
<name>weight</name>
<title>Order</title>
......
xml/schema/Core/Cache.xml
+ 0
− 8
View file @ aceb0383
......@@ -35,14 +35,6 @@
<comment>Unique path name for cache element</comment>
<add>2.1</add>
</field>
<index>
<name>UI_group_path</name>
<fieldName>group_name</fieldName>
<fieldName>path</fieldName>
<unique>true</unique>
<add>2.1</add>
<drop>4.2</drop>
</index>
<index>
<name>UI_group_path_date</name>
<fieldName>group_name</fieldName>
......
xml/schema/Core/CustomField.xml
+ 0
− 8
View file @ aceb0383
......@@ -211,14 +211,6 @@
<comment>Date may be up to end_date_years years after the current date.</comment>
<add>1.4</add>
</field>
<field>
<name>date_parts</name>
<type>varchar</type>
<length>255</length>
<comment>which date part included in display </comment>
<add>1.4</add>
<drop>3.1</drop>
</field>
<field>
<name>date_format</name>
<type>varchar</type>
......
xml/schema/Core/CustomGroup.xml
+ 0
− 8
View file @ aceb0383
......@@ -47,14 +47,6 @@
<comment>Type of object this group extends (can add other options later e.g. contact_address, etc.).</comment>
<add>1.1</add>
</field>
<field>
<name>extends_entity_column_name</name>
<type>varchar</type>
<length>64</length>
<comment>linking custom group for dynamic object</comment>
<add>1.6</add>
<drop>2.2</drop>
</field>
<field>
<name>extends_entity_column_id</name>
<type>int unsigned</type>
......
xml/schema/Core/Dashboard.xml
+ 0
− 15
View file @ aceb0383
......@@ -62,13 +62,6 @@
<comment>url in case of external dashlet</comment>
<add>3.1</add>
</field>
<field>
<name>content</name>
<type>text</type>
<comment>dashlet content</comment>
<add>3.1</add>
<drop>3.3</drop>
</field>
<field>
<name>permission</name>
<type>varchar</type>
......@@ -155,12 +148,4 @@
<required>true</required>
<add>4.7</add>
</field>
<field>
<name>created_date</name>
<type>datetime</type>
<title>Dashlet Created Date</title>
<comment>When was content populated</comment>
<add>3.1</add>
<drop>3.3</drop>
</field>
</table>
xml/schema/Core/Discount.xml
+ 0
− 19
View file @ aceb0383
......@@ -46,25 +46,6 @@
<fieldName>entity_id</fieldName>
<add>2.1</add>
</index>
<field>
<name>option_group_id</name>
<uniqueName>participant_discount_name</uniqueName>
<title>Discount Name</title>
<type>int unsigned</type>
<required>true</required>
<export>true</export>
<comment>FK to civicrm_price_set</comment>
<add>2.1</add>
<drop>4.3</drop>
</field>
<foreignKey>
<name>option_group_id</name>
<table>civicrm_price_set</table>
<key>id</key>
<add>2.1</add>
<onDelete>CASCADE</onDelete>
<drop>4.3</drop>
</foreignKey>
<field>
<name>price_set_id</name>
<uniqueName>participant_discount_name</uniqueName>
......
xml/schema/Core/Domain.xml
+ 0
− 47
View file @ aceb0383
......@@ -46,46 +46,6 @@
<unique>true</unique>
<add>1.1</add>
</index>
<field>
<name>contact_name</name>
<type>varchar</type>
<length>64</length>
<comment>Name of the person responsible for this domain</comment>
<add>1.1</add>
<drop>1.9</drop>
</field>
<field>
<name>email_name</name>
<type>varchar</type>
<length>255</length>
<comment>The default email name that is used in the from address for all outgoing emails</comment>
<add>1.9</add>
<drop>2.2</drop>
</field>
<field>
<name>email_address</name>
<type>varchar</type>
<length>255</length>
<comment>The default email address that is used as the from address for all outgoing emails</comment>
<add>1.9</add>
<drop>2.2</drop>
</field>
<field>
<name>email_domain</name>
<type>varchar</type>
<length>64</length>
<comment>The domain from which outgoing email for this domain will appear to originate</comment>
<add>1.1</add>
<drop>2.2</drop>
</field>
<field>
<name>email_return_path</name>
<type>varchar</type>
<length>64</length>
<comment>The domain from which outgoing email for this domain will appear to originate</comment>
<add>1.1</add>
<drop>2.2</drop>
</field>
<field>
<name>config_backend</name>
<type>text</type>
......@@ -103,13 +63,6 @@
<comment>The civicrm version this instance is running</comment>
<add>2.0</add>
</field>
<field>
<name>loc_block_id</name>
<type>int unsigned</type>
<comment>FK to Location Block ID. This is specifically not an FK to avoid circular constraints</comment>
<add>2.0</add>
<drop>4.3</drop>
</field>
<field>
<name>contact_id</name>
<type>int unsigned</type>
......
xml/schema/Core/EntityTag.xml
+ 0
− 23
View file @ aceb0383
......@@ -19,22 +19,6 @@
<name>id</name>
<autoincrement>true</autoincrement>
</primaryKey>
<field>
<name>contact_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>FK to contact table.</comment>
<add>2.0</add>
<drop>3.2</drop>
</field>
<foreignKey>
<name>contact_id</name>
<table>civicrm_contact</table>
<key>id</key>
<add>2.0</add>
<drop>3.2</drop>
<onDelete>CASCADE</onDelete>
</foreignKey>
<field>
<name>entity_table</name>
<type>varchar</type>
......@@ -59,13 +43,6 @@
<typeColumn>entity_table</typeColumn>
<add>3.2</add>
</dynamicForeignKey>
<index>
<name>index_entity</name>
<fieldName>entity_table</fieldName>
<fieldName>entity_id</fieldName>
<add>3.2</add>
<drop>3.4</drop>
</index>
<field>
<name>tag_id</name>
<type>int unsigned</type>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment