From 57e94608d0bcc6d3ef4be65701683fc7dee77ca2 Mon Sep 17 00:00:00 2001 From: Ahed Date: Fri, 5 Feb 2021 11:33:13 +0200 Subject: [PATCH] Ensure field's title and html's lable attributes populated properly --- xml/schema/ACL/Cache.xml | 8 ++- xml/schema/Activity/Activity.xml | 20 ++++-- xml/schema/Activity/ActivityContact.xml | 8 ++- xml/schema/Batch/Batch.xml | 13 +++- xml/schema/Batch/EntityBatch.xml | 3 + xml/schema/Bridge/OG.xml | 12 ++++ xml/schema/Bridge/Role.xml | 2 + xml/schema/Campaign/Campaign.xml | 13 +++- xml/schema/Campaign/CampaignGroup.xml | 5 +- xml/schema/Campaign/Survey.xml | 13 +++- xml/schema/Case/Case.xml | 3 +- xml/schema/Case/CaseActivity.xml | 8 ++- xml/schema/Case/CaseContact.xml | 6 +- xml/schema/Contact/ACLContactCache.xml | 3 + xml/schema/Contact/Contact.xml | 3 + xml/schema/Contact/ContactType.xml | 5 +- xml/schema/Contact/DashboardContact.xml | 10 ++- xml/schema/Contact/Group.xml | 13 +++- xml/schema/Contact/GroupContact.xml | 14 +++- xml/schema/Contact/GroupContactCache.xml | 6 +- xml/schema/Contact/GroupNesting.xml | 10 ++- xml/schema/Contact/GroupOrganization.xml | 8 ++- xml/schema/Contact/Household.xml | 8 +++ xml/schema/Contact/Individual.xml | 4 ++ xml/schema/Contact/Organization.xml | 8 +++ xml/schema/Contact/Relationship.xml | 16 +++-- xml/schema/Contact/RelationshipCache.xml | 12 +++- xml/schema/Contact/SavedSearch.xml | 3 + xml/schema/Contact/SubscriptionHistory.xml | 6 +- xml/schema/Contribute/Contribution.xml | 16 +++-- xml/schema/Contribute/ContributionPage.xml | 13 +++- xml/schema/Contribute/ContributionProduct.xml | 8 ++- xml/schema/Contribute/ContributionRecur.xml | 15 +++-- xml/schema/Contribute/ContributionSoft.xml | 11 ++- xml/schema/Contribute/PremiumsProduct.xml | 15 ++++- xml/schema/Contribute/Product.xml | 5 +- xml/schema/Contribute/Widget.xml | 5 +- xml/schema/Core/ActionLog.xml | 8 ++- xml/schema/Core/ActionSchedule.xml | 16 +++-- xml/schema/Core/Address.xml | 17 +++-- xml/schema/Core/Cache.xml | 1 + xml/schema/Core/Country.xml | 8 ++- xml/schema/Core/County.xml | 6 +- xml/schema/Core/CustomField.xml | 8 ++- xml/schema/Core/CustomGroup.xml | 5 +- xml/schema/Core/Dashboard.xml | 5 +- xml/schema/Core/Discount.xml | 5 +- xml/schema/Core/Domain.xml | 5 +- xml/schema/Core/Email.xml | 5 +- xml/schema/Core/EntityFile.xml | 5 +- xml/schema/Core/EntityTag.xml | 3 +- xml/schema/Core/File.xml | 3 + xml/schema/Core/IM.xml | 5 +- xml/schema/Core/Job.xml | 5 +- xml/schema/Core/JobLog.xml | 3 + xml/schema/Core/LocBlock.xml | 40 ++++++++--- xml/schema/Core/Log.xml | 5 +- xml/schema/Core/MailSettings.xml | 5 +- xml/schema/Core/MappingField.xml | 9 +++ xml/schema/Core/Menu.xml | 8 ++- xml/schema/Core/Navigation.xml | 8 ++- xml/schema/Core/Note.xml | 5 +- xml/schema/Core/OpenID.xml | 5 +- xml/schema/Core/OptionValue.xml | 12 ++-- xml/schema/Core/Phone.xml | 5 +- xml/schema/Core/Preferences.xml | 8 +++ xml/schema/Core/PrintLabel.xml | 4 +- xml/schema/Core/Setting.xml | 18 +++-- xml/schema/Core/StateProvince.xml | 5 +- xml/schema/Core/StatusPreference.xml | 5 +- xml/schema/Core/Tag.xml | 10 ++- xml/schema/Core/Timezone.xml | 5 +- xml/schema/Core/UFField.xml | 6 +- xml/schema/Core/UFGroup.xml | 15 ++++- xml/schema/Core/UFJoin.xml | 1 + xml/schema/Core/UFMatch.xml | 6 ++ xml/schema/Core/Website.xml | 5 +- xml/schema/Core/WordReplacement.xml | 3 + xml/schema/Dedupe/Exception.xml | 6 ++ xml/schema/Dedupe/Rule.xml | 5 +- xml/schema/Event/Cart/Cart.xml | 5 +- xml/schema/Event/Cart/EventInCart.xml | 10 ++- xml/schema/Event/Event.xml | 14 +++- xml/schema/Event/Participant.xml | 30 +++++++-- xml/schema/Event/ParticipantPayment.xml | 8 ++- .../Financial/EntityFinancialAccount.xml | 3 +- xml/schema/Financial/EntityFinancialTrxn.xml | 5 +- xml/schema/Financial/FinancialAccount.xml | 8 ++- xml/schema/Financial/FinancialItem.xml | 4 ++ xml/schema/Financial/FinancialTrxn.xml | 9 ++- xml/schema/Financial/PaymentProcessor.xml | 8 ++- xml/schema/Financial/PaymentToken.xml | 9 +++ xml/schema/Grant/Grant.xml | 10 ++- xml/schema/Mailing/BouncePattern.xml | 5 +- xml/schema/Mailing/Event/Bounce.xml | 5 +- xml/schema/Mailing/Event/Confirm.xml | 3 + xml/schema/Mailing/Event/Delivered.xml | 5 +- xml/schema/Mailing/Event/Forward.xml | 10 ++- xml/schema/Mailing/Event/Opened.xml | 5 +- xml/schema/Mailing/Event/Queue.xml | 12 ++++ xml/schema/Mailing/Event/Reply.xml | 5 +- xml/schema/Mailing/Event/Subscribe.xml | 8 ++- xml/schema/Mailing/Event/TrackableURLOpen.xml | 10 ++- xml/schema/Mailing/Event/Unsubscribe.xml | 5 +- xml/schema/Mailing/Mailing.xml | 67 +++++++++++++------ xml/schema/Mailing/MailingAB.xml | 5 +- xml/schema/Mailing/MailingGroup.xml | 5 +- xml/schema/Mailing/MailingJob.xml | 10 ++- xml/schema/Mailing/Recipients.xml | 20 ++++-- xml/schema/Mailing/Spool.xml | 5 +- xml/schema/Mailing/TrackableURL.xml | 5 +- xml/schema/Member/Membership.xml | 15 ++++- xml/schema/Member/MembershipBlock.xml | 8 ++- xml/schema/Member/MembershipLog.xml | 16 ++++- xml/schema/Member/MembershipPayment.xml | 10 ++- xml/schema/Member/MembershipType.xml | 15 ++++- xml/schema/PCP/PCP.xml | 1 + xml/schema/PCP/PCPBlock.xml | 5 +- xml/schema/Pledge/Pledge.xml | 16 +++-- xml/schema/Pledge/PledgePayment.xml | 10 ++- xml/schema/Price/LineItem.xml | 15 ++++- xml/schema/Price/PriceField.xml | 5 +- xml/schema/Price/PriceFieldValue.xml | 11 ++- xml/schema/Price/PriceSet.xml | 6 +- xml/schema/Price/PriceSetEntity.xml | 5 +- xml/schema/Report/ReportInstance.xml | 19 +++++- xml/schema/SMS/History.xml | 2 + xml/schema/SMS/Provider.xml | 5 +- 128 files changed, 916 insertions(+), 209 deletions(-) diff --git a/xml/schema/ACL/Cache.xml b/xml/schema/ACL/Cache.xml index 93bb5b823f..9558093443 100644 --- a/xml/schema/ACL/Cache.xml +++ b/xml/schema/ACL/Cache.xml @@ -23,11 +23,12 @@ contact_id - Cache Contact + Cache Contact ID int unsigned Foreign Key to Contact EntityRef + 1.6 @@ -46,7 +47,7 @@ acl_id - Cache ACL + Cache ACL ID int unsigned true Foreign Key to ACL @@ -55,6 +56,9 @@ id name + + + 1.6 diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml index f80e5cfb52..66e6296bc1 100644 --- a/xml/schema/Activity/Activity.xml +++ b/xml/schema/Activity/Activity.xml @@ -133,7 +133,7 @@ phone_id int unsigned - Phone (called) ID + Phone ID (called) Phone ID of the number called (optional - used if an existing phone number is selected). 2.0 @@ -213,9 +213,12 @@ parent_id - Parent Activity Id + Parent Activity ID int unsigned Parent meeting ID (if this is a follow-up item). This is not currently implemented + + + 1.1 @@ -268,10 +271,13 @@ relationship_id - Relationship Id + Relationship ID int unsigned NULL FK to Relationship ID + + + 2.2 @@ -297,8 +303,11 @@ original_id int unsigned - Original Activity ID + Original Activity ID Activity ID of the first activity record in versioning chain. + + + 2.2 @@ -339,12 +348,13 @@ campaign_id activity_campaign_id int unsigned - Campaign + Campaign ID true The campaign for which this activity has been triggered. 3.4 Select + diff --git a/xml/schema/Activity/ActivityContact.xml b/xml/schema/Activity/ActivityContact.xml index 53fc948504..b9fc53fb66 100644 --- a/xml/schema/Activity/ActivityContact.xml +++ b/xml/schema/Activity/ActivityContact.xml @@ -28,6 +28,9 @@ Activity ID true Foreign key to the activity for this record. + + + 4.4 @@ -39,11 +42,14 @@ contact_id - Contact ID (match to contact) + Contact ID true int unsigned true Foreign key to the contact for this record. + + + 4.4 diff --git a/xml/schema/Batch/Batch.xml b/xml/schema/Batch/Batch.xml index dd091ea937..770f94e205 100644 --- a/xml/schema/Batch/Batch.xml +++ b/xml/schema/Batch/Batch.xml @@ -65,9 +65,12 @@ created_id - Batch Created By + Batch Created By Contact ID int unsigned FK to Contact ID + + + 3.3 @@ -90,9 +93,12 @@ modified_id - Batch Modified By + Batch Modified By Contact ID int unsigned FK to Contact ID + + + 3.3 @@ -111,12 +117,13 @@ saved_search_id - Batch Smart Group + Batch Smart Group ID int unsigned FK to Saved Search ID 4.1 EntityRef + diff --git a/xml/schema/Batch/EntityBatch.xml b/xml/schema/Batch/EntityBatch.xml index d36cc0eefc..324db5b5a1 100644 --- a/xml/schema/Batch/EntityBatch.xml +++ b/xml/schema/Batch/EntityBatch.xml @@ -59,6 +59,9 @@ id title + + + 3.3 diff --git a/xml/schema/Bridge/OG.xml b/xml/schema/Bridge/OG.xml index 7fb1447cc9..f69a560c03 100644 --- a/xml/schema/Bridge/OG.xml +++ b/xml/schema/Bridge/OG.xml @@ -34,6 +34,7 @@ group_id int unsigned + Group ID true FK to civicrm group. 2.0 @@ -44,6 +45,7 @@ Select + @@ -55,8 +57,12 @@ acl_id int unsigned + ACL ID true FK to civicrm acl. + + + 2.0 @@ -68,6 +74,7 @@ admin_group_id int unsigned + Admin Group ID true FK to admin civicrm group. 2.0 @@ -78,6 +85,7 @@ Select + @@ -89,8 +97,12 @@ admin_acl_id int unsigned + Admin ACL ID true FK to civicrm acl. + + + 2.0 diff --git a/xml/schema/Bridge/Role.xml b/xml/schema/Bridge/Role.xml index bb9c3a38da..1d0708e6aa 100644 --- a/xml/schema/Bridge/Role.xml +++ b/xml/schema/Bridge/Role.xml @@ -34,6 +34,7 @@ group_id int unsigned + Group ID true FK to civicrm group. 2.0 @@ -44,6 +45,7 @@ Select + diff --git a/xml/schema/Campaign/Campaign.xml b/xml/schema/Campaign/Campaign.xml index 1c69731844..e8c2a9df07 100644 --- a/xml/schema/Campaign/Campaign.xml +++ b/xml/schema/Campaign/Campaign.xml @@ -167,7 +167,7 @@ parent_id - Parent Campaign + Parent Campaign ID int unsigned NULL Optional parent id for this Campaign. @@ -175,6 +175,7 @@ 3.3 EntityRef + @@ -200,8 +201,11 @@ created_id int unsigned - Campaign Created By + Campaign Created By Contact ID FK to civicrm_contact, who created this Campaign. + + + 3.3 @@ -227,8 +231,11 @@ last_modified_id int unsigned - Campaign Modified By + Campaign Modified By Contact ID FK to civicrm_contact, who recently edited this Campaign. + + + 3.3 diff --git a/xml/schema/Campaign/CampaignGroup.xml b/xml/schema/Campaign/CampaignGroup.xml index 0cc9db8b9d..73a5cbc9eb 100644 --- a/xml/schema/Campaign/CampaignGroup.xml +++ b/xml/schema/Campaign/CampaignGroup.xml @@ -24,10 +24,13 @@ campaign_id - Campaign + Campaign ID int unsigned true Foreign key to the activity Campaign. + + + 3.3 diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml index c1e529249c..ad2a45c0be 100644 --- a/xml/schema/Campaign/Survey.xml +++ b/xml/schema/Campaign/Survey.xml @@ -42,6 +42,9 @@ int unsigned NULL Foreign key to the Campaign. + + + 3.3 @@ -147,9 +150,12 @@ created_id - Survey Created By + Survey Created By Contact ID int unsigned FK to civicrm_contact, who created this Survey. + + + 3.3 @@ -170,9 +176,12 @@ last_modified_id - Survey Modified + Survey Modified By Contact ID int unsigned FK to civicrm_contact, who recently edited this Survey. + + + 3.3 diff --git a/xml/schema/Case/Case.xml b/xml/schema/Case/Case.xml index 90c69086de..459de89aed 100644 --- a/xml/schema/Case/Case.xml +++ b/xml/schema/Case/Case.xml @@ -31,11 +31,12 @@ int unsigned true false - Case Type + Case Type ID true FK to civicrm_case_type.id Select + civicrm_case_type
diff --git a/xml/schema/Case/CaseActivity.xml b/xml/schema/Case/CaseActivity.xml index 249a292149..91f28f27c2 100644 --- a/xml/schema/Case/CaseActivity.xml +++ b/xml/schema/Case/CaseActivity.xml @@ -24,10 +24,13 @@ case_id - Case + Case ID int unsigned true Case ID of case-activity association. + + + 1.8 @@ -43,6 +46,9 @@ int unsigned true Activity ID of case-activity association. + + + 2.0 diff --git a/xml/schema/Case/CaseContact.xml b/xml/schema/Case/CaseContact.xml index e4c1382655..352379ac5f 100644 --- a/xml/schema/Case/CaseContact.xml +++ b/xml/schema/Case/CaseContact.xml @@ -24,10 +24,13 @@ case_id - Case + Case ID int unsigned true Case ID of case-contact association. + + + 2.1 @@ -45,6 +48,7 @@ Contact ID of contact record given case belongs to. EntityRef + 2.1 diff --git a/xml/schema/Contact/ACLContactCache.xml b/xml/schema/Contact/ACLContactCache.xml index 470925a590..5c2df4f316 100644 --- a/xml/schema/Contact/ACLContactCache.xml +++ b/xml/schema/Contact/ACLContactCache.xml @@ -34,6 +34,9 @@ int unsigned true FK to civicrm_contact + + + 3.1 diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml index 33a7f642a3..8783b5ab3f 100644 --- a/xml/schema/Contact/Contact.xml +++ b/xml/schema/Contact/Contact.xml @@ -719,6 +719,9 @@ int unsigned Household Primary Contact ID Optional FK to Primary Contact for this household. + + + 1.1 Household diff --git a/xml/schema/Contact/ContactType.xml b/xml/schema/Contact/ContactType.xml index 29f1524a44..ca1c79aad7 100644 --- a/xml/schema/Contact/ContactType.xml +++ b/xml/schema/Contact/ContactType.xml @@ -67,7 +67,7 @@ parent_id - Contact Type Parent + Contact Type Parent ID int unsigned Optional FK to parent contact type. @@ -76,6 +76,9 @@ label parent_id IS NULL + + + 3.1 diff --git a/xml/schema/Contact/DashboardContact.xml b/xml/schema/Contact/DashboardContact.xml index 55a9085011..0621c356b0 100644 --- a/xml/schema/Contact/DashboardContact.xml +++ b/xml/schema/Contact/DashboardContact.xml @@ -23,9 +23,12 @@ dashboard_id int unsigned - Dashboard + Dashboard ID true Dashboard ID + + + 3.1 @@ -38,9 +41,12 @@ contact_id int unsigned - Dashboard Contact + Dashboard Contact ID true Contact ID + + + 3.1 diff --git a/xml/schema/Contact/Group.xml b/xml/schema/Contact/Group.xml index 4b7e03a115..622774a3f0 100644 --- a/xml/schema/Contact/Group.xml +++ b/xml/schema/Contact/Group.xml @@ -72,6 +72,9 @@ int unsigned Saved Search ID FK to saved search table. + + + 1.1 @@ -212,8 +215,11 @@ created_id int unsigned - Group Created By + Group Created By Contact ID FK to contact table. + + + 4.3 @@ -226,8 +232,11 @@ modified_id int unsigned - Group Modified By + Group Modified By Contact ID FK to contact table. + + + 4.5 diff --git a/xml/schema/Contact/GroupContact.xml b/xml/schema/Contact/GroupContact.xml index 94897930ad..ccbea1ba63 100644 --- a/xml/schema/Contact/GroupContact.xml +++ b/xml/schema/Contact/GroupContact.xml @@ -36,6 +36,7 @@ Select + @@ -51,6 +52,9 @@ Contact ID true FK to civicrm_contact + + + 1.1 @@ -77,8 +81,11 @@ location_id int unsigned - Group Contact Location + Group Contact Location ID Optional location to associate with this membership + + + 1.1 @@ -91,8 +98,11 @@ email_id int unsigned - Group Contact Email + Group Contact Email ID Optional email to associate with this membership + + + 1.1 diff --git a/xml/schema/Contact/GroupContactCache.xml b/xml/schema/Contact/GroupContactCache.xml index 5c1aa70565..991a709d75 100644 --- a/xml/schema/Contact/GroupContactCache.xml +++ b/xml/schema/Contact/GroupContactCache.xml @@ -23,7 +23,7 @@ group_id - Group + Group ID int unsigned true FK to civicrm_group @@ -35,6 +35,7 @@ Select + @@ -50,6 +51,9 @@ int unsigned true FK to civicrm_contact + + + 2.1 diff --git a/xml/schema/Contact/GroupNesting.xml b/xml/schema/Contact/GroupNesting.xml index 4a8a07b083..feb8a25139 100644 --- a/xml/schema/Contact/GroupNesting.xml +++ b/xml/schema/Contact/GroupNesting.xml @@ -24,10 +24,13 @@ child_group_id - Child Group + Child Group ID int unsigned true ID of the child group + + + 2.0 @@ -39,10 +42,13 @@ parent_group_id - Parent Group + Parent Group ID int unsigned true ID of the parent group + + + 2.0 diff --git a/xml/schema/Contact/GroupOrganization.xml b/xml/schema/Contact/GroupOrganization.xml index b44dbea2ce..53619dce16 100644 --- a/xml/schema/Contact/GroupOrganization.xml +++ b/xml/schema/Contact/GroupOrganization.xml @@ -24,7 +24,7 @@ group_id - Group + Group ID int unsigned true ID of the group @@ -36,6 +36,7 @@ Select + @@ -47,10 +48,13 @@ organization_id - Organization + Organization ID int unsigned true ID of the Organization Contact + + + 2.0 diff --git a/xml/schema/Contact/Household.xml b/xml/schema/Contact/Household.xml index 3c545045ff..a5134aff33 100644 --- a/xml/schema/Contact/Household.xml +++ b/xml/schema/Contact/Household.xml @@ -23,9 +23,13 @@ contact_id + Contact ID int unsigned true FK to Contact ID + + + 1.1 @@ -52,8 +56,12 @@ primary_contact_id + Primary Contact ID int unsigned Optional FK to Primary Contact for this household. + + + 1.1 diff --git a/xml/schema/Contact/Individual.xml b/xml/schema/Contact/Individual.xml index 4bfe467573..6935c9541f 100644 --- a/xml/schema/Contact/Individual.xml +++ b/xml/schema/Contact/Individual.xml @@ -23,9 +23,13 @@ contact_id + Contact ID int unsigned true FK to Contact ID + + + 1.1 diff --git a/xml/schema/Contact/Organization.xml b/xml/schema/Contact/Organization.xml index b566730ca0..696525b6fe 100644 --- a/xml/schema/Contact/Organization.xml +++ b/xml/schema/Contact/Organization.xml @@ -23,9 +23,13 @@ contact_id + Contact ID int unsigned true FK to Contact ID + + + 1.1 @@ -71,8 +75,12 @@ primary_contact_id + Primary Contact ID int unsigned Optional FK to Primary Contact for this organization. + + + 1.1 diff --git a/xml/schema/Contact/Relationship.xml b/xml/schema/Contact/Relationship.xml index 1cc609aabd..1d5fddad68 100644 --- a/xml/schema/Contact/Relationship.xml +++ b/xml/schema/Contact/Relationship.xml @@ -26,9 +26,12 @@ contact_id_a int unsigned - Contact A + Contact A ID true id of the first contact + + + 1.1 @@ -41,12 +44,13 @@ contact_id_b int unsigned - Contact B + Contact B ID true id of the second contact 1.1 EntityRef + @@ -59,12 +63,13 @@ relationship_type_id int unsigned - Relationship Type + Relationship Type ID true Type of relationship 1.1 Select + civicrm_relationship_type
@@ -159,9 +164,12 @@ case_id int unsigned - Relationship Case + Relationship Case ID NULL FK to civicrm_case + + + 2.2 diff --git a/xml/schema/Contact/RelationshipCache.xml b/xml/schema/Contact/RelationshipCache.xml index a77c2a322c..17d03c3670 100644 --- a/xml/schema/Contact/RelationshipCache.xml +++ b/xml/schema/Contact/RelationshipCache.xml @@ -28,9 +28,12 @@ relationship_id int unsigned - Relationship + Relationship ID true id of the relationship (FK to civicrm_relationship.id) + + + 5.29 @@ -44,9 +47,12 @@ relationship_type_id int unsigned - Relationship Type + Relationship Type ID true id of the relationship type + + + 5.29 @@ -79,6 +85,7 @@ 5.29 EntityRef + @@ -113,6 +120,7 @@ 5.29 EntityRef + diff --git a/xml/schema/Contact/SavedSearch.xml b/xml/schema/Contact/SavedSearch.xml index 04faabed09..fa209f0785 100644 --- a/xml/schema/Contact/SavedSearch.xml +++ b/xml/schema/Contact/SavedSearch.xml @@ -69,6 +69,9 @@ int unsigned Mapping ID Foreign key to civicrm_mapping used for saved search-builder searches. + + + 1.5 diff --git a/xml/schema/Contact/SubscriptionHistory.xml b/xml/schema/Contact/SubscriptionHistory.xml index 45a894604c..b3ceac0e40 100644 --- a/xml/schema/Contact/SubscriptionHistory.xml +++ b/xml/schema/Contact/SubscriptionHistory.xml @@ -28,6 +28,9 @@ int unsigned true Contact Id + + + 1.1 @@ -39,7 +42,7 @@ group_id - Group + Group ID int unsigned Group Id 1.1 @@ -50,6 +53,7 @@ Select + diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml index b19782b179..646cbe9d60 100644 --- a/xml/schema/Contribute/Contribution.xml +++ b/xml/schema/Contribute/Contribution.xml @@ -43,6 +43,7 @@ FK to Contact ID EntityRef + 1.3 @@ -353,6 +354,9 @@ int unsigned Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events. true + + + 1.4 @@ -412,9 +416,12 @@ address_id contribution_address_id - Contribution Address + Contribution Address ID int unsigned Conditional foreign key to civicrm_address.id. We insert an address record for each contribution when we have associated billing name and address data. + + + 2.2 true @@ -448,12 +455,13 @@ campaign_id contribution_campaign_id int unsigned - Campaign + Campaign ID true The campaign for which this contribution has been triggered. 3.4 Select + @@ -484,8 +492,8 @@ Total tax amount of this contribution. 4.6 - Text - + Text + campaign_id diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml index e5a48084d6..2d599e60aa 100644 --- a/xml/schema/Contribute/ContributionPage.xml +++ b/xml/schema/Contribute/ContributionPage.xml @@ -48,7 +48,7 @@ financial_type_id - Financial Type + Financial Type ID int unsigned default financial type assigned to contributions submitted via this page, e.g. Contribution, Campaign Contribution @@ -60,6 +60,9 @@ Select 4.3 + + + financial_type_id @@ -378,9 +381,12 @@ created_id - Contribution Page Created By + Contribution Page Created By Contact ID int unsigned FK to civicrm_contact, who created this contribution page + + + 3.0 @@ -423,6 +429,9 @@ Contribution Page Campaign ID int unsigned The campaign for which we are collecting contributions with this page. + + + 3.4 diff --git a/xml/schema/Contribute/ContributionProduct.xml b/xml/schema/Contribute/ContributionProduct.xml index 2cd3917c76..314e015f6e 100644 --- a/xml/schema/Contribute/ContributionProduct.xml +++ b/xml/schema/Contribute/ContributionProduct.xml @@ -33,6 +33,9 @@ Contribution ID int unsigned true + + + 1.4 @@ -97,7 +100,7 @@ financial_type_id - Financial Type + Financial Type ID int unsigned NULL @@ -106,6 +109,9 @@ name FK to Financial Type(for membership price sets only). + + + 4.3 diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml index a628d939ef..431bc7eea2 100644 --- a/xml/schema/Contribute/ContributionRecur.xml +++ b/xml/schema/Contribute/ContributionRecur.xml @@ -25,13 +25,14 @@ contact_id - Contact + Contact ID int unsigned true Foreign key to civicrm_contact.id. 1.6 EntityRef + @@ -205,6 +206,9 @@ Payment Token ID int unsigned Optionally used to store a link to a payment token used for this recurring contribution. + + + 4.6 @@ -342,7 +346,7 @@ payment_processor_id - Payment Processor + Payment Processor ID contribution_recur_payment_processor_id int unsigned Foreign key to civicrm_payment_processor.id @@ -354,6 +358,7 @@ Select + @@ -365,7 +370,7 @@ financial_type_id - Financial Type + Financial Type ID false int unsigned FK to Financial Type @@ -377,6 +382,7 @@ Select + @@ -408,12 +414,13 @@ campaign_id contribution_campaign_id int unsigned - Campaign + Campaign ID true The campaign for which this contribution has been triggered. 4.1 Select + diff --git a/xml/schema/Contribute/ContributionSoft.xml b/xml/schema/Contribute/ContributionSoft.xml index 2a21fc2c22..b60c2433e8 100644 --- a/xml/schema/Contribute/ContributionSoft.xml +++ b/xml/schema/Contribute/ContributionSoft.xml @@ -35,6 +35,9 @@ int unsigned true FK to contribution table. + + + 2.2 @@ -54,6 +57,9 @@ /contact(.?id)?/i /^\d+$/ FK to Contact ID + + + 2.2 @@ -96,9 +102,12 @@ pcp_id int unsigned - Soft Contribution PCP + Soft Contribution PCP ID NULL FK to civicrm_pcp.id + + + 2.2 civicrm_pcp
diff --git a/xml/schema/Contribute/PremiumsProduct.xml b/xml/schema/Contribute/PremiumsProduct.xml index 4731ba25f8..79b025e2b4 100644 --- a/xml/schema/Contribute/PremiumsProduct.xml +++ b/xml/schema/Contribute/PremiumsProduct.xml @@ -27,10 +27,13 @@ premiums_id - Premium + Premium ID int unsigned true Foreign key to premiums settings record. + + + 1.4 @@ -41,10 +44,13 @@ product_id - Product + Product ID int unsigned true Foreign key to each product object. + + + 1.4 @@ -62,7 +68,7 @@ financial_type_id - Financial Type + Financial Type ID int unsigned NULL @@ -71,6 +77,9 @@ name FK to Financial Type. + + + 4.3 diff --git a/xml/schema/Contribute/Product.xml b/xml/schema/Contribute/Product.xml index e24dbe28ea..e8fa3181c9 100644 --- a/xml/schema/Contribute/Product.xml +++ b/xml/schema/Contribute/Product.xml @@ -103,7 +103,7 @@ financial_type_id - Financial Type + Financial Type ID int unsigned NULL @@ -112,6 +112,9 @@ name FK to Financial Type. + + + 4.3 diff --git a/xml/schema/Contribute/Widget.xml b/xml/schema/Contribute/Widget.xml index 67c27eb59f..ba293a5825 100644 --- a/xml/schema/Contribute/Widget.xml +++ b/xml/schema/Contribute/Widget.xml @@ -25,9 +25,12 @@ contribution_page_id - Contribution Page + Contribution Page ID int unsigned The Contribution Page which triggered this contribution + + + 1.5 diff --git a/xml/schema/Core/ActionLog.xml b/xml/schema/Core/ActionLog.xml index d340db88cf..e126834bdc 100644 --- a/xml/schema/Core/ActionLog.xml +++ b/xml/schema/Core/ActionLog.xml @@ -25,6 +25,9 @@ Action Schedule Contact ID int unsigned FK to Contact ID + + + 3.4 @@ -57,10 +60,13 @@ action_schedule_id - Schedule + Schedule ID int unsigned true FK to the action schedule that this action originated from. + + + 3.4 diff --git a/xml/schema/Core/ActionSchedule.xml b/xml/schema/Core/ActionSchedule.xml index c582667bae..2e3e42ac82 100644 --- a/xml/schema/Core/ActionSchedule.xml +++ b/xml/schema/Core/ActionSchedule.xml @@ -232,7 +232,7 @@ group_id - Reminder Group + Reminder Group ID int unsigned FK to Group @@ -242,6 +242,7 @@ Select + 3.4 @@ -253,9 +254,12 @@ msg_template_id - Reminder Template + Reminder Template ID int unsigned FK to the message template. + + + msg_template_id @@ -265,9 +269,12 @@ sms_template_id - SMS Reminder Template + SMS Reminder Template ID int unsigned FK to the message template. + + + sms_template_id @@ -315,11 +322,12 @@ sms_provider_id - SMS Provider + SMS Provider ID int unsigned 4.5 Select + diff --git a/xml/schema/Core/Address.xml b/xml/schema/Core/Address.xml index 13894c1b5f..9eb295ad22 100644 --- a/xml/schema/Core/Address.xml +++ b/xml/schema/Core/Address.xml @@ -30,6 +30,9 @@ Contact ID int unsigned FK to Contact ID + + + 2.0 @@ -256,7 +259,7 @@ county_id int unsigned - County + County ID Which County does this address belong to. civicrm_county
@@ -266,6 +269,7 @@ ChainSelect state_province_id + 1.1 @@ -281,7 +285,7 @@ state_province_id - State/Province + State/Province ID int unsigned Which State_Province does this address belong to. @@ -293,6 +297,7 @@ ChainSelect country_id + 1.1 @@ -348,7 +353,7 @@ country_id - Country + Country ID int unsigned Which Country does this address belong to. @@ -361,6 +366,7 @@ country Select + 1.1 @@ -444,10 +450,13 @@ master_id - Master Address Belongs To + Master Address ID int unsigned true FK to Address ID + + + 3.3 diff --git a/xml/schema/Core/Cache.xml b/xml/schema/Core/Cache.xml index 1a6222f280..6afd66a7b8 100644 --- a/xml/schema/Core/Cache.xml +++ b/xml/schema/Core/Cache.xml @@ -66,6 +66,7 @@ Select + diff --git a/xml/schema/Core/Country.xml b/xml/schema/Core/Country.xml index 2390356c8f..93a980035f 100644 --- a/xml/schema/Core/Country.xml +++ b/xml/schema/Core/Country.xml @@ -50,9 +50,12 @@ address_format_id - Address Format + Address Format ID int unsigned Foreign key to civicrm_address_format.id. + + + 3.2 @@ -83,6 +86,9 @@ int unsigned true Foreign key to civicrm_worldregion.id. + + + 1.8 country diff --git a/xml/schema/Core/County.xml b/xml/schema/Core/County.xml index d143acc99a..71188e769d 100644 --- a/xml/schema/Core/County.xml +++ b/xml/schema/Core/County.xml @@ -42,10 +42,14 @@ state_province_id - State + State ID int unsigned true ID of State/Province that County belongs + + + + 1.1 civicrm_state_province
diff --git a/xml/schema/Core/CustomField.xml b/xml/schema/Core/CustomField.xml index c1c8bf02c3..df3803209a 100644 --- a/xml/schema/Core/CustomField.xml +++ b/xml/schema/Core/CustomField.xml @@ -26,7 +26,7 @@ custom_group_id int unsigned - Custom Group + Custom Group ID true FK to civicrm_custom_group. 1.1 @@ -37,6 +37,7 @@ Select + @@ -266,8 +267,11 @@ option_group_id int unsigned - Field Option Group + Field Option Group ID For elements with options, the option group id that is used + + + 1.4 civicrm_option_group
diff --git a/xml/schema/Core/CustomGroup.xml b/xml/schema/Core/CustomGroup.xml index 9ffea44fd2..93dcefafec 100644 --- a/xml/schema/Core/CustomGroup.xml +++ b/xml/schema/Core/CustomGroup.xml @@ -193,8 +193,11 @@ created_id int unsigned - Custom Group Created By + Custom Group Created By Contact ID FK to civicrm_contact, who created this custom group + + + 3.0 diff --git a/xml/schema/Core/Dashboard.xml b/xml/schema/Core/Dashboard.xml index e749be7e7a..b1b5a3adbe 100644 --- a/xml/schema/Core/Dashboard.xml +++ b/xml/schema/Core/Dashboard.xml @@ -23,7 +23,7 @@ domain_id int unsigned - Dashlet Domain + Dashlet Domain ID true civicrm_domain
@@ -31,6 +31,9 @@ name Domain for dashboard + + + 3.1 diff --git a/xml/schema/Core/Discount.xml b/xml/schema/Core/Discount.xml index 3fd601dc64..34e8505335 100644 --- a/xml/schema/Core/Discount.xml +++ b/xml/schema/Core/Discount.xml @@ -52,7 +52,7 @@ price_set_id participant_discount_name - Discount Name + Price Set ID int unsigned true @@ -62,6 +62,9 @@ true FK to civicrm_price_set + + + 4.3 diff --git a/xml/schema/Core/Domain.xml b/xml/schema/Core/Domain.xml index f647dcc81c..7abb2f4493 100644 --- a/xml/schema/Core/Domain.xml +++ b/xml/schema/Core/Domain.xml @@ -69,8 +69,11 @@ contact_id int unsigned - Domain Contact + Domain Contact ID FK to Contact ID. This is specifically not an FK to avoid circular constraints + + + 4.3 diff --git a/xml/schema/Core/Email.xml b/xml/schema/Core/Email.xml index 6537d19b02..8ad7a727e8 100644 --- a/xml/schema/Core/Email.xml +++ b/xml/schema/Core/Email.xml @@ -26,9 +26,12 @@ contact_id - Email Contact + Contact ID int unsigned FK to Contact ID + + + 2.0 diff --git a/xml/schema/Core/EntityFile.xml b/xml/schema/Core/EntityFile.xml index 4ebbd38a10..37ac0882c1 100644 --- a/xml/schema/Core/EntityFile.xml +++ b/xml/schema/Core/EntityFile.xml @@ -51,10 +51,13 @@ file_id - File + File ID int unsigned true FK to civicrm_file + + + 1.5 diff --git a/xml/schema/Core/EntityTag.xml b/xml/schema/Core/EntityTag.xml index f4699b88b8..e7aeb504de 100644 --- a/xml/schema/Core/EntityTag.xml +++ b/xml/schema/Core/EntityTag.xml @@ -49,7 +49,7 @@ tag_id int unsigned - Tag + Tag ID true FK to civicrm_tag 1.1 @@ -60,6 +60,7 @@ Select + diff --git a/xml/schema/Core/File.xml b/xml/schema/Core/File.xml index 687c390aa3..2161fdf63b 100644 --- a/xml/schema/Core/File.xml +++ b/xml/schema/Core/File.xml @@ -72,6 +72,9 @@ int unsigned Created By Contact ID FK to civicrm_contact, who uploaded this file + + + 5.3 diff --git a/xml/schema/Core/IM.xml b/xml/schema/Core/IM.xml index cf9d18539d..b2fa35dcda 100644 --- a/xml/schema/Core/IM.xml +++ b/xml/schema/Core/IM.xml @@ -28,9 +28,12 @@ contact_id - IM Contact + IM Contact ID int unsigned FK to Contact ID + + + 2.0 diff --git a/xml/schema/Core/Job.xml b/xml/schema/Core/Job.xml index acb6a90197..a04a06b27b 100644 --- a/xml/schema/Core/Job.xml +++ b/xml/schema/Core/Job.xml @@ -24,7 +24,7 @@ domain_id - Job Domain + Job Domain ID int unsigned true @@ -33,6 +33,9 @@ name Which Domain is this scheduled job for + + + 4.1 diff --git a/xml/schema/Core/JobLog.xml b/xml/schema/Core/JobLog.xml index 2d09187b09..55ca2ead8b 100644 --- a/xml/schema/Core/JobLog.xml +++ b/xml/schema/Core/JobLog.xml @@ -33,6 +33,9 @@ name Which Domain is this scheduled job for + + + 4.1 diff --git a/xml/schema/Core/LocBlock.xml b/xml/schema/Core/LocBlock.xml index 675620460d..b6128b8a17 100644 --- a/xml/schema/Core/LocBlock.xml +++ b/xml/schema/Core/LocBlock.xml @@ -24,8 +24,11 @@ address_id - Location Block Address + Location Block Address ID int unsigned + + + 2.0 @@ -37,8 +40,11 @@ email_id - Location Block Email + Location Block Email ID int unsigned + + + 2.0 @@ -50,8 +56,11 @@ phone_id - Location Block Phone + Location Block Phone ID int unsigned + + + 2.0 @@ -63,8 +72,11 @@ im_id - Location Block IM + Location Block IM ID int unsigned + + + 2.0 @@ -76,8 +88,11 @@ address_2_id - Location Block IM 2 + Location Block IM 2 ID int unsigned + + + 2.0 @@ -90,7 +105,10 @@ email_2_id int unsigned - Email 2 + Email 2 ID + + + 2.0 @@ -103,7 +121,10 @@ phone_2_id int unsigned - Phone 2 + Phone 2 ID + + + 2.0 @@ -116,7 +137,10 @@ im_2_id int unsigned - Instant Messenger 2 + Instant Messenger 2 ID + + + 2.0 diff --git a/xml/schema/Core/Log.xml b/xml/schema/Core/Log.xml index 3809abee96..6094a7e1bd 100644 --- a/xml/schema/Core/Log.xml +++ b/xml/schema/Core/Log.xml @@ -59,9 +59,12 @@ modified_id - Modified By + Modified By Contact ID int unsigned FK to Contact ID of person under whose credentials this data modification was made. + + + 1.5 diff --git a/xml/schema/Core/MailSettings.xml b/xml/schema/Core/MailSettings.xml index e41b2f190c..6dc2935fec 100644 --- a/xml/schema/Core/MailSettings.xml +++ b/xml/schema/Core/MailSettings.xml @@ -21,7 +21,7 @@ domain_id - Mail Settings Domain + Mail Settings Domain ID int unsigned true @@ -30,6 +30,9 @@ name Which Domain is this match entry for + + + 3.1 diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml index efa514ff3d..0c69894a82 100644 --- a/xml/schema/Core/MappingField.xml +++ b/xml/schema/Core/MappingField.xml @@ -28,6 +28,9 @@ Mapping ID true Mapping to which this field belongs + + + 1.2 @@ -68,6 +71,9 @@ int unsigned Location type ID Location type of this mapping, if required + + + 1.2 civicrm_location_type
@@ -120,6 +126,9 @@ int unsigned Relationship type ID Relationship type, if required + + + 1.2 diff --git a/xml/schema/Core/Menu.xml b/xml/schema/Core/Menu.xml index c627290a7b..26f888f494 100644 --- a/xml/schema/Core/Menu.xml +++ b/xml/schema/Core/Menu.xml @@ -22,7 +22,7 @@ domain_id - Domain + Domain ID int unsigned true @@ -31,6 +31,9 @@ name Which Domain is this menu item for + + + 3.0 @@ -121,7 +124,7 @@ component_id - Component + Component ID int unsigned Component that this menu item belongs to 2.1 @@ -132,6 +135,7 @@ Select + diff --git a/xml/schema/Core/Navigation.xml b/xml/schema/Core/Navigation.xml index 373c3199df..6bedd2cad3 100644 --- a/xml/schema/Core/Navigation.xml +++ b/xml/schema/Core/Navigation.xml @@ -23,7 +23,7 @@ domain_id - Navigation Domain + Navigation Domain ID int unsigned true @@ -32,6 +32,9 @@ name Which Domain is this navigation item for + + + 3.0 @@ -101,6 +104,9 @@ name label + + + 3.0 diff --git a/xml/schema/Core/Note.xml b/xml/schema/Core/Note.xml index 497b37dbd1..ef4b3f1449 100644 --- a/xml/schema/Core/Note.xml +++ b/xml/schema/Core/Note.xml @@ -71,9 +71,12 @@ contact_id - Note Created By + Note Created By Contact ID int unsigned FK to Contact ID creator + + + 1.1 diff --git a/xml/schema/Core/OpenID.xml b/xml/schema/Core/OpenID.xml index 81a396a44d..5bb968fbb7 100644 --- a/xml/schema/Core/OpenID.xml +++ b/xml/schema/Core/OpenID.xml @@ -22,9 +22,12 @@ contact_id - OpenID Contact + OpenID Contact ID int unsigned FK to Contact ID + + + 2.0 diff --git a/xml/schema/Core/OptionValue.xml b/xml/schema/Core/OptionValue.xml index 7109e02c74..563e0021e7 100644 --- a/xml/schema/Core/OptionValue.xml +++ b/xml/schema/Core/OptionValue.xml @@ -12,9 +12,6 @@ int unsigned true Option ID - - Number - 1.5 @@ -36,6 +33,7 @@ Select + @@ -144,7 +142,7 @@ component_id - Option Component + Option Component ID int unsigned Component that this option value belongs/caters to. 2.0 @@ -155,6 +153,7 @@ Select + @@ -165,7 +164,7 @@ domain_id - Option Domain + Option Domain ID int unsigned civicrm_domain
@@ -173,6 +172,9 @@ name Which Domain is this option value for + + + 3.1 diff --git a/xml/schema/Core/Phone.xml b/xml/schema/Core/Phone.xml index e52e2b8344..7f50e12da0 100644 --- a/xml/schema/Core/Phone.xml +++ b/xml/schema/Core/Phone.xml @@ -26,9 +26,12 @@ contact_id - Phone Contact + Phone Contact ID int unsigned FK to Contact ID + + + 2.0 diff --git a/xml/schema/Core/Preferences.xml b/xml/schema/Core/Preferences.xml index 49e1127e13..e8de3e45cd 100644 --- a/xml/schema/Core/Preferences.xml +++ b/xml/schema/Core/Preferences.xml @@ -23,9 +23,13 @@ domain_id + Domain ID int unsigned true Which Domain is this menu item for + + + 3.0 @@ -37,8 +41,12 @@ contact_id + Contact ID int unsigned FK to Contact ID + + + 1.8 diff --git a/xml/schema/Core/PrintLabel.xml b/xml/schema/Core/PrintLabel.xml index 6f859c8503..40846eeca3 100644 --- a/xml/schema/Core/PrintLabel.xml +++ b/xml/schema/Core/PrintLabel.xml @@ -102,10 +102,12 @@ created_id - Label Created By int unsigned Created By Contact ID FK to civicrm_contact, who created this label layout + + + 4.4 diff --git a/xml/schema/Core/Setting.xml b/xml/schema/Core/Setting.xml index 04230bc83f..81c80c59a9 100644 --- a/xml/schema/Core/Setting.xml +++ b/xml/schema/Core/Setting.xml @@ -54,7 +54,7 @@ domain_id - Setting Domain + Setting Domain ID int unsigned true @@ -63,6 +63,9 @@ name Which Domain is this menu item for + + + 4.1 @@ -74,9 +77,12 @@ contact_id - Setting Contact + Setting Contact ID int unsigned FK to Contact ID if the setting is localized to a contact + + + 4.1 @@ -95,7 +101,7 @@ component_id - Setting Component + Setting Component ID int unsigned Component that this menu item belongs to 4.1 @@ -106,6 +112,7 @@ Select + @@ -123,9 +130,12 @@ created_id - Setting Created By + Setting Created By Contact ID int unsigned FK to civicrm_contact, who created this setting + + + 4.1 diff --git a/xml/schema/Core/StateProvince.xml b/xml/schema/Core/StateProvince.xml index d72d6aa8cf..3e3cd60a74 100644 --- a/xml/schema/Core/StateProvince.xml +++ b/xml/schema/Core/StateProvince.xml @@ -44,10 +44,13 @@ country_id - Country + Country ID int unsigned true ID of Country that State/Province belong + + + 1.1 diff --git a/xml/schema/Core/StatusPreference.xml b/xml/schema/Core/StatusPreference.xml index 7dcf5d1db9..da83b370bb 100644 --- a/xml/schema/Core/StatusPreference.xml +++ b/xml/schema/Core/StatusPreference.xml @@ -23,7 +23,7 @@ domain_id - Setting Domain + Setting Domain ID int unsigned true @@ -32,6 +32,9 @@ name Which Domain is this Status Preference for + + + 4.7 diff --git a/xml/schema/Core/Tag.xml b/xml/schema/Core/Tag.xml index 5f573db47d..c1ec1b0bcf 100644 --- a/xml/schema/Core/Tag.xml +++ b/xml/schema/Core/Tag.xml @@ -43,7 +43,7 @@ parent_id - Parent Tag + Parent Tag ID int unsigned NULL Optional parent id for this tag. @@ -52,6 +52,9 @@ id name + + + 1.1 @@ -105,9 +108,12 @@ created_id - Tag Created By + Tag Created By Contact ID int unsigned FK to civicrm_contact, who created this tag + + + 3.4 diff --git a/xml/schema/Core/Timezone.xml b/xml/schema/Core/Timezone.xml index 21738c06b7..636414c2b1 100644 --- a/xml/schema/Core/Timezone.xml +++ b/xml/schema/Core/Timezone.xml @@ -53,10 +53,13 @@ country_id - Country + Country ID int unsigned true Country Id + + + 1.8 diff --git a/xml/schema/Core/UFField.xml b/xml/schema/Core/UFField.xml index df10ddf86b..bef64f3ed0 100644 --- a/xml/schema/Core/UFField.xml +++ b/xml/schema/Core/UFField.xml @@ -36,6 +36,7 @@ Select + @@ -139,9 +140,12 @@ location_type_id - Profile Field Location Type + Profile Field Location Type ID int unsigned Location type of this mapping, if required + + + 1.3 diff --git a/xml/schema/Core/UFGroup.xml b/xml/schema/Core/UFGroup.xml index 6af9ceaff0..adcdc8cbcc 100644 --- a/xml/schema/Core/UFGroup.xml +++ b/xml/schema/Core/UFGroup.xml @@ -104,9 +104,12 @@ limit_listings_group_id - Profile Search Limit Group + Profile Search Limit Group ID int unsigned Group id, foreign key from civicrm_group + + + 1.4 @@ -125,9 +128,12 @@ add_to_group_id - Add Contact To Group + Add Contact To Group ID int unsigned foreign key to civicrm_group_id + + + add_to_group_id @@ -220,9 +226,12 @@ created_id - Profile Created By + Profile Created By Contact ID int unsigned FK to civicrm_contact, who created this UF group + + + 3.0 diff --git a/xml/schema/Core/UFJoin.xml b/xml/schema/Core/UFJoin.xml index d007086ea3..db81d0dcee 100644 --- a/xml/schema/Core/UFJoin.xml +++ b/xml/schema/Core/UFJoin.xml @@ -91,6 +91,7 @@ Select + diff --git a/xml/schema/Core/UFMatch.xml b/xml/schema/Core/UFMatch.xml index 1fe9e9a490..afe64226b5 100644 --- a/xml/schema/Core/UFMatch.xml +++ b/xml/schema/Core/UFMatch.xml @@ -33,6 +33,9 @@ id name + + + 3.0 @@ -67,6 +70,9 @@ CiviCRM Contact ID int unsigned FK to Contact ID + + + 1.1 diff --git a/xml/schema/Core/Website.xml b/xml/schema/Core/Website.xml index 52b0da20ce..5c33851b79 100644 --- a/xml/schema/Core/Website.xml +++ b/xml/schema/Core/Website.xml @@ -25,9 +25,12 @@ contact_id - Contact + Contact ID int unsigned FK to Contact ID + + + 3.2 diff --git a/xml/schema/Core/WordReplacement.xml b/xml/schema/Core/WordReplacement.xml index 84e6425a92..5b1cd7303e 100644 --- a/xml/schema/Core/WordReplacement.xml +++ b/xml/schema/Core/WordReplacement.xml @@ -78,6 +78,9 @@ name FK to Domain ID. This is for Domain specific word replacement + + + 1.1 diff --git a/xml/schema/Dedupe/Exception.xml b/xml/schema/Dedupe/Exception.xml index a183ccaa53..088ae2d467 100644 --- a/xml/schema/Dedupe/Exception.xml +++ b/xml/schema/Dedupe/Exception.xml @@ -25,6 +25,9 @@ First Dupe Contact ID int unsigned FK to Contact ID + + + 3.3 TRUE @@ -40,6 +43,9 @@ Second Dupe Contact ID int unsigned FK to Contact ID + + + 3.3 TRUE diff --git a/xml/schema/Dedupe/Rule.xml b/xml/schema/Dedupe/Rule.xml index 70b4864071..3ff7ad4af1 100644 --- a/xml/schema/Dedupe/Rule.xml +++ b/xml/schema/Dedupe/Rule.xml @@ -22,10 +22,13 @@ dedupe_rule_group_id - Dedupe Rule Group + Dedupe Rule Group ID int unsigned true The id of the rule group this rule belongs to + + + 1.8 diff --git a/xml/schema/Event/Cart/Cart.xml b/xml/schema/Event/Cart/Cart.xml index 8830f37df8..9b8eb9cdba 100644 --- a/xml/schema/Event/Cart/Cart.xml +++ b/xml/schema/Event/Cart/Cart.xml @@ -24,9 +24,12 @@ user_id - Created By + Created By Contact ID int unsigned FK to civicrm_contact who created this cart + + + 4.1 diff --git a/xml/schema/Event/Cart/EventInCart.xml b/xml/schema/Event/Cart/EventInCart.xml index 6ab1292097..50b083f029 100644 --- a/xml/schema/Event/Cart/EventInCart.xml +++ b/xml/schema/Event/Cart/EventInCart.xml @@ -24,9 +24,12 @@ event_id - Event + Event ID int unsigned FK to Event ID + + + 4.1 @@ -38,9 +41,12 @@ event_cart_id - Event In Cart + Event Cart ID int unsigned FK to Event Cart ID + + + 4.1 diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml index 5d98615978..15a05cb026 100644 --- a/xml/schema/Event/Event.xml +++ b/xml/schema/Event/Event.xml @@ -310,6 +310,9 @@ int unsigned Location Block ID FK to Location Block ID + + + 2.0 @@ -733,6 +736,9 @@ int unsigned Created By Contact ID FK to civicrm_contact, who created this event + + + 3.0 @@ -772,12 +778,13 @@ campaign_id int unsigned - Campaign + Campaign ID The campaign for which this event has been created. 3.4 EntityRef - + + campaign_id @@ -837,7 +844,7 @@ dedupe_rule_group_id int unsigned - Dedupe Rule + Dedupe Rule ID NULL Rule to use when matching registrations for this event @@ -849,6 +856,7 @@ 4.5 Select + diff --git a/xml/schema/Event/Participant.xml b/xml/schema/Event/Participant.xml index 4a35e6109a..2cf7f41567 100644 --- a/xml/schema/Event/Participant.xml +++ b/xml/schema/Event/Participant.xml @@ -35,6 +35,9 @@ true true FK to Contact ID + + + 1.7 @@ -46,11 +49,14 @@ event_id int unsigned - Event + Event ID true /event id$/i true FK to Event ID + + + 1.7 @@ -62,7 +68,7 @@ status_id participant_status_id - Participant Status + Participant Status ID /(participant.)?(status)$/i true int unsigned @@ -78,6 +84,7 @@ Select + @@ -192,10 +199,13 @@ registered_by_id participant_registered_by_id int unsigned - Registered By ID + Registered By Participant ID true NULL FK to Participant ID + + + 2.1 true @@ -213,6 +223,9 @@ Discount ID NULL FK to Discount ID + + + 2.1 @@ -249,9 +262,12 @@ campaign_id participant_campaign_id int unsigned - Campaign + Campaign ID true The campaign for which this participant has been registered. + + + 3.4 @@ -272,6 +288,9 @@ int unsigned Event Cart ID FK to civicrm_event_carts + + + 4.1 @@ -296,6 +315,9 @@ /transfer(.?id)?/i true FK to Contact ID + + + 4.7 diff --git a/xml/schema/Event/ParticipantPayment.xml b/xml/schema/Event/ParticipantPayment.xml index 0e240e3805..e91338563e 100644 --- a/xml/schema/Event/ParticipantPayment.xml +++ b/xml/schema/Event/ParticipantPayment.xml @@ -28,6 +28,9 @@ int unsigned true Participant Id (FK) + + + 1.7 @@ -38,10 +41,13 @@ contribution_id - Contribution + Contribution ID int unsigned true FK to contribution table. + + + 2.0 diff --git a/xml/schema/Financial/EntityFinancialAccount.xml b/xml/schema/Financial/EntityFinancialAccount.xml index 43739da852..95e3111928 100644 --- a/xml/schema/Financial/EntityFinancialAccount.xml +++ b/xml/schema/Financial/EntityFinancialAccount.xml @@ -63,7 +63,7 @@ financial_account_id int unsigned - Financial Account + Financial Account ID true 4.3 FK to the financial_account_id @@ -74,6 +74,7 @@ Select + diff --git a/xml/schema/Financial/EntityFinancialTrxn.xml b/xml/schema/Financial/EntityFinancialTrxn.xml index 33d409024b..dd40409bd9 100644 --- a/xml/schema/Financial/EntityFinancialTrxn.xml +++ b/xml/schema/Financial/EntityFinancialTrxn.xml @@ -45,8 +45,11 @@ financial_trxn_id - Financial Transaction Id + Financial Transaction ID int unsigned + + + 3.2 diff --git a/xml/schema/Financial/FinancialAccount.xml b/xml/schema/Financial/FinancialAccount.xml index 7b566a67ea..7c0f0b109c 100644 --- a/xml/schema/Financial/FinancialAccount.xml +++ b/xml/schema/Financial/FinancialAccount.xml @@ -37,6 +37,9 @@ Contact ID int unsigned FK to Contact ID that is responsible for the funds in this account + + + 4.3 @@ -90,8 +93,11 @@ parent_id int unsigned - Financial Account Parent + Financial Account Parent ID Parent ID in account hierarchy + + + 4.3 diff --git a/xml/schema/Financial/FinancialItem.xml b/xml/schema/Financial/FinancialItem.xml index 5c3d822b07..88d1b58df5 100644 --- a/xml/schema/Financial/FinancialItem.xml +++ b/xml/schema/Financial/FinancialItem.xml @@ -48,6 +48,9 @@ true true FK to Contact ID of contact the item is from + + + 4.3 @@ -108,6 +111,7 @@ Select + diff --git a/xml/schema/Financial/FinancialTrxn.xml b/xml/schema/Financial/FinancialTrxn.xml index 4893a69b2b..9913e342e8 100644 --- a/xml/schema/Financial/FinancialTrxn.xml +++ b/xml/schema/Financial/FinancialTrxn.xml @@ -24,7 +24,7 @@ from_financial_account_id int unsigned - Financial Transaction From Account + Financial Transaction From Account ID FK to financial_account table. 4.3 @@ -34,6 +34,7 @@ Select + @@ -44,7 +45,7 @@ to_financial_account_id - Financial Transaction To Account + Financial Transaction To Account ID int unsigned FK to financial_financial_account table. 4.3 @@ -55,6 +56,7 @@ Select + @@ -168,7 +170,7 @@ payment_processor_id - Payment Processor + Payment Processor ID int unsigned Payment Processor for this financial transaction @@ -178,6 +180,7 @@ Select + 4.3 diff --git a/xml/schema/Financial/PaymentProcessor.xml b/xml/schema/Financial/PaymentProcessor.xml index 330511ca43..f1123d71bd 100644 --- a/xml/schema/Financial/PaymentProcessor.xml +++ b/xml/schema/Financial/PaymentProcessor.xml @@ -23,7 +23,7 @@ domain_id - Payment Processor Domain + Payment Processor Domain ID int unsigned true @@ -32,6 +32,9 @@ name Which Domain is this match entry for + + + 3.0 @@ -85,6 +88,9 @@ true 10 + + + 4.3 diff --git a/xml/schema/Financial/PaymentToken.xml b/xml/schema/Financial/PaymentToken.xml index 3f396023b4..545602f41c 100644 --- a/xml/schema/Financial/PaymentToken.xml +++ b/xml/schema/Financial/PaymentToken.xml @@ -29,6 +29,9 @@ int unsigned true FK to Contact ID for the owner of the token + + + 4.6 @@ -44,6 +47,9 @@ int unsigned true + + + 4.6 @@ -75,6 +81,9 @@ Created ID int unsigned Contact ID of token creator + + + 4.6 diff --git a/xml/schema/Grant/Grant.xml b/xml/schema/Grant/Grant.xml index e248dd2c99..2e8bc67946 100644 --- a/xml/schema/Grant/Grant.xml +++ b/xml/schema/Grant/Grant.xml @@ -41,8 +41,9 @@ Contact ID of contact record given grant belongs to. 1.8 - EntityRef - + EntityRef + + contact_id @@ -226,7 +227,7 @@ financial_type_id - Financial Type + Financial Type ID int unsigned NULL @@ -235,6 +236,9 @@ name FK to Financial Type. + + + 4.3 diff --git a/xml/schema/Mailing/BouncePattern.xml b/xml/schema/Mailing/BouncePattern.xml index f6b452fbbd..da478ded8f 100644 --- a/xml/schema/Mailing/BouncePattern.xml +++ b/xml/schema/Mailing/BouncePattern.xml @@ -21,7 +21,7 @@ bounce_type_id - Bounce Type + Bounce Type ID int unsigned true Type of bounce @@ -30,6 +30,9 @@ id name + + + bounce_type_id diff --git a/xml/schema/Mailing/Event/Bounce.xml b/xml/schema/Mailing/Event/Bounce.xml index 3bd5b16558..6677222391 100644 --- a/xml/schema/Mailing/Event/Bounce.xml +++ b/xml/schema/Mailing/Event/Bounce.xml @@ -24,10 +24,13 @@ event_queue_id - Event Queue + Event Queue ID int unsigned true FK to EventQueue + + + event_queue_id diff --git a/xml/schema/Mailing/Event/Confirm.xml b/xml/schema/Mailing/Event/Confirm.xml index a436a1ee6e..51c5b37b92 100644 --- a/xml/schema/Mailing/Event/Confirm.xml +++ b/xml/schema/Mailing/Event/Confirm.xml @@ -28,6 +28,9 @@ int unsigned true FK to civicrm_mailing_event_subscribe + + + event_subscribe_id diff --git a/xml/schema/Mailing/Event/Delivered.xml b/xml/schema/Mailing/Event/Delivered.xml index eb2eff5d5f..17d676dfaa 100644 --- a/xml/schema/Mailing/Event/Delivered.xml +++ b/xml/schema/Mailing/Event/Delivered.xml @@ -24,10 +24,13 @@ event_queue_id - Event Queue + Event Queue ID int unsigned true FK to EventQueue + + + event_queue_id diff --git a/xml/schema/Mailing/Event/Forward.xml b/xml/schema/Mailing/Event/Forward.xml index d5c9ce91d5..588f8540a3 100644 --- a/xml/schema/Mailing/Event/Forward.xml +++ b/xml/schema/Mailing/Event/Forward.xml @@ -24,10 +24,13 @@ event_queue_id - Mailing Event Queue + Mailing Event Queue ID int unsigned true FK to EventQueue + + + event_queue_id @@ -37,9 +40,12 @@ dest_queue_id - Destination Queue + Destination Queue ID int unsigned FK to EventQueue for destination + + + dest_queue_id diff --git a/xml/schema/Mailing/Event/Opened.xml b/xml/schema/Mailing/Event/Opened.xml index 6c4e6e2ebb..6b71ab226b 100644 --- a/xml/schema/Mailing/Event/Opened.xml +++ b/xml/schema/Mailing/Event/Opened.xml @@ -24,10 +24,13 @@ event_queue_id - Event Queue + Event Queue ID int unsigned true FK to EventQueue + + + event_queue_id diff --git a/xml/schema/Mailing/Event/Queue.xml b/xml/schema/Mailing/Event/Queue.xml index 97d15c2bad..6449d51afe 100644 --- a/xml/schema/Mailing/Event/Queue.xml +++ b/xml/schema/Mailing/Event/Queue.xml @@ -28,6 +28,9 @@ true Job ID FK to Job + + + job_id @@ -41,6 +44,9 @@ NULL Email ID FK to Email + + + email_id @@ -54,6 +60,9 @@ true Contact ID FK to Contact + + + contact_id @@ -80,6 +89,9 @@ NULL Phone ID FK to Phone + + + phone_id diff --git a/xml/schema/Mailing/Event/Reply.xml b/xml/schema/Mailing/Event/Reply.xml index e8dfb1a239..4f5d801999 100644 --- a/xml/schema/Mailing/Event/Reply.xml +++ b/xml/schema/Mailing/Event/Reply.xml @@ -22,10 +22,13 @@ event_queue_id - Event Queue + Event Queue ID int unsigned true FK to EventQueue + + + event_queue_id diff --git a/xml/schema/Mailing/Event/Subscribe.xml b/xml/schema/Mailing/Event/Subscribe.xml index 6b8371704d..f7028b03c6 100644 --- a/xml/schema/Mailing/Event/Subscribe.xml +++ b/xml/schema/Mailing/Event/Subscribe.xml @@ -22,7 +22,7 @@ group_id - Mailing Subscribe Group + Mailing Subscribe Group ID int unsigned true FK to Group @@ -33,6 +33,7 @@ Select + @@ -43,10 +44,13 @@ contact_id - Mailing Subscribe Contact + Mailing Subscribe Contact ID int unsigned true FK to Contact + + + contact_id diff --git a/xml/schema/Mailing/Event/TrackableURLOpen.xml b/xml/schema/Mailing/Event/TrackableURLOpen.xml index c880b90f26..3fef9d75e9 100644 --- a/xml/schema/Mailing/Event/TrackableURLOpen.xml +++ b/xml/schema/Mailing/Event/TrackableURLOpen.xml @@ -22,10 +22,13 @@ event_queue_id - Event Queue + Event Queue ID int unsigned true FK to EventQueue + + + event_queue_id @@ -35,10 +38,13 @@ trackable_url_id - Trackable Url + Trackable Url ID int unsigned true FK to TrackableURL + + + trackable_url_id diff --git a/xml/schema/Mailing/Event/Unsubscribe.xml b/xml/schema/Mailing/Event/Unsubscribe.xml index c46fee37ce..bacdf41b80 100644 --- a/xml/schema/Mailing/Event/Unsubscribe.xml +++ b/xml/schema/Mailing/Event/Unsubscribe.xml @@ -22,10 +22,13 @@ event_queue_id - Mailing Event Queue + Mailing Event Queue ID int unsigned true FK to EventQueue + + + event_queue_id diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml index d819e480d1..de24408d2a 100644 --- a/xml/schema/Mailing/Mailing.xml +++ b/xml/schema/Mailing/Mailing.xml @@ -27,7 +27,7 @@ domain_id - Mailing Domain + Mailing Domain ID int unsigned civicrm_domain
@@ -35,6 +35,9 @@ name Which site is this mailing for + + + 3.4 @@ -46,7 +49,7 @@ header_id - Mailing Header + Mailing Header ID int unsigned civicrm_mailing_component
@@ -55,6 +58,9 @@ component_type = "Header" FK to the header component. + + + header_id @@ -64,7 +70,7 @@ footer_id - Mailing Footer + Mailing Footer ID int unsigned civicrm_mailing_component
@@ -73,6 +79,9 @@ component_type = "Footer" FK to the footer component. + + + footer_id @@ -82,9 +91,12 @@ reply_id - Mailing Reply + Mailing Reply ID int unsigned FK to the auto-responder component. + + + reply_id @@ -94,9 +106,12 @@ unsubscribe_id - Mailing Unsubscribe + Mailing Unsubscribe ID int unsigned FK to the unsubscribe component. + + + unsubscribe_id @@ -109,17 +124,14 @@ Mailing Resubscribe int unsigned - - optout_id - civicrm_mailing_component
- id - SET NULL - optout_id - Mailing Opt Out + Mailing Opt Out ID int unsigned FK to the opt-out component. + + + optout_id @@ -259,9 +271,12 @@ msg_template_id - Mailing Message Template + Mailing Message Template ID int unsigned FK to the message template. + + + msg_template_id @@ -281,9 +296,12 @@ created_id - Mailing Creator + Mailing Created By Contact ID int unsigned FK to Contact ID who first created this mailing + + + created_id @@ -316,9 +334,12 @@ scheduled_id - Scheduled By + Scheduled By Contact ID int unsigned FK to Contact ID who scheduled this mailing + + + scheduled_id @@ -341,9 +362,12 @@ approver_id - Approved By + Approved By Contact ID int unsigned FK to Contact ID who approved this mailing + + + approver_id @@ -416,11 +440,12 @@ campaign_id int unsigned - Mailing Campaign + Mailing Campaign ID The campaign for which this mailing has been initiated. 3.4 Select + @@ -442,11 +467,12 @@ sms_provider_id - Mailing SMS Provider + Mailing SMS Provider ID int unsigned 4.2 Select + @@ -471,7 +497,7 @@ location_type_id - Location Type + Location Type ID int unsigned With email_selection_method, determines which email address to use @@ -479,6 +505,9 @@ id display_name + + + 4.6 diff --git a/xml/schema/Mailing/MailingAB.xml b/xml/schema/Mailing/MailingAB.xml index 75c67b431d..6956687f9a 100644 --- a/xml/schema/Mailing/MailingAB.xml +++ b/xml/schema/Mailing/MailingAB.xml @@ -111,9 +111,12 @@ created_id - AB Test Created By + AB Test Created By Contact ID int unsigned FK to Contact ID + + + 4.6 diff --git a/xml/schema/Mailing/MailingGroup.xml b/xml/schema/Mailing/MailingGroup.xml index 32476ccde9..2a167036a2 100644 --- a/xml/schema/Mailing/MailingGroup.xml +++ b/xml/schema/Mailing/MailingGroup.xml @@ -22,10 +22,13 @@ mailing_id - Mailing + Mailing ID int unsigned true The ID of a previous mailing to include/exclude recipients. + + + mailing_id diff --git a/xml/schema/Mailing/MailingJob.xml b/xml/schema/Mailing/MailingJob.xml index 8816d97b32..13b80d6499 100644 --- a/xml/schema/Mailing/MailingJob.xml +++ b/xml/schema/Mailing/MailingJob.xml @@ -22,10 +22,13 @@ mailing_id - Mailing + Mailing ID int unsigned true The ID of the mailing this Job will send. + + + mailing_id @@ -103,10 +106,13 @@ parent_id - Mailing Job Parent + Mailing Job Parent ID int unsigned Parent job id NULL + + + 3.3 diff --git a/xml/schema/Mailing/Recipients.xml b/xml/schema/Mailing/Recipients.xml index e909c87994..bb1722fca0 100644 --- a/xml/schema/Mailing/Recipients.xml +++ b/xml/schema/Mailing/Recipients.xml @@ -24,9 +24,12 @@ mailing_id - Mailing + Mailing ID int unsigned true + + + The ID of the mailing this Job will send. @@ -37,10 +40,13 @@ contact_id - Mailing Recipient + Mailing Recipient ID int unsigned true FK to Contact + + + contact_id @@ -50,10 +56,13 @@ email_id - Recipient Email + Recipient Email ID int unsigned NULL FK to Email + + + email_id @@ -63,10 +72,13 @@ phone_id - Recipient Phone + Recipient Phone ID int unsigned NULL FK to Phone + + + phone_id diff --git a/xml/schema/Mailing/Spool.xml b/xml/schema/Mailing/Spool.xml index f192b62d25..16030ab2b7 100644 --- a/xml/schema/Mailing/Spool.xml +++ b/xml/schema/Mailing/Spool.xml @@ -21,10 +21,13 @@ job_id - Mailing Job + Mailing Job ID int unsigned true The ID of the Job . + + + job_id diff --git a/xml/schema/Mailing/TrackableURL.xml b/xml/schema/Mailing/TrackableURL.xml index ef5c4308d3..a22a6bc1c1 100644 --- a/xml/schema/Mailing/TrackableURL.xml +++ b/xml/schema/Mailing/TrackableURL.xml @@ -29,9 +29,12 @@ mailing_id - Mailing + Mailing ID int unsigned true + + + FK to the mailing diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml index 239d400772..0df4d7474b 100644 --- a/xml/schema/Member/Membership.xml +++ b/xml/schema/Member/Membership.xml @@ -47,6 +47,7 @@ 1.5 EntityRef + @@ -143,7 +144,7 @@ status_id - Membership Status Id + Membership Status ID true /(member(ship|).)?(status)$/i int unsigned @@ -157,6 +158,7 @@ Select + 1.5 @@ -200,6 +202,9 @@ Primary Member ID Optional FK to Parent Membership. true + + + 1.7 @@ -252,10 +257,13 @@ contribution_recur_id membership_recur_id - Membership Recurring Contribution + Membership Recurring Contribution ID int unsigned true Conditional foreign key to civicrm_contribution_recur id. Each membership in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events. + + + 3.3 @@ -269,12 +277,13 @@ campaign_id member_campaign_id int unsigned - Campaign + Campaign ID true The campaign for which this membership is attached. 3.4 Select + diff --git a/xml/schema/Member/MembershipBlock.xml b/xml/schema/Member/MembershipBlock.xml index a4d14b672f..da845de4ae 100644 --- a/xml/schema/Member/MembershipBlock.xml +++ b/xml/schema/Member/MembershipBlock.xml @@ -37,6 +37,9 @@ int unsigned true FK to civicrm_contribution_page.id + + + 1.5 @@ -58,9 +61,12 @@ membership_type_default - Membership Block Default Type + Membership Block Default Type ID int unsigned Optional foreign key to membership_type + + + 1.5 diff --git a/xml/schema/Member/MembershipLog.xml b/xml/schema/Member/MembershipLog.xml index 910e017218..d731845811 100644 --- a/xml/schema/Member/MembershipLog.xml +++ b/xml/schema/Member/MembershipLog.xml @@ -28,6 +28,9 @@ int unsigned true FK to Membership table + + + 1.5 @@ -39,10 +42,13 @@ status_id - Membership Status + Membership Status ID int unsigned true New status assigned to membership by this action. FK to Membership Status + + + 1.5 @@ -70,9 +76,12 @@ modified_id - Membership Log modified By + Membership Log modified By Contact ID int unsigned FK to Contact ID of person under whose credentials this data modification was made. + + + 1.5 @@ -95,6 +104,9 @@ Membership Type ID int unsigned FK to Membership Type. + + + 3.4 diff --git a/xml/schema/Member/MembershipPayment.xml b/xml/schema/Member/MembershipPayment.xml index 2bb3ca2e0d..f0859fd348 100644 --- a/xml/schema/Member/MembershipPayment.xml +++ b/xml/schema/Member/MembershipPayment.xml @@ -24,10 +24,13 @@ membership_id - Membership + Membership ID int unsigned true FK to Membership table + + + 1.5 @@ -39,9 +42,12 @@ contribution_id - Contribution + Contribution ID int unsigned FK to contribution table. + + + 2.0 diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml index aaef24bbf9..d76f43138e 100644 --- a/xml/schema/Member/MembershipType.xml +++ b/xml/schema/Member/MembershipType.xml @@ -26,7 +26,7 @@ domain_id - Membership Type Domain + Membership Type Domain ID int unsigned true @@ -35,6 +35,9 @@ name Which Domain is this match entry for + + + 3.0 @@ -76,10 +79,13 @@ member_of_contact_id - Membership Type Organization + Membership Type Organization ID int unsigned true Owner organization for this membership type. FK to Contact ID + + + 1.5 @@ -91,7 +97,7 @@ financial_type_id - Membership Financial Type + Membership Financial Type ID int unsigned true @@ -100,6 +106,9 @@ name If membership is paid by a contribution - what financial type should be used. FK to civicrm_financial_type.id + + + 4.3 diff --git a/xml/schema/PCP/PCP.xml b/xml/schema/PCP/PCP.xml index a98bd5ae5b..ec453d2337 100644 --- a/xml/schema/PCP/PCP.xml +++ b/xml/schema/PCP/PCP.xml @@ -33,6 +33,7 @@ 2.2 EntityRef + diff --git a/xml/schema/PCP/PCPBlock.xml b/xml/schema/PCP/PCPBlock.xml index 4666b8bc0d..72de7358fa 100644 --- a/xml/schema/PCP/PCPBlock.xml +++ b/xml/schema/PCP/PCPBlock.xml @@ -69,10 +69,13 @@ supporter_profile_id - Supporter Profile + Supporter Profile ID int unsigned FK to civicrm_uf_group.id. Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)? NULL + + + 2.2 diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml index 6f39a507ea..bc60d99665 100644 --- a/xml/schema/Pledge/Pledge.xml +++ b/xml/schema/Pledge/Pledge.xml @@ -34,8 +34,9 @@ Foreign key to civicrm_contact.id . 2.1 - EntityRef - + EntityRef + + contact_id @@ -46,7 +47,7 @@ financial_type_id - Type + Type ID pledge_financial_type_id int unsigned FK to Financial Type @@ -58,6 +59,7 @@ 4.3 Select + @@ -69,9 +71,12 @@ contribution_page_id pledge_contribution_page_id - Pledge Contribution Page + Pledge Contribution Page ID int unsigned The Contribution Page which triggered this contribution + + + 2.1 @@ -325,12 +330,13 @@ campaign_id pledge_campaign_id int unsigned - Campaign + Campaign ID true The campaign for which this pledge has been initiated. 3.4 Select + diff --git a/xml/schema/Pledge/PledgePayment.xml b/xml/schema/Pledge/PledgePayment.xml index 3fa37ece59..314b4da9d0 100644 --- a/xml/schema/Pledge/PledgePayment.xml +++ b/xml/schema/Pledge/PledgePayment.xml @@ -26,10 +26,13 @@ pledge_id - Pledge + Pledge ID int unsigned true FK to Pledge table + + + 2.1 @@ -41,9 +44,12 @@ contribution_id - Contribution + Contribution ID int unsigned FK to contribution table. + + + 2.1 diff --git a/xml/schema/Price/LineItem.xml b/xml/schema/Price/LineItem.xml index 4ecb7b918d..4bfdbc552c 100644 --- a/xml/schema/Price/LineItem.xml +++ b/xml/schema/Price/LineItem.xml @@ -46,9 +46,12 @@ contribution_id - Line Item Contribution + Line Item Contribution ID int unsigned FK to civicrm_contribution + + + 4.5 @@ -59,7 +62,7 @@ price_field_id - Line Item Price Field + Line Item Price Field ID int unsigned FK to civicrm_price_field @@ -69,6 +72,9 @@ label + + + 1.7 @@ -151,7 +157,7 @@ price_field_value_id - Line Item Option + Line Item Option ID int unsigned NULL FK to civicrm_price_field_value @@ -161,6 +167,9 @@ name label + + + 3.3 diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml index 07932daf40..82725baf7c 100644 --- a/xml/schema/Price/PriceField.xml +++ b/xml/schema/Price/PriceField.xml @@ -24,7 +24,7 @@ price_set_id - Price Set + Price Set ID int unsigned true FK to civicrm_price_set @@ -34,6 +34,9 @@ name title + + + 1.8 diff --git a/xml/schema/Price/PriceFieldValue.xml b/xml/schema/Price/PriceFieldValue.xml index af9c783dd6..09c7c425fb 100644 --- a/xml/schema/Price/PriceFieldValue.xml +++ b/xml/schema/Price/PriceFieldValue.xml @@ -23,10 +23,13 @@ price_field_id - Price Field + Price Field ID int unsigned true FK to civicrm_price_field + + + 3.3 @@ -145,12 +148,13 @@ membership_type_id - Membership Type + Membership Type ID int unsigned NULL FK to Membership Type Select + 3.4 @@ -192,7 +196,7 @@ financial_type_id - Financial Type + Financial Type ID int unsigned NULL @@ -204,6 +208,7 @@ 4.3 Select + diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml index 1c0486d6f4..e7d3830d69 100644 --- a/xml/schema/Price/PriceSet.xml +++ b/xml/schema/Price/PriceSet.xml @@ -24,7 +24,7 @@ domain_id - Price Set Domain + Price Set Domain ID int unsigned civicrm_domain
@@ -35,6 +35,7 @@ 3.1 Text + @@ -140,7 +141,7 @@ financial_type_id - Financial Type + Financial Type ID int unsigned NULL FK to Financial Type(for membership price sets only). @@ -152,6 +153,7 @@ Select + diff --git a/xml/schema/Price/PriceSetEntity.xml b/xml/schema/Price/PriceSetEntity.xml index bb343cffdd..ecc0604617 100644 --- a/xml/schema/Price/PriceSetEntity.xml +++ b/xml/schema/Price/PriceSetEntity.xml @@ -46,7 +46,7 @@ price_set_id - Price Set + Price Set ID int unsigned true price set being used @@ -56,6 +56,9 @@ id title + + + price_set_id diff --git a/xml/schema/Report/ReportInstance.xml b/xml/schema/Report/ReportInstance.xml index 5d6e049940..b2b416e43d 100644 --- a/xml/schema/Report/ReportInstance.xml +++ b/xml/schema/Report/ReportInstance.xml @@ -35,6 +35,9 @@ true Which Domain is this instance for + + + 3.1 @@ -143,8 +146,11 @@ created_id int unsigned - Report Instance Created By + Report Instance Created By Contact ID FK to contact table. + + + 4.6 @@ -157,8 +163,11 @@ owner_id int unsigned - Report Instance Owned By + Report Instance Owned By Contact ID FK to contact table. + + + 4.6 @@ -228,6 +237,9 @@ int unsigned true FK to navigation ID + + + 3.0 @@ -243,6 +255,9 @@ int unsigned true FK to instance ID drilldown to + + + 4.3 diff --git a/xml/schema/SMS/History.xml b/xml/schema/SMS/History.xml index 20f5cd3428..01a360bfed 100644 --- a/xml/schema/SMS/History.xml +++ b/xml/schema/SMS/History.xml @@ -34,12 +34,14 @@ contact_id + Contact ID int unsigned true FK to Contact who is sending this SMS 1.4 EntityRef + diff --git a/xml/schema/SMS/Provider.xml b/xml/schema/SMS/Provider.xml index 78c211694b..ed60ec5e51 100644 --- a/xml/schema/SMS/Provider.xml +++ b/xml/schema/SMS/Provider.xml @@ -116,7 +116,7 @@ domain_id - SMS Domain + SMS Domain ID int unsigned civicrm_domain
@@ -124,6 +124,9 @@ name Which Domain is this sms provider for + + + 4.7 -- 2.25.1