Remove old dropped items from the schema xml

Removes unused fields and indexes which were dropped prior to 4.4.7
which is currently the min upgradable version.

diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml
index 8a37ea3d76156f28972b2e351b017acfc9d004cd..4f329c1929dce0a30e1feeb46712769dd6e9a31c 100644 (file)
--- a/xml/schema/Activity/Activity.xml
+++ b/xml/schema/Activity/Activity.xml
@@ -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>
@@ -80,23 +56,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>
@@ -112,13 +71,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>
@@ -140,27 +92,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>
@@ -231,15 +162,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>
@@ -374,12 +296,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>

diff --git a/xml/schema/Activity/ActivityAssignment.xml b/xml/schema/Activity/ActivityAssignment.xml
index f3df06bb54ab71d9b610e0d136af4ecccc571b0a..192af7dc8aa7d491e747eac7e03907799e654da4 100644 (file)
--- a/xml/schema/Activity/ActivityAssignment.xml
+++ b/xml/schema/Activity/ActivityAssignment.xml
@@ -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>

diff --git a/xml/schema/Batch/Batch.xml b/xml/schema/Batch/Batch.xml
index 3bcbc444092122a5c7359b5b9ad20f832cafae1b..811ecf4f219f5a3aa861bcfab26aa14ec0d98eb5 100644 (file)
--- a/xml/schema/Batch/Batch.xml
+++ b/xml/schema/Batch/Batch.xml
@@ -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>

diff --git a/xml/schema/Case/Case.xml b/xml/schema/Case/Case.xml
index a91e955a55eb23023095746ff079285cc0c32825..492a1df43d46e148f5d9e333b59dc4fe3ecdb05a 100644 (file)
--- a/xml/schema/Case/Case.xml
+++ b/xml/schema/Case/Case.xml
@@ -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>

diff --git a/xml/schema/Case/CaseActivity.xml b/xml/schema/Case/CaseActivity.xml
index 0ae6710e4d74324c7fb318185775507cec00e5e4..daa0a895d216bf97f57e86ad959efb279393cfae 100644 (file)
--- a/xml/schema/Case/CaseActivity.xml
+++ b/xml/schema/Case/CaseActivity.xml
@@ -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>

diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml
index f904c09cff1e29681d1b8b17f3cd93386fe0a757..b3721ab2b85e4c93a6b276f44ba29aefe50d670e 100644 (file)
--- a/xml/schema/Contact/Contact.xml
+++ b/xml/schema/Contact/Contact.xml
@@ -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>
@@ -858,12 +802,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>

diff --git a/xml/schema/Contact/Individual.xml b/xml/schema/Contact/Individual.xml
index 45f27206778691466b3a82896e691debfdf20a66..9956f17bebafbf7db4c81e1c480feae0c10164be 100644 (file)
--- a/xml/schema/Contact/Individual.xml
+++ b/xml/schema/Contact/Individual.xml
@@ -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>

diff --git a/xml/schema/Contact/SavedSearch.xml b/xml/schema/Contact/SavedSearch.xml
index 89f578084b3387200caef35c5c3c652fc5ad54eb..2d73182ac5c55948c9c0d3d5ec1d2bc671208b5a 100644 (file)
--- a/xml/schema/Contact/SavedSearch.xml
+++ b/xml/schema/Contact/SavedSearch.xml
@@ -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>

diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index e98363baa93bef96f461dc69accb1d839003e198..5edebe7bc3d38f9f24ed8617bf8cabc6839ddd06 100644 (file)
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -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</title>
@@ -360,16 +327,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>

diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml
index 15bd5218edaa7012009a5c88d51e3c115f26e8f3..fb93703f74769ddbe5df4c46d7416e5be3f5d2ca 100644 (file)
--- a/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@ -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>

diff --git a/xml/schema/Contribute/ContributionProduct.xml b/xml/schema/Contribute/ContributionProduct.xml
index d5ff804a1009cc7e04f5368cf5f4dbaca6c61f12..1e3526d27c5a53bbef786a6f849d9898c618a0cd 100644 (file)
--- a/xml/schema/Contribute/ContributionProduct.xml
+++ b/xml/schema/Contribute/ContributionProduct.xml
@@ -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>

diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml
index eddc342d9c5ad8e6f719d84646a96a9ddae02343..11e70b6afc496ff8bdd6fb8d95bd126cff8d5e05 100644 (file)
--- a/xml/schema/Contribute/ContributionRecur.xml
+++ b/xml/schema/Contribute/ContributionRecur.xml
@@ -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>

