From 047c5009da04c7e41bbf28940113e9618a737eaa Mon Sep 17 00:00:00 2001 From: Ahed Date: Fri, 5 Feb 2021 21:34:33 +0200 Subject: [PATCH] Fix any title or label that contain name of own entity --- xml/schema/ACL/Cache.xml | 8 ++--- xml/schema/Batch/Batch.xml | 12 +++---- xml/schema/Campaign/Campaign.xml | 8 ++--- xml/schema/Campaign/Survey.xml | 12 +++---- xml/schema/Case/Case.xml | 2 +- xml/schema/Contact/ContactType.xml | 4 +-- xml/schema/Contact/DashboardContact.xml | 4 +-- xml/schema/Contact/Group.xml | 8 ++--- xml/schema/Contact/GroupContact.xml | 8 ++--- xml/schema/Contact/Relationship.xml | 2 +- xml/schema/Contact/SubscriptionHistory.xml | 6 ++-- xml/schema/Contribute/Contribution.xml | 4 +-- xml/schema/Contribute/ContributionPage.xml | 10 +++--- xml/schema/Contribute/ContributionSoft.xml | 12 +++---- xml/schema/Contribute/Widget.xml | 2 +- xml/schema/Core/ActionLog.xml | 4 +-- xml/schema/Core/ActionSchedule.xml | 12 +++---- xml/schema/Core/AddressFormat.xml | 2 +- xml/schema/Core/Country.xml | 2 +- xml/schema/Core/CustomGroup.xml | 4 +-- xml/schema/Core/Dashboard.xml | 4 +-- xml/schema/Core/Domain.xml | 4 +-- xml/schema/Core/IM.xml | 4 +-- xml/schema/Core/Job.xml | 6 ++-- xml/schema/Core/JobLog.xml | 2 +- xml/schema/Core/LocBlock.xml | 20 +++++------ xml/schema/Core/MailSettings.xml | 4 +-- xml/schema/Core/Navigation.xml | 8 ++--- xml/schema/Core/Note.xml | 4 +-- xml/schema/Core/OpenID.xml | 4 +-- xml/schema/Core/OptionValue.xml | 8 ++--- xml/schema/Core/Persistent.xml | 2 +- xml/schema/Core/Phone.xml | 4 +-- xml/schema/Core/Setting.xml | 16 ++++----- xml/schema/Core/StatusPreference.xml | 4 +-- xml/schema/Core/Timezone.xml | 4 +-- xml/schema/Core/UFField.xml | 4 +-- xml/schema/Core/UFGroup.xml | 8 ++--- xml/schema/Core/UFMatch.xml | 8 ++--- xml/schema/Core/WordReplacement.xml | 4 +-- xml/schema/Core/Worldregion.xml | 2 +- xml/schema/Dedupe/Rule.xml | 4 +-- xml/schema/Event/Cart/Cart.xml | 2 +- xml/schema/Event/Cart/EventInCart.xml | 2 +- xml/schema/Event/Participant.xml | 6 ++-- xml/schema/Event/ParticipantPayment.xml | 4 +-- xml/schema/Financial/Currency.xml | 2 +- xml/schema/Financial/FinancialAccount.xml | 4 +-- xml/schema/Financial/FinancialItem.xml | 4 +-- xml/schema/Financial/FinancialTrxn.xml | 10 +++--- xml/schema/Financial/PaymentProcessor.xml | 8 ++--- xml/schema/Grant/Grant.xml | 2 +- xml/schema/Mailing/Event/Forward.xml | 4 +-- xml/schema/Mailing/Event/Subscribe.xml | 8 ++--- xml/schema/Mailing/Event/Unsubscribe.xml | 4 +-- xml/schema/Mailing/Mailing.xml | 40 +++++++++++----------- xml/schema/Mailing/MailingAB.xml | 4 +-- xml/schema/Mailing/MailingJob.xml | 4 +-- xml/schema/Mailing/Recipients.xml | 12 +++---- xml/schema/Mailing/Spool.xml | 4 +-- xml/schema/Member/Membership.xml | 12 +++---- xml/schema/Member/MembershipBlock.xml | 10 +++--- xml/schema/Member/MembershipLog.xml | 4 +-- xml/schema/Member/MembershipStatus.xml | 2 +- xml/schema/Member/MembershipType.xml | 14 ++++---- xml/schema/PCP/PCPBlock.xml | 2 +- xml/schema/Pledge/Pledge.xml | 10 +++--- xml/schema/Pledge/PledgeBlock.xml | 2 +- xml/schema/Price/LineItem.xml | 12 +++---- xml/schema/Price/PriceSet.xml | 4 +-- xml/schema/Report/ReportInstance.xml | 12 +++---- xml/schema/SMS/Provider.xml | 4 +-- 72 files changed, 233 insertions(+), 233 deletions(-) diff --git a/xml/schema/ACL/Cache.xml b/xml/schema/ACL/Cache.xml index 9558093443..9de0714950 100644 --- a/xml/schema/ACL/Cache.xml +++ b/xml/schema/ACL/Cache.xml @@ -23,12 +23,12 @@ contact_id - Cache Contact ID + Contact ID int unsigned Foreign Key to Contact EntityRef - + 1.6 @@ -47,7 +47,7 @@ acl_id - Cache ACL ID + ACL ID int unsigned true Foreign Key to ACL @@ -57,7 +57,7 @@ name - + 1.6 diff --git a/xml/schema/Batch/Batch.xml b/xml/schema/Batch/Batch.xml index 770f94e205..a1960cc3bb 100644 --- a/xml/schema/Batch/Batch.xml +++ b/xml/schema/Batch/Batch.xml @@ -65,11 +65,11 @@ created_id - Batch Created By Contact ID + Created By Contact ID int unsigned FK to Contact ID - + 3.3 @@ -93,11 +93,11 @@ modified_id - Batch Modified By Contact ID + Modified By Contact ID int unsigned FK to Contact ID - + 3.3 @@ -117,13 +117,13 @@ saved_search_id - Batch Smart Group ID + Smart Group ID int unsigned FK to Saved Search ID 4.1 EntityRef - + diff --git a/xml/schema/Campaign/Campaign.xml b/xml/schema/Campaign/Campaign.xml index e8c2a9df07..408fe88b04 100644 --- a/xml/schema/Campaign/Campaign.xml +++ b/xml/schema/Campaign/Campaign.xml @@ -201,10 +201,10 @@ created_id int unsigned - Campaign Created By Contact ID + Created By Contact ID FK to civicrm_contact, who created this Campaign. - + 3.3 @@ -231,10 +231,10 @@ last_modified_id int unsigned - Campaign Modified By Contact ID + Modified By Contact ID FK to civicrm_contact, who recently edited this Campaign. - + 3.3 diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml index ad2a45c0be..8477dd65cc 100644 --- a/xml/schema/Campaign/Survey.xml +++ b/xml/schema/Campaign/Survey.xml @@ -38,12 +38,12 @@ campaign_id - Survey Campaign ID + Campaign ID int unsigned NULL Foreign key to the Campaign. - + 3.3 @@ -150,11 +150,11 @@ created_id - Survey Created By Contact ID + Created By Contact ID int unsigned FK to civicrm_contact, who created this Survey. - + 3.3 @@ -176,11 +176,11 @@ last_modified_id - Survey Modified By Contact ID + 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 459de89aed..ac87be4948 100644 --- a/xml/schema/Case/Case.xml +++ b/xml/schema/Case/Case.xml @@ -114,7 +114,7 @@ true false Case Status - Id of case status. + ID of case status. case_status diff --git a/xml/schema/Contact/ContactType.xml b/xml/schema/Contact/ContactType.xml index ca1c79aad7..7d5ed4fdb6 100644 --- a/xml/schema/Contact/ContactType.xml +++ b/xml/schema/Contact/ContactType.xml @@ -67,7 +67,7 @@ parent_id - Contact Type Parent ID + Parent ID int unsigned Optional FK to parent contact type. @@ -77,7 +77,7 @@ parent_id IS NULL - + 3.1 diff --git a/xml/schema/Contact/DashboardContact.xml b/xml/schema/Contact/DashboardContact.xml index 0621c356b0..71debd5838 100644 --- a/xml/schema/Contact/DashboardContact.xml +++ b/xml/schema/Contact/DashboardContact.xml @@ -41,11 +41,11 @@ contact_id int unsigned - Dashboard Contact ID + Contact ID true Contact ID - + 3.1 diff --git a/xml/schema/Contact/Group.xml b/xml/schema/Contact/Group.xml index 622774a3f0..5be873cd8f 100644 --- a/xml/schema/Contact/Group.xml +++ b/xml/schema/Contact/Group.xml @@ -215,10 +215,10 @@ created_id int unsigned - Group Created By Contact ID + Created By Contact ID FK to contact table. - + 4.3 @@ -232,10 +232,10 @@ modified_id int unsigned - Group Modified By Contact ID + 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 ccbea1ba63..9ced5f443d 100644 --- a/xml/schema/Contact/GroupContact.xml +++ b/xml/schema/Contact/GroupContact.xml @@ -81,10 +81,10 @@ location_id int unsigned - Group Contact Location ID + Location ID Optional location to associate with this membership - + 1.1 @@ -98,10 +98,10 @@ email_id int unsigned - Group Contact Email ID + Email ID Optional email to associate with this membership - + 1.1 diff --git a/xml/schema/Contact/Relationship.xml b/xml/schema/Contact/Relationship.xml index 1d5fddad68..8eb0f66c8f 100644 --- a/xml/schema/Contact/Relationship.xml +++ b/xml/schema/Contact/Relationship.xml @@ -164,7 +164,7 @@ case_id int unsigned - Relationship Case ID + Case ID NULL FK to civicrm_case diff --git a/xml/schema/Contact/SubscriptionHistory.xml b/xml/schema/Contact/SubscriptionHistory.xml index b3ceac0e40..cbf4d68588 100644 --- a/xml/schema/Contact/SubscriptionHistory.xml +++ b/xml/schema/Contact/SubscriptionHistory.xml @@ -12,7 +12,7 @@ Group Membership History ID int unsigned true - Internal Id + Internal ID Number @@ -27,7 +27,7 @@ Contact ID int unsigned true - Contact Id + Contact ID @@ -44,7 +44,7 @@ group_id Group ID int unsigned - Group Id + Group ID 1.1 civicrm_group
diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml index 646cbe9d60..df39506357 100644 --- a/xml/schema/Contribute/Contribution.xml +++ b/xml/schema/Contribute/Contribution.xml @@ -416,11 +416,11 @@ address_id contribution_address_id - Contribution Address ID + 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 diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml index 2d599e60aa..ae320d7189 100644 --- a/xml/schema/Contribute/ContributionPage.xml +++ b/xml/schema/Contribute/ContributionPage.xml @@ -14,7 +14,7 @@ Contribution Page ID int unsigned true - Contribution Id + Contribution ID Number @@ -381,11 +381,11 @@ created_id - Contribution Page Created By Contact ID + Created By Contact ID int unsigned FK to civicrm_contact, who created this contribution page - + 3.0 @@ -426,11 +426,11 @@ campaign_id - Contribution Page Campaign ID + Campaign ID int unsigned The campaign for which we are collecting contributions with this page. - + 3.4 diff --git a/xml/schema/Contribute/ContributionSoft.xml b/xml/schema/Contribute/ContributionSoft.xml index b60c2433e8..0045ae9e9e 100644 --- a/xml/schema/Contribute/ContributionSoft.xml +++ b/xml/schema/Contribute/ContributionSoft.xml @@ -31,12 +31,12 @@ contribution_id - Soft Credit - Contribution ID + Contribution ID int unsigned true FK to contribution table. - + 2.2 @@ -50,7 +50,7 @@ contact_id contribution_soft_contact_id - Soft Credit Contact ID + Contact ID int unsigned true true @@ -58,7 +58,7 @@ /^\d+$/ FK to Contact ID - + 2.2 @@ -102,11 +102,11 @@ pcp_id int unsigned - Soft Contribution PCP ID + PCP ID NULL FK to civicrm_pcp.id - + 2.2 diff --git a/xml/schema/Contribute/Widget.xml b/xml/schema/Contribute/Widget.xml index ba293a5825..8ced050633 100644 --- a/xml/schema/Contribute/Widget.xml +++ b/xml/schema/Contribute/Widget.xml @@ -13,7 +13,7 @@ Widget ID int unsigned true - Contribution Id + Contribution ID Number diff --git a/xml/schema/Core/ActionLog.xml b/xml/schema/Core/ActionLog.xml index e126834bdc..5b948eed57 100644 --- a/xml/schema/Core/ActionLog.xml +++ b/xml/schema/Core/ActionLog.xml @@ -22,11 +22,11 @@ contact_id - Action Schedule Contact ID + Contact ID int unsigned FK to Contact ID - + 3.4 diff --git a/xml/schema/Core/ActionSchedule.xml b/xml/schema/Core/ActionSchedule.xml index 2e3e42ac82..976ba89819 100644 --- a/xml/schema/Core/ActionSchedule.xml +++ b/xml/schema/Core/ActionSchedule.xml @@ -232,7 +232,7 @@ group_id - Reminder Group ID + Group ID int unsigned FK to Group @@ -242,7 +242,7 @@ Select - + 3.4 @@ -254,11 +254,11 @@ msg_template_id - Reminder Template ID + Message Template ID int unsigned FK to the message template. - + @@ -269,11 +269,11 @@ sms_template_id - SMS Reminder Template ID + SMS Template ID int unsigned FK to the message template. - + diff --git a/xml/schema/Core/AddressFormat.xml b/xml/schema/Core/AddressFormat.xml index 41008e9481..569efab7a5 100644 --- a/xml/schema/Core/AddressFormat.xml +++ b/xml/schema/Core/AddressFormat.xml @@ -10,7 +10,7 @@ Address Format ID int unsigned true - Address Format Id + Address Format ID Number diff --git a/xml/schema/Core/Country.xml b/xml/schema/Core/Country.xml index 93a980035f..546759fa25 100644 --- a/xml/schema/Core/Country.xml +++ b/xml/schema/Core/Country.xml @@ -11,7 +11,7 @@ Country ID int unsigned true - Country Id + Country ID Number diff --git a/xml/schema/Core/CustomGroup.xml b/xml/schema/Core/CustomGroup.xml index 93dcefafec..de7d4678cd 100644 --- a/xml/schema/Core/CustomGroup.xml +++ b/xml/schema/Core/CustomGroup.xml @@ -193,10 +193,10 @@ created_id int unsigned - Custom Group Created By Contact ID + 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 b1b5a3adbe..63fc5b1599 100644 --- a/xml/schema/Core/Dashboard.xml +++ b/xml/schema/Core/Dashboard.xml @@ -23,7 +23,7 @@ domain_id int unsigned - Dashlet Domain ID + Domain ID true civicrm_domain
@@ -32,7 +32,7 @@ Domain for dashboard - + 3.1 diff --git a/xml/schema/Core/Domain.xml b/xml/schema/Core/Domain.xml index 7abb2f4493..133a90fe56 100644 --- a/xml/schema/Core/Domain.xml +++ b/xml/schema/Core/Domain.xml @@ -69,10 +69,10 @@ contact_id int unsigned - Domain Contact ID + Contact ID FK to Contact ID. This is specifically not an FK to avoid circular constraints - + 4.3 diff --git a/xml/schema/Core/IM.xml b/xml/schema/Core/IM.xml index b2fa35dcda..c37999b9c7 100644 --- a/xml/schema/Core/IM.xml +++ b/xml/schema/Core/IM.xml @@ -28,11 +28,11 @@ contact_id - IM Contact ID + 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 a04a06b27b..afd08c298c 100644 --- a/xml/schema/Core/Job.xml +++ b/xml/schema/Core/Job.xml @@ -12,7 +12,7 @@ Job ID int unsigned true - Job Id + Job ID Number @@ -24,7 +24,7 @@ domain_id - Job Domain ID + Domain ID int unsigned true @@ -34,7 +34,7 @@ Which Domain is this scheduled job for - + 4.1 diff --git a/xml/schema/Core/JobLog.xml b/xml/schema/Core/JobLog.xml index 55ca2ead8b..d0764fc2c4 100644 --- a/xml/schema/Core/JobLog.xml +++ b/xml/schema/Core/JobLog.xml @@ -12,7 +12,7 @@ int unsigned true Job Log ID - Job log entry Id + Job log entry ID Number diff --git a/xml/schema/Core/LocBlock.xml b/xml/schema/Core/LocBlock.xml index b6128b8a17..9f92ac3b88 100644 --- a/xml/schema/Core/LocBlock.xml +++ b/xml/schema/Core/LocBlock.xml @@ -24,10 +24,10 @@ address_id - Location Block Address ID + Address ID int unsigned - + 2.0 @@ -40,10 +40,10 @@ email_id - Location Block Email ID + Email ID int unsigned - + 2.0 @@ -56,10 +56,10 @@ phone_id - Location Block Phone ID + Phone ID int unsigned - + 2.0 @@ -72,10 +72,10 @@ im_id - Location Block IM ID + IM ID int unsigned - + 2.0 @@ -88,10 +88,10 @@ address_2_id - Location Block IM 2 ID + IM 2 ID int unsigned - + 2.0 diff --git a/xml/schema/Core/MailSettings.xml b/xml/schema/Core/MailSettings.xml index 6dc2935fec..0ce70437f7 100644 --- a/xml/schema/Core/MailSettings.xml +++ b/xml/schema/Core/MailSettings.xml @@ -21,7 +21,7 @@ domain_id - Mail Settings Domain ID + Domain ID int unsigned true @@ -31,7 +31,7 @@ Which Domain is this match entry for - + 3.1 diff --git a/xml/schema/Core/Navigation.xml b/xml/schema/Core/Navigation.xml index 6bedd2cad3..3b7d80f4d1 100644 --- a/xml/schema/Core/Navigation.xml +++ b/xml/schema/Core/Navigation.xml @@ -23,7 +23,7 @@ domain_id - Navigation Domain ID + Domain ID int unsigned true @@ -33,7 +33,7 @@ Which Domain is this navigation item for - + 3.0 @@ -95,7 +95,7 @@ parent_id - Navigation parent ID + parent ID int unsigned Parent navigation item, used for grouping @@ -105,7 +105,7 @@ label - + 3.0 diff --git a/xml/schema/Core/Note.xml b/xml/schema/Core/Note.xml index ef4b3f1449..4f594b78d4 100644 --- a/xml/schema/Core/Note.xml +++ b/xml/schema/Core/Note.xml @@ -71,11 +71,11 @@ contact_id - Note Created By Contact ID + 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 5bb968fbb7..571b006aed 100644 --- a/xml/schema/Core/OpenID.xml +++ b/xml/schema/Core/OpenID.xml @@ -22,11 +22,11 @@ contact_id - OpenID Contact ID + 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 563e0021e7..8d4bb53300 100644 --- a/xml/schema/Core/OptionValue.xml +++ b/xml/schema/Core/OptionValue.xml @@ -142,7 +142,7 @@ component_id - Option Component ID + Component ID int unsigned Component that this option value belongs/caters to. 2.0 @@ -153,7 +153,7 @@ Select - + @@ -164,7 +164,7 @@ domain_id - Option Domain ID + Domain ID int unsigned civicrm_domain
@@ -173,7 +173,7 @@ Which Domain is this option value for - + 3.1 diff --git a/xml/schema/Core/Persistent.xml b/xml/schema/Core/Persistent.xml index 348896277a..05295c0965 100644 --- a/xml/schema/Core/Persistent.xml +++ b/xml/schema/Core/Persistent.xml @@ -11,7 +11,7 @@ Persistent ID int unsigned true - Persistent Record Id + Persistent Record ID Number diff --git a/xml/schema/Core/Phone.xml b/xml/schema/Core/Phone.xml index 7f50e12da0..4e455fdfd9 100644 --- a/xml/schema/Core/Phone.xml +++ b/xml/schema/Core/Phone.xml @@ -26,11 +26,11 @@ contact_id - Phone Contact ID + Contact ID int unsigned FK to Contact ID - + 2.0 diff --git a/xml/schema/Core/Setting.xml b/xml/schema/Core/Setting.xml index 81c80c59a9..8e6fd33894 100644 --- a/xml/schema/Core/Setting.xml +++ b/xml/schema/Core/Setting.xml @@ -54,7 +54,7 @@ domain_id - Setting Domain ID + Domain ID int unsigned true @@ -64,7 +64,7 @@ Which Domain is this menu item for - + 4.1 @@ -77,11 +77,11 @@ contact_id - Setting Contact ID + Contact ID int unsigned FK to Contact ID if the setting is localized to a contact - + 4.1 @@ -101,7 +101,7 @@ component_id - Setting Component ID + Component ID int unsigned Component that this menu item belongs to 4.1 @@ -112,7 +112,7 @@ Select - + @@ -130,11 +130,11 @@ created_id - Setting Created By Contact ID + Created By Contact ID int unsigned FK to civicrm_contact, who created this setting - + 4.1 diff --git a/xml/schema/Core/StatusPreference.xml b/xml/schema/Core/StatusPreference.xml index da83b370bb..76ad54de6e 100644 --- a/xml/schema/Core/StatusPreference.xml +++ b/xml/schema/Core/StatusPreference.xml @@ -23,7 +23,7 @@ domain_id - Setting Domain ID + Domain ID int unsigned true @@ -33,7 +33,7 @@ Which Domain is this Status Preference for - + 4.7 diff --git a/xml/schema/Core/Timezone.xml b/xml/schema/Core/Timezone.xml index 636414c2b1..53a963f69c 100644 --- a/xml/schema/Core/Timezone.xml +++ b/xml/schema/Core/Timezone.xml @@ -10,7 +10,7 @@ Timezone ID int unsigned true - Timezone Id + Timezone ID Number @@ -56,7 +56,7 @@ Country ID int unsigned true - Country Id + Country ID diff --git a/xml/schema/Core/UFField.xml b/xml/schema/Core/UFField.xml index bef64f3ed0..524e1c6c3a 100644 --- a/xml/schema/Core/UFField.xml +++ b/xml/schema/Core/UFField.xml @@ -159,7 +159,7 @@ phone_type_id Profile Field Phone Type int unsigned - Phone Type Id, if required + Phone Type ID, if required 2.2 phone_type @@ -169,7 +169,7 @@ website_type_id Profile Field Website Type int unsigned - Website Type Id, if required + Website Type ID, if required 4.5 website_type diff --git a/xml/schema/Core/UFGroup.xml b/xml/schema/Core/UFGroup.xml index adcdc8cbcc..90a1c624eb 100644 --- a/xml/schema/Core/UFGroup.xml +++ b/xml/schema/Core/UFGroup.xml @@ -104,11 +104,11 @@ limit_listings_group_id - Profile Search Limit Group ID + Search Limit Group ID int unsigned Group id, foreign key from civicrm_group - + 1.4 @@ -226,11 +226,11 @@ created_id - Profile Created By Contact ID + Created By Contact ID int unsigned FK to civicrm_contact, who created this UF group - + 3.0 diff --git a/xml/schema/Core/UFMatch.xml b/xml/schema/Core/UFMatch.xml index afe64226b5..289f6bf925 100644 --- a/xml/schema/Core/UFMatch.xml +++ b/xml/schema/Core/UFMatch.xml @@ -24,7 +24,7 @@ domain_id - UF Match Domain ID + Domain ID int unsigned true Which Domain is this match entry for @@ -34,7 +34,7 @@ name - + 3.0 @@ -67,11 +67,11 @@ contact_id - CiviCRM Contact ID + Contact ID int unsigned FK to Contact ID - + 1.1 diff --git a/xml/schema/Core/WordReplacement.xml b/xml/schema/Core/WordReplacement.xml index 5b1cd7303e..fb18789c6c 100644 --- a/xml/schema/Core/WordReplacement.xml +++ b/xml/schema/Core/WordReplacement.xml @@ -70,7 +70,7 @@ domain_id - Word Replacement Domain ID + Domain ID int unsigned civicrm_domain
@@ -79,7 +79,7 @@ FK to Domain ID. This is for Domain specific word replacement - + 1.1 diff --git a/xml/schema/Core/Worldregion.xml b/xml/schema/Core/Worldregion.xml index ea4f20d701..9e2b2a9b29 100644 --- a/xml/schema/Core/Worldregion.xml +++ b/xml/schema/Core/Worldregion.xml @@ -10,7 +10,7 @@ World Region ID int unsigned true - Country Id + Country ID Number diff --git a/xml/schema/Dedupe/Rule.xml b/xml/schema/Dedupe/Rule.xml index 3ff7ad4af1..0b1649796a 100644 --- a/xml/schema/Dedupe/Rule.xml +++ b/xml/schema/Dedupe/Rule.xml @@ -22,12 +22,12 @@ dedupe_rule_group_id - Dedupe Rule Group ID + 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 9b8eb9cdba..5aae1932b0 100644 --- a/xml/schema/Event/Cart/Cart.xml +++ b/xml/schema/Event/Cart/Cart.xml @@ -12,7 +12,7 @@ cart_id int unsigned true - Cart Id + Cart ID Number diff --git a/xml/schema/Event/Cart/EventInCart.xml b/xml/schema/Event/Cart/EventInCart.xml index 50b083f029..a27e539548 100644 --- a/xml/schema/Event/Cart/EventInCart.xml +++ b/xml/schema/Event/Cart/EventInCart.xml @@ -12,7 +12,7 @@ event_in_cart_id int unsigned true - Event In Cart Id + Event In Cart ID Number diff --git a/xml/schema/Event/Participant.xml b/xml/schema/Event/Participant.xml index 2cf7f41567..21eb08aa4c 100644 --- a/xml/schema/Event/Participant.xml +++ b/xml/schema/Event/Participant.xml @@ -14,7 +14,7 @@ Participant ID int unsigned true - Participant Id + Participant ID true /(^(participant(.)?)?id$)/i @@ -68,7 +68,7 @@ status_id participant_status_id - Participant Status ID + Status ID /(participant.)?(status)$/i true int unsigned @@ -84,7 +84,7 @@ Select - + diff --git a/xml/schema/Event/ParticipantPayment.xml b/xml/schema/Event/ParticipantPayment.xml index e91338563e..fa8437a724 100644 --- a/xml/schema/Event/ParticipantPayment.xml +++ b/xml/schema/Event/ParticipantPayment.xml @@ -12,7 +12,7 @@ Payment ID int unsigned true - Participant Payment Id + Participant Payment ID Number @@ -27,7 +27,7 @@ Participant ID int unsigned true - Participant Id (FK) + Participant ID (FK) diff --git a/xml/schema/Financial/Currency.xml b/xml/schema/Financial/Currency.xml index e1b25484fa..5970d0345e 100644 --- a/xml/schema/Financial/Currency.xml +++ b/xml/schema/Financial/Currency.xml @@ -12,7 +12,7 @@ Currency ID int unsigned true - Currency Id + Currency ID Number diff --git a/xml/schema/Financial/FinancialAccount.xml b/xml/schema/Financial/FinancialAccount.xml index 7c0f0b109c..4b970a3616 100644 --- a/xml/schema/Financial/FinancialAccount.xml +++ b/xml/schema/Financial/FinancialAccount.xml @@ -93,10 +93,10 @@ parent_id int unsigned - Financial Account Parent ID + Parent ID Parent ID in account hierarchy - + 4.3 diff --git a/xml/schema/Financial/FinancialItem.xml b/xml/schema/Financial/FinancialItem.xml index 88d1b58df5..8e1f5a7454 100644 --- a/xml/schema/Financial/FinancialItem.xml +++ b/xml/schema/Financial/FinancialItem.xml @@ -44,12 +44,12 @@ contact_id int unsigned - Financial Item Contact ID + Contact ID true true FK to Contact ID of contact the item is from - + 4.3 diff --git a/xml/schema/Financial/FinancialTrxn.xml b/xml/schema/Financial/FinancialTrxn.xml index 9913e342e8..515a78770e 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 ID + From Account ID FK to financial_account table. 4.3 @@ -34,7 +34,7 @@ Select - + @@ -45,7 +45,7 @@ to_financial_account_id - Financial Transaction To Account ID + To Account ID int unsigned FK to financial_financial_account table. 4.3 @@ -56,7 +56,7 @@ Select - + @@ -157,7 +157,7 @@ status_id - Financial Transaction Status Id + Financial Transaction Status ID int unsigned true true diff --git a/xml/schema/Financial/PaymentProcessor.xml b/xml/schema/Financial/PaymentProcessor.xml index f1123d71bd..cec449f4c4 100644 --- a/xml/schema/Financial/PaymentProcessor.xml +++ b/xml/schema/Financial/PaymentProcessor.xml @@ -23,7 +23,7 @@ domain_id - Payment Processor Domain ID + Domain ID int unsigned true @@ -33,7 +33,7 @@ Which Domain is this match entry for - + 3.0 @@ -79,7 +79,7 @@ payment_processor_type_id - Payment Processor Type ID + Type ID int unsigned civicrm_payment_processor_type
@@ -89,7 +89,7 @@ true 10 - + 4.3 diff --git a/xml/schema/Grant/Grant.xml b/xml/schema/Grant/Grant.xml index 2e8bc67946..4c363cb603 100644 --- a/xml/schema/Grant/Grant.xml +++ b/xml/schema/Grant/Grant.xml @@ -211,7 +211,7 @@ true true false - Id of Grant status. + ID of Grant status. grant_status diff --git a/xml/schema/Mailing/Event/Forward.xml b/xml/schema/Mailing/Event/Forward.xml index 588f8540a3..7198f96ddf 100644 --- a/xml/schema/Mailing/Event/Forward.xml +++ b/xml/schema/Mailing/Event/Forward.xml @@ -24,12 +24,12 @@ event_queue_id - Mailing Event Queue ID + Event Queue ID int unsigned true FK to EventQueue - + diff --git a/xml/schema/Mailing/Event/Subscribe.xml b/xml/schema/Mailing/Event/Subscribe.xml index f7028b03c6..52f17b30af 100644 --- a/xml/schema/Mailing/Event/Subscribe.xml +++ b/xml/schema/Mailing/Event/Subscribe.xml @@ -22,7 +22,7 @@ group_id - Mailing Subscribe Group ID + Group ID int unsigned true FK to Group @@ -33,7 +33,7 @@ Select - + @@ -44,12 +44,12 @@ contact_id - Mailing Subscribe Contact ID + Contact ID int unsigned true FK to Contact - + diff --git a/xml/schema/Mailing/Event/Unsubscribe.xml b/xml/schema/Mailing/Event/Unsubscribe.xml index bacdf41b80..a4f10f0105 100644 --- a/xml/schema/Mailing/Event/Unsubscribe.xml +++ b/xml/schema/Mailing/Event/Unsubscribe.xml @@ -22,12 +22,12 @@ event_queue_id - Mailing Event Queue ID + Event Queue ID int unsigned true FK to EventQueue - + diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml index de24408d2a..4932605d21 100644 --- a/xml/schema/Mailing/Mailing.xml +++ b/xml/schema/Mailing/Mailing.xml @@ -27,7 +27,7 @@ domain_id - Mailing Domain ID + Domain ID int unsigned civicrm_domain
@@ -36,7 +36,7 @@ Which site is this mailing for - + 3.4 @@ -49,7 +49,7 @@ header_id - Mailing Header ID + Header ID int unsigned civicrm_mailing_component
@@ -59,7 +59,7 @@ FK to the header component. - + @@ -70,7 +70,7 @@ footer_id - Mailing Footer ID + Footer ID int unsigned civicrm_mailing_component
@@ -80,7 +80,7 @@ FK to the footer component. - + @@ -91,11 +91,11 @@ reply_id - Mailing Reply ID + Reply ID int unsigned FK to the auto-responder component. - + @@ -106,11 +106,11 @@ unsubscribe_id - Mailing Unsubscribe ID + Unsubscribe ID int unsigned FK to the unsubscribe component. - + @@ -126,11 +126,11 @@ optout_id - Mailing Opt Out ID + Opt Out ID int unsigned FK to the opt-out component. - + @@ -271,11 +271,11 @@ msg_template_id - Mailing Message Template ID + Message Template ID int unsigned FK to the message template. - + @@ -296,11 +296,11 @@ created_id - Mailing Created By Contact ID + Created By Contact ID int unsigned FK to Contact ID who first created this mailing - + @@ -440,12 +440,12 @@ campaign_id int unsigned - Mailing Campaign ID + Campaign ID The campaign for which this mailing has been initiated. 3.4 Select - + @@ -467,12 +467,12 @@ sms_provider_id - Mailing SMS Provider ID + SMS Provider ID int unsigned 4.2 Select - + diff --git a/xml/schema/Mailing/MailingAB.xml b/xml/schema/Mailing/MailingAB.xml index 6956687f9a..bb53290d41 100644 --- a/xml/schema/Mailing/MailingAB.xml +++ b/xml/schema/Mailing/MailingAB.xml @@ -111,11 +111,11 @@ created_id - AB Test Created By Contact ID + Created By Contact ID int unsigned FK to Contact ID - + 4.6 diff --git a/xml/schema/Mailing/MailingJob.xml b/xml/schema/Mailing/MailingJob.xml index 13b80d6499..d657c80011 100644 --- a/xml/schema/Mailing/MailingJob.xml +++ b/xml/schema/Mailing/MailingJob.xml @@ -106,12 +106,12 @@ parent_id - Mailing Job Parent ID + 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 bb1722fca0..4585b66524 100644 --- a/xml/schema/Mailing/Recipients.xml +++ b/xml/schema/Mailing/Recipients.xml @@ -40,12 +40,12 @@ contact_id - Mailing Recipient ID + Recipient ID int unsigned true FK to Contact - + @@ -56,12 +56,12 @@ email_id - Recipient Email ID + Email ID int unsigned NULL FK to Email - + @@ -72,12 +72,12 @@ phone_id - Recipient Phone ID + Phone ID int unsigned NULL FK to Phone - + diff --git a/xml/schema/Mailing/Spool.xml b/xml/schema/Mailing/Spool.xml index 16030ab2b7..8d6b4a4315 100644 --- a/xml/schema/Mailing/Spool.xml +++ b/xml/schema/Mailing/Spool.xml @@ -21,12 +21,12 @@ job_id - Mailing Job ID + Job ID int unsigned true The ID of the Job . - + diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml index 0df4d7474b..cd5fb5d868 100644 --- a/xml/schema/Member/Membership.xml +++ b/xml/schema/Member/Membership.xml @@ -23,7 +23,7 @@ true Membership ID /^(m(embership\s)?id)$/i - Membership Id + Membership ID 1.5 Number @@ -60,7 +60,7 @@ membership_type_id int unsigned - Membership Type Id + Membership Type ID true /^(m(embership\s)?type)$/i false @@ -144,7 +144,7 @@ status_id - Membership Status ID + Status ID true /(member(ship|).)?(status)$/i int unsigned @@ -158,7 +158,7 @@ Select - + 1.5 @@ -257,12 +257,12 @@ contribution_recur_id membership_recur_id - Membership Recurring Contribution ID + 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 diff --git a/xml/schema/Member/MembershipBlock.xml b/xml/schema/Member/MembershipBlock.xml index da845de4ae..a31e85e413 100644 --- a/xml/schema/Member/MembershipBlock.xml +++ b/xml/schema/Member/MembershipBlock.xml @@ -13,7 +13,7 @@ Membership Block ID int unsigned true - Membership Id + Membership ID 1.5 Number @@ -33,12 +33,12 @@ entity_id - Membership Block Entity ID + Entity ID int unsigned true FK to civicrm_contribution_page.id - + 1.5 @@ -61,11 +61,11 @@ membership_type_default - Membership Block Default Type ID + 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 d731845811..4bd61a786d 100644 --- a/xml/schema/Member/MembershipLog.xml +++ b/xml/schema/Member/MembershipLog.xml @@ -76,11 +76,11 @@ modified_id - Membership Log modified By Contact ID + 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/Member/MembershipStatus.xml b/xml/schema/Member/MembershipStatus.xml index f10984995d..dcc25b9e70 100644 --- a/xml/schema/Member/MembershipStatus.xml +++ b/xml/schema/Member/MembershipStatus.xml @@ -14,7 +14,7 @@ Membership Status ID int unsigned true - Membership Id + Membership ID 1.5 Number diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml index d76f43138e..aa19de6e8c 100644 --- a/xml/schema/Member/MembershipType.xml +++ b/xml/schema/Member/MembershipType.xml @@ -14,7 +14,7 @@ Membership Type ID int unsigned true - Membership Id + Membership ID 1.5 Number @@ -26,7 +26,7 @@ domain_id - Membership Type Domain ID + Domain ID int unsigned true @@ -36,7 +36,7 @@ Which Domain is this match entry for - + 3.0 @@ -79,12 +79,12 @@ member_of_contact_id - Membership Type Organization ID + Organization ID int unsigned true Owner organization for this membership type. FK to Contact ID - + 1.5 @@ -97,7 +97,7 @@ financial_type_id - Membership Financial Type ID + Financial Type ID int unsigned true @@ -107,7 +107,7 @@ 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/PCPBlock.xml b/xml/schema/PCP/PCPBlock.xml index 72de7358fa..d067ec4b31 100644 --- a/xml/schema/PCP/PCPBlock.xml +++ b/xml/schema/PCP/PCPBlock.xml @@ -13,7 +13,7 @@ PCP Block ID int unsigned true - PCP block Id + PCP block ID 2.2 Number diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml index bc60d99665..58d6ef5749 100644 --- a/xml/schema/Pledge/Pledge.xml +++ b/xml/schema/Pledge/Pledge.xml @@ -47,7 +47,7 @@ financial_type_id - Type ID + Financial Type ID pledge_financial_type_id int unsigned FK to Financial Type @@ -59,7 +59,7 @@ 4.3 Select - + @@ -71,11 +71,11 @@ contribution_page_id pledge_contribution_page_id - Pledge Contribution Page ID + Contribution Page ID int unsigned The Contribution Page which triggered this contribution - + 2.1 @@ -294,7 +294,7 @@ status_id - Pledge Status Id + Pledge Status ID pledge_status_id true true diff --git a/xml/schema/Pledge/PledgeBlock.xml b/xml/schema/Pledge/PledgeBlock.xml index 30f47199f6..bee126c423 100644 --- a/xml/schema/Pledge/PledgeBlock.xml +++ b/xml/schema/Pledge/PledgeBlock.xml @@ -31,7 +31,7 @@ entity_id - Entity Id + Entity ID int unsigned true FK to entity table specified in entity_table column. diff --git a/xml/schema/Price/LineItem.xml b/xml/schema/Price/LineItem.xml index 4bfdbc552c..240739d723 100644 --- a/xml/schema/Price/LineItem.xml +++ b/xml/schema/Price/LineItem.xml @@ -46,11 +46,11 @@ contribution_id - Line Item Contribution ID + Contribution ID int unsigned FK to civicrm_contribution - + 4.5 @@ -62,7 +62,7 @@ price_field_id - Line Item Price Field ID + Price Field ID int unsigned FK to civicrm_price_field @@ -73,7 +73,7 @@ - + 1.7 @@ -157,7 +157,7 @@ price_field_value_id - Line Item Option ID + Option ID int unsigned NULL FK to civicrm_price_field_value @@ -168,7 +168,7 @@ label - + 3.3 diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml index e7d3830d69..d818a23444 100644 --- a/xml/schema/Price/PriceSet.xml +++ b/xml/schema/Price/PriceSet.xml @@ -24,7 +24,7 @@ domain_id - Price Set Domain ID + Domain ID int unsigned civicrm_domain
@@ -35,7 +35,7 @@ 3.1 Text - + diff --git a/xml/schema/Report/ReportInstance.xml b/xml/schema/Report/ReportInstance.xml index b2b416e43d..e020ec3149 100644 --- a/xml/schema/Report/ReportInstance.xml +++ b/xml/schema/Report/ReportInstance.xml @@ -26,7 +26,7 @@ domain_id - Report Instance Domain ID + Domain ID int unsigned civicrm_domain
@@ -36,7 +36,7 @@ true Which Domain is this instance for - + 3.1 @@ -146,10 +146,10 @@ created_id int unsigned - Report Instance Created By Contact ID + Created By Contact ID FK to contact table. - + 4.6 @@ -163,10 +163,10 @@ owner_id int unsigned - Report Instance Owned By Contact ID + Owned By Contact ID FK to contact table. - + 4.6 diff --git a/xml/schema/SMS/Provider.xml b/xml/schema/SMS/Provider.xml index ed60ec5e51..2c00293817 100644 --- a/xml/schema/SMS/Provider.xml +++ b/xml/schema/SMS/Provider.xml @@ -116,7 +116,7 @@ domain_id - SMS Domain ID + Domain ID int unsigned civicrm_domain
@@ -125,7 +125,7 @@ Which Domain is this sms provider for - + 4.7 -- 2.25.1