From: eileen Date: Thu, 7 Jan 2016 07:38:08 +0000 (+1300) Subject: Add more schema titles X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f3ea5182292f978844495f7c8662997a57484c73;p=civicrm-core.git Add more schema titles --- diff --git a/tests/phpunit/CRM/Core/DAOConformanceTest.php b/tests/phpunit/CRM/Core/DAOConformanceTest.php index 1ebfc1dbf5..a77a97553b 100644 --- a/tests/phpunit/CRM/Core/DAOConformanceTest.php +++ b/tests/phpunit/CRM/Core/DAOConformanceTest.php @@ -28,64 +28,10 @@ class CRM_Core_DAOConformanceTest extends CiviUnitTestCase { public function getAllDAO() { $classList = CRM_Core_DAO_AllCoreTables::getClasses(); $return = array(); - $notYetTitledDAO = $this->getClassesWithoutTitlesYet(); foreach ($classList as $class) { - if (!in_array($class, $notYetTitledDAO)) { - $return[] = array($class); - } + $return[] = array($class); } return $return; } - /** - * Classes that do not yet conform to expectation they will have a title for each field. - * - * When we start enforcing a new standard we have to grandfather it in & these classes need titles added. - * - * Note that we want titles so that things like views integration can rely on using them and so the person - * introducing the DAO is responsible for it's titles - not the person who adds it to the api later. - */ - public function getClassesWithoutTitlesYet() { - return array( - 'CRM_Contact_DAO_ACLContactCache', - 'CRM_Core_DAO_Managed', - 'CRM_Core_DAO_PreferencesDate', - 'CRM_Event_Cart_DAO_EventInCart', - 'CRM_PCP_DAO_PCPBlock', - 'CRM_Case_DAO_CaseActivity', - 'CRM_Core_DAO_Discount', - 'CRM_Price_DAO_PriceSetEntity', - 'CRM_Case_DAO_CaseContact', - 'CRM_Contribute_DAO_Widget', - 'CRM_Contribute_DAO_PremiumsProduct', - 'CRM_Core_DAO_Persistent', - 'CRM_Mailing_Event_DAO_TrackableURLOpen', - 'CRM_Mailing_Event_DAO_Reply', - 'CRM_Mailing_Event_DAO_Delivered', - 'CRM_Mailing_Event_DAO_Forward', - 'CRM_Mailing_Event_DAO_Bounce', - 'CRM_Mailing_Event_DAO_Opened', - 'CRM_Mailing_DAO_Spool', - 'CRM_Mailing_DAO_TrackableURL', - 'CRM_Contact_DAO_GroupContactCache', - 'CRM_Contact_DAO_SubscriptionHistory', - 'CRM_Core_DAO_Menu', - 'CRM_Core_DAO_Log', - 'CRM_Core_DAO_EntityFile', - 'CRM_PCP_DAO_PCP', - 'CRM_Queue_DAO_QueueItem', - 'CRM_Pledge_DAO_PledgeBlock', - 'CRM_Friend_DAO_Friend', - 'CRM_Dedupe_DAO_Exception', - 'CRM_Dedupe_DAO_Rule', - 'CRM_Dedupe_DAO_RuleGroup', - 'CRM_Event_Cart_DAO_Cart', - 'CRM_Campaign_DAO_CampaignGroup', - 'CRM_Financial_DAO_EntityFinancialAccount', - 'CRM_Financial_DAO_Currency', - 'CRM_Mailing_DAO_BouncePattern', - 'CRM_Mailing_DAO_BounceType', - ); - } - } diff --git a/xml/schema/Campaign/CampaignGroup.xml b/xml/schema/Campaign/CampaignGroup.xml index a3b849a588..dda4c7dc80 100644 --- a/xml/schema/Campaign/CampaignGroup.xml +++ b/xml/schema/Campaign/CampaignGroup.xml @@ -8,6 +8,7 @@ id + Campaign Group ID int unsigned true Campaign Group id. @@ -20,6 +21,7 @@ campaign_id + Campaign int unsigned true Foreign key to the activity Campaign. @@ -40,6 +42,7 @@ group_type + Campaign Group Type varchar 8 NULL @@ -54,6 +57,7 @@ entity_table + Entity Table varchar 64 NULL @@ -63,6 +67,7 @@ entity_id + Entity ID int unsigned NULL Entity id of referenced table. diff --git a/xml/schema/Case/CaseActivity.xml b/xml/schema/Case/CaseActivity.xml index d840664d04..0ae6710e4d 100644 --- a/xml/schema/Case/CaseActivity.xml +++ b/xml/schema/Case/CaseActivity.xml @@ -8,6 +8,7 @@ true id + Case Activity ID int unsigned true Unique case-activity association id @@ -19,6 +20,7 @@ case_id + Case int unsigned true Case ID of case-activity association. @@ -33,6 +35,7 @@ activity_id + Activity ID int unsigned true Activity ID of case-activity association. diff --git a/xml/schema/Case/CaseContact.xml b/xml/schema/Case/CaseContact.xml index 43c8310095..738e23c253 100644 --- a/xml/schema/Case/CaseContact.xml +++ b/xml/schema/Case/CaseContact.xml @@ -8,6 +8,7 @@ true id + Case Contact ID int unsigned true Unique case-contact association id @@ -19,6 +20,7 @@ case_id + Case int unsigned true Case ID of case-contact association. @@ -32,22 +34,23 @@ CASCADE - contact_id - int unsigned - case_contact_id - true - Contact ID of contact record given case belongs to. - - EntityRef - - 2.1 + contact_id + Contact ID + int unsigned + case_contact_id + true + Contact ID of contact record given case belongs to. + + EntityRef + + 2.1 - contact_id - civicrm_contact
- id - 2.1 - CASCADE + contact_id + civicrm_contact
+ id + 2.1 + CASCADE UI_case_contact_id diff --git a/xml/schema/Contact/ACLContactCache.xml b/xml/schema/Contact/ACLContactCache.xml index 72e4bdb8a0..d544de4050 100644 --- a/xml/schema/Contact/ACLContactCache.xml +++ b/xml/schema/Contact/ACLContactCache.xml @@ -20,6 +20,7 @@ user_id + Contact ID int unsigned FK to civicrm_contact (could be null for anon user) 3.1 @@ -33,6 +34,7 @@ contact_id + Contact ID int unsigned true FK to civicrm_contact @@ -47,6 +49,7 @@ operation + Operation varchar 8 true diff --git a/xml/schema/Contact/GroupContactCache.xml b/xml/schema/Contact/GroupContactCache.xml index f14894a0e3..22e92fd4bd 100644 --- a/xml/schema/Contact/GroupContactCache.xml +++ b/xml/schema/Contact/GroupContactCache.xml @@ -8,6 +8,7 @@ 2.1 id + Group Contact Cache ID int unsigned true primary key @@ -19,6 +20,7 @@ group_id + Group int unsigned true FK to civicrm_group @@ -41,6 +43,7 @@ contact_id + Contact ID int unsigned true FK to civicrm_contact diff --git a/xml/schema/Contact/SubscriptionHistory.xml b/xml/schema/Contact/SubscriptionHistory.xml index 83f55d9db8..60d815f8a8 100644 --- a/xml/schema/Contact/SubscriptionHistory.xml +++ b/xml/schema/Contact/SubscriptionHistory.xml @@ -9,6 +9,7 @@ true id + Group Membership History ID int unsigned true Internal Id @@ -20,6 +21,7 @@ contact_id + Contact ID int unsigned true Contact Id @@ -34,6 +36,7 @@ group_id + Group int unsigned Group Id 1.1 @@ -55,6 +58,7 @@ date + Group Membership Action Date datetime true Date of the (un)subscription @@ -62,6 +66,7 @@ method + Group Membership Action varchar 8 How the (un)subscription was triggered @@ -75,6 +80,7 @@ status + Group Membership Status varchar 8 The state of the contact within the group @@ -85,6 +91,7 @@ tracking + Group Membership Tracking varchar 255 IP address or other tracking info diff --git a/xml/schema/Contribute/PremiumsProduct.xml b/xml/schema/Contribute/PremiumsProduct.xml index 2fb8d57f33..7f9b866047 100644 --- a/xml/schema/Contribute/PremiumsProduct.xml +++ b/xml/schema/Contribute/PremiumsProduct.xml @@ -9,6 +9,7 @@ true id + Premium Product ID int unsigned true Contribution ID @@ -20,6 +21,7 @@ premiums_id + Premium int unsigned true Foreign key to premiums settings record. @@ -33,6 +35,7 @@ product_id + Product int unsigned true Foreign key to each product object. diff --git a/xml/schema/Contribute/Widget.xml b/xml/schema/Contribute/Widget.xml index 14fc88e247..22ffb11709 100644 --- a/xml/schema/Contribute/Widget.xml +++ b/xml/schema/Contribute/Widget.xml @@ -9,6 +9,7 @@ true id + Widget ID int unsigned true Contribution Id @@ -20,6 +21,7 @@ contribution_page_id + Contribution Page int unsigned The Contribution Page which triggered this contribution 1.5 @@ -32,12 +34,14 @@ is_active + Enabled? boolean Is this property active? 2.0 title + Widget Title varchar 255 Widget title. @@ -45,6 +49,7 @@ url_logo + Widget Image Url varchar 255 URL to Widget logo @@ -52,6 +57,7 @@ button_title + Button Title varchar 255 Button title. @@ -59,12 +65,14 @@ about + Description text About description. 2.0 url_homepage + Homepage Url varchar 255 URL to Homepage. @@ -72,54 +80,63 @@ color_title + Title Color varchar 10 2.0 color_button + Button Colour varchar 10 2.0 color_bar + Bar Color varchar 10 2.0 color_main_text + Main Text Color varchar 10 2.0 color_main + Main Colour varchar 10 2.0 color_main_bg + Backgroup Color varchar 10 2.0 color_bg + Other Backgroun Colour varchar 10 2.0 color_about_link + About Link Colour varchar 10 2.0 color_homepage_link + Homepage Link Colour varchar 10 2.0 diff --git a/xml/schema/Core/Discount.xml b/xml/schema/Core/Discount.xml index 617f2e4d8c..16cde71afd 100644 --- a/xml/schema/Core/Discount.xml +++ b/xml/schema/Core/Discount.xml @@ -8,6 +8,7 @@ true id + Discount ID int unsigned true primary key @@ -19,6 +20,7 @@ entity_table + Entity Table varchar 64 physical tablename for entity being joined to discount, e.g. civicrm_event @@ -26,6 +28,7 @@ entity_id + Entity ID int unsigned true FK to entity table specified in entity_table column. @@ -87,12 +90,14 @@ start_date + Discount Start Date date Date when discount starts. 2.1 end_date + Discount End Date date Date when discount ends. 2.1 diff --git a/xml/schema/Core/EntityFile.xml b/xml/schema/Core/EntityFile.xml index 373f230f6e..b4a0f2387b 100644 --- a/xml/schema/Core/EntityFile.xml +++ b/xml/schema/Core/EntityFile.xml @@ -8,6 +8,7 @@ true id + Entity File ID int unsigned true primary key @@ -19,6 +20,7 @@ entity_table + Entity Table varchar 64 physical tablename for entity being joined to file, e.g. civicrm_contact @@ -26,6 +28,7 @@ entity_id + Entity ID int unsigned true FK to entity table specified in entity_table column. @@ -44,6 +47,7 @@ file_id + File int unsigned true FK to civicrm_file diff --git a/xml/schema/Core/Log.xml b/xml/schema/Core/Log.xml index ef6efc31f4..d7892395c7 100644 --- a/xml/schema/Core/Log.xml +++ b/xml/schema/Core/Log.xml @@ -8,6 +8,7 @@ 1.5 id + Log ID int unsigned true Log ID @@ -19,6 +20,7 @@ entity_table + Entity Table varchar 64 true @@ -27,6 +29,7 @@ entity_id + Entity ID int unsigned true Foreign key to the referenced item. @@ -46,12 +49,14 @@ data + Data text Updates does to this object if any. 1.5 modified_id + Modified By int unsigned FK to Contact ID of person under whose credentials this data modification was made. 1.5 @@ -65,6 +70,7 @@ modified_date + Modified Date datetime When was the referenced entity created or modified or deleted. 1.5 diff --git a/xml/schema/Core/Managed.xml b/xml/schema/Core/Managed.xml index 4b8bd204c7..9fdb1bc353 100644 --- a/xml/schema/Core/Managed.xml +++ b/xml/schema/Core/Managed.xml @@ -44,6 +44,7 @@ entity_type + Entity Type varchar 64 true @@ -52,6 +53,7 @@ entity_id + Entity ID int unsigned true Foreign key to the referenced item. @@ -59,6 +61,7 @@ cleanup + Cleanup Setting varchar 32 Policy on when to cleanup entity (always, never, unused) diff --git a/xml/schema/Core/Menu.xml b/xml/schema/Core/Menu.xml index 1bcb7626ae..d33d9e5d33 100644 --- a/xml/schema/Core/Menu.xml +++ b/xml/schema/Core/Menu.xml @@ -8,6 +8,7 @@ 1.1 id + Menu ID int unsigned true 2.1 @@ -18,6 +19,7 @@ domain_id + Domain int unsigned true @@ -36,6 +38,7 @@ path + Path varchar 255 Path Name @@ -50,19 +53,21 @@ path_arguments + Arguments text Arguments to pass to the url 2.1 title + Menu Title varchar 255 - Menu Title 2.1 access_callback + Access Callback varchar 255 Function to call to check access permissions @@ -70,12 +75,14 @@ access_arguments + Access Arguments text Arguments to pass to access callback 2.1 page_callback + Page Callback varchar 255 function to call for this url @@ -83,12 +90,14 @@ page_arguments + Page Arguments text Arguments to pass to page callback 2.1 breadcrumb + Breadcrumb text Breadcrumb for the path. 2.1 @@ -109,6 +118,7 @@ component_id + Component int unsigned Component that this menu item belongs to 2.1 @@ -129,24 +139,28 @@ is_active + Enabled? boolean Is this menu item active? 2.1 is_public + Public? boolean Is this menu accessible to the public? 2.1 is_exposed + Exposed? boolean Is this menu exposed to the navigation system? 2.1 is_ssl + Use SSL? boolean Should this menu be exposed via SSL if enabled? 2.1 @@ -162,6 +176,7 @@ type + Type int true 1 @@ -170,6 +185,7 @@ page_type + Page Type int true 1 @@ -178,6 +194,7 @@ skipBreadcrumb + Hide Breadcrumb? boolean skip this url being exposed to breadcrumb 2.2 diff --git a/xml/schema/Core/Persistent.xml b/xml/schema/Core/Persistent.xml index 801bdbfbe5..4ea044d140 100644 --- a/xml/schema/Core/Persistent.xml +++ b/xml/schema/Core/Persistent.xml @@ -7,6 +7,7 @@ 3.2 id + Persistent ID int unsigned true Persistent Record Id @@ -18,6 +19,7 @@ context + Context varchar 255 Context for which name data pair is to be stored @@ -26,6 +28,7 @@ name + Name varchar 255 Name of Context @@ -34,12 +37,14 @@ data + Data longtext data associated with name 3.2 is_config + Is Configuration? boolean 0 Config Settings diff --git a/xml/schema/Core/PreferencesDate.xml b/xml/schema/Core/PreferencesDate.xml index a441117ad4..90949567ec 100644 --- a/xml/schema/Core/PreferencesDate.xml +++ b/xml/schema/Core/PreferencesDate.xml @@ -48,6 +48,7 @@ end + End Offset int true The end offset relative to current year, can be negative diff --git a/xml/schema/Dedupe/Exception.xml b/xml/schema/Dedupe/Exception.xml index f5f095cdc8..bf65f319de 100644 --- a/xml/schema/Dedupe/Exception.xml +++ b/xml/schema/Dedupe/Exception.xml @@ -7,6 +7,7 @@ 3.3 id + Dedupe Exception ID int unsigned true Unique dedupe exception id @@ -17,38 +18,38 @@ true - contact_id1 - First Dupe Contact ID - int unsigned - FK to Contact ID - 3.3 + contact_id1 + First Dupe Contact ID + int unsigned + FK to Contact ID + 3.3 - contact_id1 - civicrm_contact
- id - 3.3 - CASCADE + contact_id1 + civicrm_contact
+ id + 3.3 + CASCADE - contact_id2 - Second Dupe Contact ID - int unsigned - FK to Contact ID - 3.3 + contact_id2 + Second Dupe Contact ID + int unsigned + FK to Contact ID + 3.3 - contact_id2 - civicrm_contact
- id - 3.3 - CASCADE + contact_id2 + civicrm_contact
+ id + 3.3 + CASCADE - UI_contact_id1_contact_id2 - contact_id1 - contact_id2 - true - 3.3 + UI_contact_id1_contact_id2 + contact_id1 + contact_id2 + true + 3.3 diff --git a/xml/schema/Dedupe/Rule.xml b/xml/schema/Dedupe/Rule.xml index a8ee77f1c9..858c0ff8c4 100644 --- a/xml/schema/Dedupe/Rule.xml +++ b/xml/schema/Dedupe/Rule.xml @@ -7,6 +7,7 @@ 1.8 id + Dedupe Rule ID int unsigned true Unique dedupe rule id @@ -18,6 +19,7 @@ dedupe_rule_group_id + Dedupe Rule Group int unsigned true The id of the rule group this rule belongs to @@ -31,6 +33,7 @@ rule_table + Rule Table varchar 64 true @@ -39,6 +42,7 @@ rule_field + Rule Field varchar 64 true @@ -47,6 +51,7 @@ rule_length + Rule Length int unsigned The length of the matching substring 1.8 @@ -56,6 +61,7 @@ rule_weight + Order int true The weight of the rule diff --git a/xml/schema/Dedupe/RuleGroup.xml b/xml/schema/Dedupe/RuleGroup.xml index f59d28f1e1..6adbe3dba4 100644 --- a/xml/schema/Dedupe/RuleGroup.xml +++ b/xml/schema/Dedupe/RuleGroup.xml @@ -7,6 +7,7 @@ 1.8 id + Rule Group ID int unsigned true Unique dedupe rule group id @@ -18,6 +19,7 @@ contact_type + Contact Type varchar 12 The type of contacts this group applies to @@ -34,6 +36,7 @@ threshold + Threshold int true The weight threshold the sum of the rule weights has to cross to consider two contacts the same @@ -44,6 +47,7 @@ level + Level enum Strict, Fuzzy Whether the rule should be used for cases where strict matching of the given contact type is required or a fuzzy one @@ -53,6 +57,7 @@ used varchar + Length 12 true Whether the rule should be used for cases where usage is Unsupervised, Supervised OR General(programatically) @@ -66,6 +71,7 @@ is_default + Default> boolean Is this a default rule (one rule for every contact type + level combination should be default) 2.1 @@ -73,6 +79,7 @@ name + Name varchar 64 Name of the rule group @@ -80,6 +87,7 @@ title + Title varchar 255 Label of the rule group @@ -90,6 +98,7 @@ is_reserved + Reserved? boolean Is this a reserved rule - a rule group that has been optimized and cannot be changed by the admin 4.1 diff --git a/xml/schema/Event/Cart/Cart.xml b/xml/schema/Event/Cart/Cart.xml index 22bed9a28b..35a96bfb3a 100644 --- a/xml/schema/Event/Cart/Cart.xml +++ b/xml/schema/Event/Cart/Cart.xml @@ -6,6 +6,7 @@ civicrm_event_carts id + Cart ID cart_id int unsigned true @@ -18,12 +19,14 @@ user_id + Created By int unsigned FK to civicrm_contact who created this cart 4.1 completed + Complete? boolean 0 4.1 diff --git a/xml/schema/Event/Cart/EventInCart.xml b/xml/schema/Event/Cart/EventInCart.xml index 4daa96ab4b..6fd487202d 100644 --- a/xml/schema/Event/Cart/EventInCart.xml +++ b/xml/schema/Event/Cart/EventInCart.xml @@ -6,6 +6,7 @@ civicrm_events_in_carts id + Event In Cart event_in_cart_id int unsigned true @@ -18,6 +19,7 @@ event_id + Event int unsigned FK to Event ID 4.1 @@ -31,6 +33,7 @@ event_cart_id + Event In Cart int unsigned FK to Event Cart ID 4.1 diff --git a/xml/schema/Financial/Currency.xml b/xml/schema/Financial/Currency.xml index 19c5a24fcd..28060cd1c2 100644 --- a/xml/schema/Financial/Currency.xml +++ b/xml/schema/Financial/Currency.xml @@ -8,6 +8,7 @@ true id + Currency ID int unsigned true Currency Id @@ -31,6 +32,7 @@ symbol + Currency Symbol varchar 8 Currency Symbol @@ -41,6 +43,7 @@ numeric_code + Currency Numeric Code varchar 3 true @@ -49,6 +52,7 @@ full_name + Full Currency Name varchar 64 Full currency name diff --git a/xml/schema/Financial/EntityFinancialAccount.xml b/xml/schema/Financial/EntityFinancialAccount.xml index de635c6874..51c6abae1a 100755 --- a/xml/schema/Financial/EntityFinancialAccount.xml +++ b/xml/schema/Financial/EntityFinancialAccount.xml @@ -9,6 +9,7 @@ true id + Entity Financial Account ID int unsigned true ID @@ -20,6 +21,7 @@ entity_table + Entity Table varchar 64 true @@ -29,6 +31,7 @@ entity_id + Entity ID int unsigned true 4.3 @@ -41,6 +44,7 @@ account_relationship + Account Relationship int unsigned true 4.3 @@ -55,6 +59,7 @@ financial_account_id int unsigned + Financial Account true 4.3 FK to the financial_account_id diff --git a/xml/schema/Friend/Friend.xml b/xml/schema/Friend/Friend.xml index b851fdfdef..1894e806a0 100644 --- a/xml/schema/Friend/Friend.xml +++ b/xml/schema/Friend/Friend.xml @@ -7,6 +7,7 @@ 2.0 id + Friend ID int unsigned true Friend ID @@ -18,6 +19,7 @@ entity_table + Entity Table varchar 64 true @@ -26,6 +28,7 @@ entity_id + Entity ID int unsigned true Foreign key to the referenced item. @@ -38,6 +41,7 @@ title + Title varchar 255 true @@ -48,6 +52,7 @@ intro + Intro text true Introductory message to contributor or participant displayed on the Tell a Friend form. @@ -58,6 +63,7 @@ suggested_message + Suggested Message text true Suggested message to friends, provided as default on the Tell A Friend form. @@ -68,6 +74,7 @@ general_link + General Link varchar 255 true @@ -79,6 +86,7 @@ thankyou_title + Thank You Title varchar 255 true @@ -90,6 +98,7 @@ thankyou_text + Thank You Text text true Thank you message displayed on success page. @@ -100,6 +109,7 @@ is_active + Enabled? boolean 2.0 diff --git a/xml/schema/Mailing/BouncePattern.xml b/xml/schema/Mailing/BouncePattern.xml index d5b4c784af..3715febd2d 100644 --- a/xml/schema/Mailing/BouncePattern.xml +++ b/xml/schema/Mailing/BouncePattern.xml @@ -7,6 +7,7 @@ Pseudo-constant table of patterns for bounce classification id + Bounce Pattern ID int unsigned true @@ -16,6 +17,7 @@ bounce_type_id + Bounce Type int unsigned true Type of bounce @@ -28,6 +30,7 @@ pattern + Pattern varchar 255 A regexp to match a message to a bounce type diff --git a/xml/schema/Mailing/BounceType.xml b/xml/schema/Mailing/BounceType.xml index 4eacbd2df8..e24f7fe44c 100644 --- a/xml/schema/Mailing/BounceType.xml +++ b/xml/schema/Mailing/BounceType.xml @@ -7,6 +7,7 @@ Table to index the various bounce types and their properties id + Bounce Type ID int unsigned true @@ -16,6 +17,7 @@ name + Bounce Type Name varchar 24 true @@ -23,12 +25,14 @@ description + Bounce Type Description varchar 255 A description of this bounce type hold_threshold + Hold Threshold int unsigned true Number of bounces of this type required before the email address is put on bounce hold diff --git a/xml/schema/Mailing/Event/Bounce.xml b/xml/schema/Mailing/Event/Bounce.xml index 5842e95102..a76feedbe9 100644 --- a/xml/schema/Mailing/Event/Bounce.xml +++ b/xml/schema/Mailing/Event/Bounce.xml @@ -8,6 +8,7 @@ true id + Bounce ID int unsigned true @@ -17,6 +18,7 @@ event_queue_id + Event Queue int unsigned true FK to EventQueue @@ -29,6 +31,7 @@ bounce_type_id + Bounce Type int unsigned What type of bounce was it? @@ -42,12 +45,14 @@ bounce_reason + Bounce Reason varchar 255 The reason the email bounced. time_stamp + Timestamp datetime true When this bounce event occurred. diff --git a/xml/schema/Mailing/Event/Delivered.xml b/xml/schema/Mailing/Event/Delivered.xml index 8eff1e1f84..46ddba2eec 100644 --- a/xml/schema/Mailing/Event/Delivered.xml +++ b/xml/schema/Mailing/Event/Delivered.xml @@ -8,6 +8,7 @@ true id + Delivered ID int unsigned true @@ -17,6 +18,7 @@ event_queue_id + Event Queue int unsigned true FK to EventQueue @@ -29,6 +31,7 @@ time_stamp + Timestamp datetime true When this delivery event occurred. diff --git a/xml/schema/Mailing/Event/Forward.xml b/xml/schema/Mailing/Event/Forward.xml index 1535bed82a..4fe391110d 100644 --- a/xml/schema/Mailing/Event/Forward.xml +++ b/xml/schema/Mailing/Event/Forward.xml @@ -8,6 +8,7 @@ true id + Forward ID int unsigned true @@ -17,6 +18,7 @@ event_queue_id + Mailing Event Queue int unsigned true FK to EventQueue @@ -29,6 +31,7 @@ dest_queue_id + Destination Queue int unsigned FK to EventQueue for destination @@ -40,6 +43,7 @@ time_stamp + Timestamp datetime true When this forward event occurred. diff --git a/xml/schema/Mailing/Event/Opened.xml b/xml/schema/Mailing/Event/Opened.xml index d43ffd823b..2d69ef13f2 100644 --- a/xml/schema/Mailing/Event/Opened.xml +++ b/xml/schema/Mailing/Event/Opened.xml @@ -31,6 +31,7 @@ time_stamp + Timestamp datetime true When this open event occurred. diff --git a/xml/schema/Mailing/Event/TrackableURLOpen.xml b/xml/schema/Mailing/Event/TrackableURLOpen.xml index 575c7885d2..17f0e0e95b 100644 --- a/xml/schema/Mailing/Event/TrackableURLOpen.xml +++ b/xml/schema/Mailing/Event/TrackableURLOpen.xml @@ -8,6 +8,7 @@ true id + Trackable URL Open ID int unsigned true @@ -17,6 +18,7 @@ event_queue_id + Event Queue int unsigned true FK to EventQueue @@ -29,6 +31,7 @@ trackable_url_id + Trackable Url int unsigned true FK to TrackableURL @@ -41,6 +44,7 @@ time_stamp + Timestamp datetime true When this trackable URL open occurred. diff --git a/xml/schema/Mailing/Spool.xml b/xml/schema/Mailing/Spool.xml index 505de09fee..b7c82ba632 100644 --- a/xml/schema/Mailing/Spool.xml +++ b/xml/schema/Mailing/Spool.xml @@ -7,6 +7,7 @@ Stores the outbond mails id + Spool ID int unsigned true @@ -16,6 +17,7 @@ job_id + Mailing Job int unsigned true The ID of the Job . @@ -28,26 +30,31 @@ recipient_email + Recipient Email text The email of the receipients this mail is to be sent. headers + Headers text The header information of this mailing . body + Body text The body of this mailing. added_at + Added datetime date on which this job was added. removed_at + Removed datetime date on which this job was removed. diff --git a/xml/schema/PCP/PCP.xml b/xml/schema/PCP/PCP.xml index 46f66b6c30..349f24abe9 100644 --- a/xml/schema/PCP/PCP.xml +++ b/xml/schema/PCP/PCP.xml @@ -82,6 +82,7 @@ donate_link_text + Donate Link Text varchar 255 NULL @@ -106,6 +107,7 @@ page_id + Contribution Page int unsigned true The Contribution or Event Page which triggered this pcp @@ -125,6 +127,7 @@ pcp_block_id + PCP Block The pcp block that this pcp page was created from int unsigned true @@ -132,6 +135,7 @@ is_thermometer + Use Thermometer? int unsigned 0 @@ -141,6 +145,7 @@ is_honor_roll + Show Honor Roll? int unsigned 0 2.2 @@ -150,6 +155,7 @@ goal_amount + Goal Amount decimal Goal amount of this Personal Campaign Page. 2.2 @@ -159,6 +165,7 @@ currency + Currency varchar 3 NULL @@ -176,6 +183,7 @@ referer + Referer varchar 255 NULL @@ -184,6 +192,7 @@ is_active + Enabled? boolean Is Personal Campaign Page enabled/active? 0 @@ -194,6 +203,7 @@ is_notify + Notify Owner? boolean Notify owner via email when someone donates to page? 0 diff --git a/xml/schema/PCP/PCPBlock.xml b/xml/schema/PCP/PCPBlock.xml index 5d4a1af4f7..b07bc5b035 100644 --- a/xml/schema/PCP/PCPBlock.xml +++ b/xml/schema/PCP/PCPBlock.xml @@ -9,6 +9,7 @@ true id + PCP Block ID int unsigned true PCP block Id @@ -20,12 +21,14 @@ entity_table + Entity Table varchar 64 2.2 entity_id + Entity int unsigned true FK to civicrm_contribution_page.id OR civicrm_event.id @@ -45,6 +48,7 @@ target_entity_type + Target Entity varchar 255 true @@ -54,6 +58,7 @@ target_entity_id + Target Entity ID int unsigned true The entity that this pcp targets @@ -67,6 +72,7 @@ supporter_profile_id + Supporter Profile int unsigned FK to civicrm_uf_group.id. Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)? NULL @@ -95,6 +101,7 @@ is_approval_needed + Approval Required? boolean Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)? NULL @@ -102,6 +109,7 @@ is_tellfriend_enabled + Tell a Friend Enabled? boolean Does Personal Campaign Page allow using tell a friend? NULL @@ -109,6 +117,7 @@ tellfriend_limit + Tell A Friend Limit int unsigned NULL Maximum recipient fields allowed in tell a friend @@ -116,6 +125,7 @@ link_text + Link Text varchar 255 NULL @@ -125,6 +135,7 @@ is_active + Enabled? boolean Is Personal Campaign Page Block enabled/active? 1 @@ -132,6 +143,7 @@ notify_email + Notification Email varchar 255 If set, notification is automatically emailed to this email-address on create/update Personal Campaign Page diff --git a/xml/schema/Pledge/PledgeBlock.xml b/xml/schema/Pledge/PledgeBlock.xml index 4012777a5c..d0282070cf 100644 --- a/xml/schema/Pledge/PledgeBlock.xml +++ b/xml/schema/Pledge/PledgeBlock.xml @@ -7,6 +7,7 @@ true id + Pledge Block ID int unsigned true Pledge ID @@ -53,6 +54,7 @@ is_pledge_interval + Expose Frequency Interval? boolean 0 Is frequency interval exposed on the contribution form. diff --git a/xml/schema/Price/PriceSetEntity.xml b/xml/schema/Price/PriceSetEntity.xml index a6ec3c2713..3ec1dbd058 100644 --- a/xml/schema/Price/PriceSetEntity.xml +++ b/xml/schema/Price/PriceSetEntity.xml @@ -8,6 +8,7 @@ true id + Price Set Entity ID int unsigned true Price Set Entity @@ -19,6 +20,7 @@ entity_table + Entity Table varchar 64 true @@ -27,6 +29,7 @@ entity_id + Entity IF int unsigned true Item in table @@ -39,6 +42,7 @@ price_set_id + Price Set int unsigned true price set being used diff --git a/xml/schema/Queue/QueueItem.xml b/xml/schema/Queue/QueueItem.xml index 1f3f11818f..cbbb20de3e 100644 --- a/xml/schema/Queue/QueueItem.xml +++ b/xml/schema/Queue/QueueItem.xml @@ -12,6 +12,7 @@ 4.2 id + Queue ID int unsigned true @@ -21,6 +22,7 @@ queue_name + Queue Name varchar 64 Name of the queue which includes this item @@ -40,6 +42,7 @@ submit_time + Submit Time datetime date on which this item was submitted to the queue true @@ -49,6 +52,7 @@ release_time + Release Time datetime date on which this job becomes available; null if ASAP