diff --git a/xml/schema/Contribute/PremiumsProduct.xml b/xml/schema/Contribute/PremiumsProduct.xml
index 7f9b86604767f86ed026e5dfe99352be072872cf..6ed7ca1ce61761e2f7fb900ce81c8f2fb74eeecd 100644 (file)
--- a/xml/schema/Contribute/PremiumsProduct.xml
+++ b/xml/schema/Contribute/PremiumsProduct.xml
@@ -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>

diff --git a/xml/schema/Core/Cache.xml b/xml/schema/Core/Cache.xml
index 564a2773292b117051960462feca88bf7ecf1e89..1e8d9a389ff7e8f0a51021d8ee3a3af322fcc332 100644 (file)
--- a/xml/schema/Core/Cache.xml
+++ b/xml/schema/Core/Cache.xml
@@ -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>

diff --git a/xml/schema/Core/CustomField.xml b/xml/schema/Core/CustomField.xml
index 2bfd28999a9ec384683b2e4543d6753740f0bf7c..8d49adce76d0981a4a27814cd56938edae50b43c 100644 (file)
--- a/xml/schema/Core/CustomField.xml
+++ b/xml/schema/Core/CustomField.xml
@@ -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>

diff --git a/xml/schema/Core/CustomGroup.xml b/xml/schema/Core/CustomGroup.xml
index e0f424ddfc49ed037432389bf02b1682d6d3bfc5..e21458ecbafa24855f260fe98012698ce7ada03d 100644 (file)
--- a/xml/schema/Core/CustomGroup.xml
+++ b/xml/schema/Core/CustomGroup.xml
@@ -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>

diff --git a/xml/schema/Core/Dashboard.xml b/xml/schema/Core/Dashboard.xml
index 00500943a8da8e4961b2bff8b2882d559144f30a..6b34614dbcc23802de5095f988a386ae314b628b 100644 (file)
--- a/xml/schema/Core/Dashboard.xml
+++ b/xml/schema/Core/Dashboard.xml
@@ -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>

diff --git a/xml/schema/Core/Discount.xml b/xml/schema/Core/Discount.xml
index 01edced71da31333ac359fc72116e729fe03d8f3..54535e48576436a78921e77649b8d7dd9c99a729 100644 (file)
--- a/xml/schema/Core/Discount.xml
+++ b/xml/schema/Core/Discount.xml
@@ -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>

diff --git a/xml/schema/Core/Domain.xml b/xml/schema/Core/Domain.xml
index ddb2a0dc6a2fde41068815f620a48d1aa11df71b..8e4e119a7f31dae93d0576d7fadd8ee4819d07c0 100644 (file)
--- a/xml/schema/Core/Domain.xml
+++ b/xml/schema/Core/Domain.xml
@@ -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>

diff --git a/xml/schema/Core/EntityTag.xml b/xml/schema/Core/EntityTag.xml
index 0fed7e7cf9ac854247074958e6ebb5d457b6258e..301706a42b4d39b244848d554709ea37467f1eef 100644 (file)
--- a/xml/schema/Core/EntityTag.xml
+++ b/xml/schema/Core/EntityTag.xml
@@ -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>

diff --git a/xml/schema/Core/Job.xml b/xml/schema/Core/Job.xml
index 45429a4afff94779db49007f4b3ea5cb95734ee5..a135360f051beee4b538fce321f0ac801e50039a 100644 (file)
--- a/xml/schema/Core/Job.xml
+++ b/xml/schema/Core/Job.xml
@@ -85,15 +85,6 @@
     <comment>Description of the job</comment>
     <add>4.1</add>
   </field>
-  <field>
-    <name>api_prefix</name>
-    <type>varchar</type>
-    <length>255</length>
-    <default>"civicrm_api3"</default>
-    <comment>Prefix of the job api call</comment>
-    <add>4.1</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>api_entity</name>
     <title>API Entity</title>

diff --git a/xml/schema/Core/Mapping.xml b/xml/schema/Core/Mapping.xml
index 54ab26d3d0bec725a595d11ae66cc4ec7b85a52d..bd5420ea27152e1cbf5ac225f32f4e79715e4fd1 100644 (file)
--- a/xml/schema/Core/Mapping.xml
+++ b/xml/schema/Core/Mapping.xml
@@ -35,16 +35,6 @@
     <comment>Description of Mapping.</comment>
     <add>1.2</add>
   </field>
-  <field>
-    <name>mapping_type</name>
-    <type>enum</type>
-    <values>Export, Import, Export Contributions, Import Contributions, Import Activity, Search Builder, Import
-      Memberships, Import Participants
-    </values>
-    <comment>Type of Mapping.</comment>
-    <add>1.2</add>
-    <drop>2.1</drop>
-  </field>
   <field>
     <name>mapping_type_id</name>
     <type>int unsigned</type>

diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml
index d28b69b30c94cda0c608591e3564fc46d23ca5f2..0c444143756a4e3d7dfa708876489bac707c6f35 100644 (file)
--- a/xml/schema/Core/MappingField.xml
+++ b/xml/schema/Core/MappingField.xml
@@ -78,14 +78,6 @@
     <key>id</key>
     <add>1.2</add>
   </foreignKey>
-  <field>
-    <name>phone_type</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>Phone type, if required</comment>
-    <add>1.2</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>phone_type_id</name>
     <title>Phone Type</title>

diff --git a/xml/schema/Core/Phone.xml b/xml/schema/Core/Phone.xml
index 91ab823d39ffca0c13ab25bb5fe11bd83bf323d6..eb0ad8e1f6a90a4f4a16b7e9be1a58b4267a7d88 100644 (file)
--- a/xml/schema/Core/Phone.xml
+++ b/xml/schema/Core/Phone.xml
@@ -137,16 +137,6 @@
     <fieldName>phone_numeric</fieldName>
     <add>4.3</add>
   </index>
-  <field>
-    <name>phone_type</name>
-    <type>enum</type>
-    <values>Phone, Mobile, Fax, Pager</values>
-    <headerPattern>/phone\s+type/i</headerPattern>
-    <dataPattern>/phone|mobile|fax|pager/i</dataPattern>
-    <comment>What type of telecom device is this.</comment>
-    <add>1.1</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>phone_type_id</name>
     <title>Phone Type ID</title>

diff --git a/xml/schema/Core/UFField.xml b/xml/schema/Core/UFField.xml
index fdcdcf83b3f348b5a1477518ff75ecfbf0a5326f..9b012ab4c8376550050b08fb332ac2c1bd291d84 100644 (file)
--- a/xml/schema/Core/UFField.xml
+++ b/xml/schema/Core/UFField.xml
@@ -103,22 +103,6 @@
     <comment>Description and/or help text to display before this field.</comment>
     <add>3.2</add>
   </field>
-  <field>
-    <name>is_registration</name>
-    <type>boolean</type>
-    <default>0</default>
-    <comment>Is this field included in new user registration forms?</comment>
-    <add>1.1</add>
-    <drop>1.3</drop>
-  </field>
-  <field>
-    <name>is_match</name>
-    <type>boolean</type>
-    <default>0</default>
-    <comment>Is this field part of the key for matching users to contacts?</comment>
-    <add>1.1</add>
-    <drop>1.3</drop>
-  </field>
   <field>
     <name>visibility</name>
     <title>Profile Field Visibility</title>
@@ -134,14 +118,6 @@
       <type>Select</type>
     </html>
   </field>
-  <field>
-    <name>listings_title</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>Page title for listings page (users who share a common value for this property).</comment>
-    <add>1.1</add>
-    <drop>1.2</drop>
-  </field>
   <field>
     <name>in_selector</name>
     <title>Profile Field Is a Filter</title>
@@ -172,14 +148,6 @@
     <add>1.3</add>
     <onDelete>SET NULL</onDelete>
   </foreignKey>
-  <field>
-    <name>phone_type</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>Phone type, if required</comment>
-    <add>1.3</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>phone_type_id</name>
     <title>Profile Field Phone Type</title>

diff --git a/xml/schema/Core/UFGroup.xml b/xml/schema/Core/UFGroup.xml
index cafe160ac631ff8e3fd012a0b4e437ae0ebe9b32..37d5d0a8aa8d10ca8a811dac749ceb7093a1e6d3 100644 (file)
--- a/xml/schema/Core/UFGroup.xml
+++ b/xml/schema/Core/UFGroup.xml
@@ -37,13 +37,6 @@
     <serialize>COMMA</serialize>
     <add>2.1</add>
   </field>
-  <field>
-    <name>form_type</name>
-    <type>enum</type>
-    <values>CiviCRM Profile</values>
-    <comment>Type of form.</comment>
-    <drop>2.1</drop>
-  </field>
   <field>
     <name>title</name>
     <title>Profile Name</title>
@@ -81,14 +74,6 @@
     <comment>Optional verbose description of the profile.</comment>
     <add>4.4</add>
   </field>
-  <field>
-    <name>collapse_display</name>
-    <type>int unsigned</type>
-    <default>0</default>
-    <comment>Will this group be in collapsed or expanded mode on initial display ?</comment>
-    <add>1.1</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>help_pre</name>
     <type>text</type>
@@ -114,19 +99,6 @@
     </html>
     <add>1.2</add>
   </field>
-  <field>
-    <name>weight</name>
-    <title>Profile Weight</title>
-    <type>int</type>
-    <required>true</required>
-    <default>1</default>
-    <html>
-      <type>Text</type>
-    </html>
-    <comment>Controls display order when multiple user framework groups are setup for concurrent display.</comment>
-    <add>1.2</add>
-    <drop>1.3</drop>
-  </field>
   <field>
     <name>limit_listings_group_id</name>
     <title>Profile Search Limit Group</title>

diff --git a/xml/schema/Core/UFMatch.xml b/xml/schema/Core/UFMatch.xml
index fb3a05425dfb6af68856c6c1ecf9bd288bd5a8ef..9e573a5a79df7bf143a8e904fb18a2152e61a94c 100644 (file)
--- a/xml/schema/Core/UFMatch.xml
+++ b/xml/schema/Core/UFMatch.xml
@@ -73,15 +73,6 @@
     <add>1.1</add>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
-  <field>
-    <name>email</name>
-    <type>varchar</type>
-    <length>64</length>
-    <rule>email</rule>
-    <comment>Email address</comment>
-    <add>1.1</add>
-    <drop>2.0</drop>
-  </field>
   <field>
     <name>language</name>
     <title>Preferred Language</title>
@@ -90,14 +81,6 @@
     <comment>UI language preferred by the given user/contact</comment>
     <add>2.1</add>
   </field>
-  <index>
-    <name>UI_uf_id_domain_id</name>
-    <fieldName>uf_id</fieldName>
-    <fieldName>domain_id</fieldName>
-    <unique>true</unique>
-    <add>1.5</add>
-    <drop>1.7</drop>
-  </index>
   <index>
     <name>UI_uf_name_domain_id</name>
     <fieldName>uf_name</fieldName>

diff --git a/xml/schema/Dedupe/RuleGroup.xml b/xml/schema/Dedupe/RuleGroup.xml
index 6adbe3dba41e236ab8f87cc6d9cc552d59fa1e3b..09a5873628381c2565a390bd72b9d4b3e7437912 100644 (file)
--- a/xml/schema/Dedupe/RuleGroup.xml
+++ b/xml/schema/Dedupe/RuleGroup.xml
@@ -45,15 +45,6 @@
       <type>Text</type>
     </html>
   </field>
-  <field>
-    <name>level</name>
-    <title>Level</title>
-    <type>enum</type>
-    <values>Strict, Fuzzy</values>
-    <comment>Whether the rule should be used for cases where strict matching of the given contact type is required or a fuzzy one</comment>
-    <add>2.1</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>used</name>
     <type>varchar</type>
@@ -69,14 +60,6 @@
       <type>Radio</type>
     </html>
   </field>
-  <field>
-    <name>is_default</name>
-    <title>Default></title>
-    <type>boolean</type>
-    <comment>Is this a default rule (one rule for every contact type + level combination should be default)</comment>
-    <add>2.1</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>name</name>
     <title>Name</title>

diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml
index 4c7e51143f850232f47754259c01d3885bc87b75..4593c92d4e5630c15b493c4279e78cfae0413dd4 100644 (file)
--- a/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@ -218,14 +218,6 @@
       <type>CheckBox</type>
     </html>
   </field>
-  <field>
-    <name>contribution_type_id</name>
-    <type>int unsigned</type>
-    <default>0</default>
-    <comment>Contribution type assigned to paid event registrations for this event. Required if is_monetary is true.</comment>
-    <add>1.7</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>financial_type_id</name>
     <type>int unsigned</type>
@@ -318,19 +310,6 @@
     <onDelete>SET NULL</onDelete>
     <add>2.0</add>
   </foreignKey>
-  <field>
-    <name>receipt_text</name>
-    <type>varchar</type>
-    <html>
-      <type>TextArea</type>
-      <rows>6</rows>
-      <cols>50</cols>
-    </html>
-    <length>255</length>
-    <comment>Receipt Text for off-line event participation</comment>
-    <add>2.0</add>
-    <drop>2.1</drop>
-  </field>
   <field>
     <name>default_role_id</name>
     <uniqueName>default_role_id</uniqueName>

diff --git a/xml/schema/Financial/EntityFinancialTrxn.xml b/xml/schema/Financial/EntityFinancialTrxn.xml
index 653fc792d5d61bd4705ce81d6a6214248d216821..f48a3f3c6574af9723d4357d1cf6f95143b0c932 100644 (file)
--- a/xml/schema/Financial/EntityFinancialTrxn.xml
+++ b/xml/schema/Financial/EntityFinancialTrxn.xml
@@ -63,15 +63,6 @@
     <comment>allocated amount of transaction to this entity</comment>
     <add>3.2</add>
   </field>
-  <field>
-    <name>currency</name>
-    <type>varchar</type>
-    <length>3</length>
-    <default>NULL</default>
-    <comment>3 character string, value from config setting or input via user.</comment>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
   <index>
     <name>UI_entity_financial_trxn_entity_table</name>
     <fieldName>entity_table</fieldName>

diff --git a/xml/schema/Financial/FinancialAccount.xml b/xml/schema/Financial/FinancialAccount.xml
index eedf5c621069640207403b413993446f6d62fba4..3188e5847e3113bb3a0a21bf9c68af76d70f16d9 100644 (file)
--- a/xml/schema/Financial/FinancialAccount.xml
+++ b/xml/schema/Financial/FinancialAccount.xml
@@ -42,13 +42,6 @@
     <add>4.3</add>
     <onDelete>SET NULL</onDelete>
   </foreignKey>
-  <field>
-    <name>account_type_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>financial_account_type_id</name>
     <type>int unsigned</type>

diff --git a/xml/schema/Financial/FinancialTrxn.xml b/xml/schema/Financial/FinancialTrxn.xml
index 94a2e3f023e5e03fe5733272812a5798c56784e2..e34d9b91123c79838ab7caa7294672e5010a95a6 100644 (file)
--- a/xml/schema/Financial/FinancialTrxn.xml
+++ b/xml/schema/Financial/FinancialTrxn.xml
@@ -17,34 +17,6 @@
     <name>id</name>
     <autoincrement>true</autoincrement>
   </primaryKey>
-  <field>
-    <name>from_account_id</name>
-    <type>int unsigned</type>
-    <comment>FK to financial_account table.</comment>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>from_account_id</name>
-    <table>civicrm_financial_account</table>
-    <key>id</key>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </foreignKey>
-  <field>
-    <name>to_account_id</name>
-    <type>int unsigned</type>
-    <comment>FK to financial_account table.</comment>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>to_account_id</name>
-    <table>civicrm_financial_account</table>
-    <key>id</key>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </foreignKey>
   <field>
     <name>from_financial_account_id</name>
     <type>int unsigned</type>
@@ -99,15 +71,6 @@
       <formatType>activityDateTime</formatType>
     </html>
   </field>
-  <field>
-    <name>trxn_type</name>
-    <title>Financial Transaction Type</title>
-    <type>enum</type>
-    <values>Debit,Credit</values>
-    <required>true</required>
-    <add>1.3</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>total_amount</name>
     <title>Financial Total Amount</title>
@@ -161,15 +124,6 @@
     <comment>Is this entry either a payment or a reversal of a payment?</comment>
     <add>4.7</add>
   </field>
-  <field>
-    <name>payment_processor</name>
-    <type>varchar</type>
-    <length>64</length>
-    <required>true</required>
-    <comment>derived from Processor setting in civicrm.settings.php.</comment>
-    <add>1.3</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>trxn_id</name>
     <title>Transaction ID</title>

diff --git a/xml/schema/Financial/FinancialType.xml b/xml/schema/Financial/FinancialType.xml
index bbdca886dae8338a792992bab2dcfc2aed1cec63..3d02bf8b0991bab93460c21c15629eafa355f033 100644 (file)
--- a/xml/schema/Financial/FinancialType.xml
+++ b/xml/schema/Financial/FinancialType.xml
@@ -37,16 +37,6 @@
     </html>
     <add>1.3</add>
   </field>
-  <field>
-    <name>accounting_code</name>
-    <title>Accounting Code</title>
-    <type>varchar</type>
-    <length>64</length>
-    <export>true</export>
-    <comment>Optional value for mapping contributions to accounting system codes for each type/category of contribution.</comment>
-    <add>1.3</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>description</name>
     <type>varchar</type>

diff --git a/xml/schema/Financial/PaymentProcessor.xml b/xml/schema/Financial/PaymentProcessor.xml
index e1aac7cab3313d3ab3336805edb1a7438879c11b..a363ce8784677d213180de420e5e58b2753d1bec 100644 (file)
--- a/xml/schema/Financial/PaymentProcessor.xml
+++ b/xml/schema/Financial/PaymentProcessor.xml
@@ -70,14 +70,6 @@
     <comment>Payment Processor Description.</comment>
     <add>1.8</add>
   </field>
-  <field>
-    <name>payment_processor_type</name>
-    <type>varchar</type>
-    <length>255</length>
-    <comment>Payment Processor Type.</comment>
-    <add>1.8</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>payment_processor_type_id</name>
     <title>Payment Processor Type ID</title>

diff --git a/xml/schema/Grant/Grant.xml b/xml/schema/Grant/Grant.xml
index 6e222f8e0d6995c37a57f1aec0e910cf3bd7abaa..b6c2c8923519bbf48baf1c875e677d7d2bdf957a 100644 (file)
--- a/xml/schema/Grant/Grant.xml
+++ b/xml/schema/Grant/Grant.xml
@@ -179,15 +179,6 @@
       <type>Select</type>
     </html>
   </field>
-  <field>
-    <name>currency</name>
-    <type>varchar</type>
-    <length>8</length>
-    <default>NULL</default>
-    <comment>3 character string, value from config setting or input via user.</comment>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>rationale</name>
     <type>text</type>

diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml
index 0007eefaf2fe76a2ca347cc4221a357c54a1b49e..cd528adaf26fc8d599c30550e5c14fc0405259e0 100644 (file)
--- a/xml/schema/Member/MembershipType.xml
+++ b/xml/schema/Member/MembershipType.xml
@@ -84,21 +84,6 @@
     <add>1.5</add>
     <onDelete>RESTRICT</onDelete>
   </foreignKey>
-  <field>
-    <name>contribution_type_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>If membership is paid by a contribution - what contribution type should be used. FK to Contribution Type ID</comment>
-    <add>1.5</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_type_id</name>
-    <table>civicrm_contribution_type</table>
-    <key>id</key>
-    <add>1.5</add>
-    <drop>4.3</drop>
-  </foreignKey>
   <field>
     <name>financial_type_id</name>
     <title>Membership Financial Type</title>
@@ -192,13 +177,6 @@
     <add>1.5</add>
     <serialize>SEPARATOR_TRIMMED</serialize>
   </field>
-  <foreignKey>
-    <name>relationship_type_id</name>
-    <table>civicrm_relationship_type</table>
-    <key>id</key>
-    <add>1.5</add>
-    <drop>3.3</drop>
-  </foreignKey>
   <index>
     <name>index_relationship_type_id</name>
     <fieldName>relationship_type_id</fieldName>

diff --git a/xml/schema/PCP/PCP.xml b/xml/schema/PCP/PCP.xml
index dfb8a13f8c7429d032f737b0a8c8fc8277b48fbc..0ef29ee2563cd656777b61a40442f4b8971a3237 100644 (file)
--- a/xml/schema/PCP/PCP.xml
+++ b/xml/schema/PCP/PCP.xml
@@ -91,20 +91,6 @@
       <type>Text</type>
     </html>
   </field>
-  <field>
-    <name>contribution_page_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>The Contribution Page which triggered this pcp</comment>
-    <add>2.2</add>
-    <drop>4.1</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_page_id</name>
-    <table>civicrm_contribution_page</table>
-    <key>id</key>
-    <drop>4.1</drop>
-  </foreignKey>
   <field>
     <name>page_id</name>
     <title>Contribution Page</title>
@@ -182,15 +168,6 @@
       <type>Select</type>
     </html>
   </field>
-  <field>
-    <name>referer</name>
-    <title>Referer</title>
-    <type>varchar</type>
-    <length>255</length>
-    <default>NULL</default>
-    <add>2.2</add>
-    <drop>4.1</drop>
-  </field>
   <field>
     <name>is_active</name>
     <title>Enabled?</title>

diff --git a/xml/schema/PCP/PCPBlock.xml b/xml/schema/PCP/PCPBlock.xml
index b07bc5b035556ca14c48574688a879614af825f3..d25b6eb7c221e986b066158e08dd1635306e25a8 100644 (file)
--- a/xml/schema/PCP/PCPBlock.xml
+++ b/xml/schema/PCP/PCPBlock.xml
@@ -39,13 +39,6 @@
     <typeColumn>entity_table</typeColumn>
     <add>2.2</add>
   </dynamicForeignKey>
-  <foreignKey>
-    <name>entity_id</name>
-    <table>civicrm_contribution_page</table>
-    <key>id</key>
-    <add>2.2</add>
-    <drop>4.1</drop>
-  </foreignKey>
   <field>
     <name>target_entity_type</name>
     <title>Target Entity</title>

diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml
index 39943c58efa93b78611d6b290c2cbcb2ae5834df..32b806f39f52c8a0c057241d3e991e5c8dce8b25 100644 (file)
--- a/xml/schema/Pledge/Pledge.xml
+++ b/xml/schema/Pledge/Pledge.xml
@@ -40,23 +40,6 @@
     <add>2.1</add>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
-  <field>
-    <name>contribution_type_id</name>
-    <uniqueName>pledge_contribution_type_id</uniqueName>
-    <export>false</export>
-    <type>int unsigned</type>
-    <comment>FK to Contribution Type. This is propagated to contribution record when pledge payments are made.</comment>
-    <add>2.1</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_type_id</name>
-    <table>civicrm_contribution_type</table>
-    <key>id</key>
-    <add>2.1</add>
-    <drop>4.3</drop>
-    <onDelete>SET NULL</onDelete>
-  </foreignKey>
   <field>
     <name>financial_type_id</name>
     <title>Type</title>

diff --git a/xml/schema/Price/LineItem.xml b/xml/schema/Price/LineItem.xml
index a1f006c9b53520ffa1e9024dab2b95344cdcd61c..82b9c9a7cc56c9d5d6c012334206ba9655d8ab97 100644 (file)
--- a/xml/schema/Price/LineItem.xml
+++ b/xml/schema/Price/LineItem.xml
@@ -67,15 +67,6 @@
     <key>id</key>
     <onDelete>SET NULL</onDelete>
   </foreignKey>
-  <field>
-    <name>option_group_id</name>
-    <title>Line Item Option Group</title>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>FK to option group</comment>
-    <add>1.7</add>
-    <drop>3.3</drop>
-  </field>
   <field>
     <name>label</name>
     <title>Line Item Label</title>

diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml
index 0c2c1af3c1a811f468e5a33afc5139fe16d32346..ce61ecc87c4fc5b1c49eb75b6b4554b0c1fa47d9 100644 (file)
--- a/xml/schema/Price/PriceField.xml
+++ b/xml/schema/Price/PriceField.xml
@@ -221,12 +221,4 @@
       <type>Select</type>
     </html>
   </field>
-  <field>
-    <name>count</name>
-    <type>int unsigned</type>
-    <default>NULL</default>
-    <comment>Number of Participants Per field</comment>
-    <add>3.2</add>
-    <drop>3.3</drop>
-  </field>
 </table>

diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml
index 25266f1dbfc4380015787096eb272bd39386a04e..d84ac533927c08f81c08d77a287d8a6f57bb2c13 100644 (file)
--- a/xml/schema/Price/PriceSet.xml
+++ b/xml/schema/Price/PriceSet.xml
@@ -137,23 +137,6 @@
       <type>Text</type>
     </html>
   </field>
-  <field>
-    <name>contribution_type_id</name>
-    <title>Price Set Contribution Type</title>
-    <type>int unsigned</type>
-    <default>NULL</default>
-    <comment>FK to Contribution Type(for membership price sets only).</comment>
-    <add>3.4</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_type_id</name>
-    <table>civicrm_contribution_type</table>
-    <key>id</key>
-    <add>3.4</add>
-    <drop>4.3</drop>
-    <onDelete>SET NULL</onDelete>
-  </foreignKey>
   <field>
     <name>financial_type_id</name>
     <title>Financial Type</title>