From: eileen Date: Mon, 15 Apr 2019 03:27:41 +0000 (+1000) Subject: Regenerate DAO files to have 'where' fields defined X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a36434b96485cb086480c8deae0fe408b1ba1d01;p=civicrm-core.git Regenerate DAO files to have 'where' fields defined --- diff --git a/CRM/ACL/DAO/ACL.php b/CRM/ACL/DAO/ACL.php index 51791fb5f5..2cba8eaaf3 100644 --- a/CRM/ACL/DAO/ACL.php +++ b/CRM/ACL/DAO/ACL.php @@ -142,6 +142,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'title' => ts('ACL ID'), 'description' => ts('Unique table ID'), 'required' => TRUE, + 'where' => 'civicrm_acl.id', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', @@ -154,6 +155,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'description' => ts('ACL Name.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_acl.name', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', @@ -168,6 +170,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'title' => ts('Deny ACL?'), 'description' => ts('Is this ACL entry Allow (0) or Deny (1) ?'), 'required' => TRUE, + 'where' => 'civicrm_acl.deny', 'default' => '0', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', @@ -185,6 +188,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_acl.entity_table', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', @@ -195,6 +199,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Entity ID'), 'description' => ts('ID of the object possessing this ACL'), + 'where' => 'civicrm_acl.entity_id', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', @@ -208,6 +213,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_acl.operation', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', @@ -226,6 +232,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'description' => ts('The table of the object controlled by this ACL entry'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_acl.object_table', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', @@ -236,6 +243,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('ACL Object ID'), 'description' => ts('The ID of the object controlled by this ACL entry'), + 'where' => 'civicrm_acl.object_id', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', @@ -248,6 +256,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'description' => ts('If this is a grant/revoke entry, what table are we granting?'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_acl.acl_table', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', @@ -258,6 +267,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('ACL Group ID'), 'description' => ts('ID of the ACL or ACL group being granted/revoked'), + 'where' => 'civicrm_acl.acl_id', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', @@ -268,6 +278,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('ACL Is Active?'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_acl.is_active', 'table_name' => 'civicrm_acl', 'entity' => 'ACL', 'bao' => 'CRM_ACL_BAO_ACL', diff --git a/CRM/ACL/DAO/Cache.php b/CRM/ACL/DAO/Cache.php index cd74fd01bb..c59ff67e57 100644 --- a/CRM/ACL/DAO/Cache.php +++ b/CRM/ACL/DAO/Cache.php @@ -94,6 +94,7 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO { 'title' => ts('Cache ID'), 'description' => ts('Unique table ID'), 'required' => TRUE, + 'where' => 'civicrm_acl_cache.id', 'table_name' => 'civicrm_acl_cache', 'entity' => 'Cache', 'bao' => 'CRM_ACL_BAO_Cache', @@ -104,6 +105,7 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Cache Contact'), 'description' => ts('Foreign Key to Contact'), + 'where' => 'civicrm_acl_cache.contact_id', 'table_name' => 'civicrm_acl_cache', 'entity' => 'Cache', 'bao' => 'CRM_ACL_BAO_Cache', @@ -116,6 +118,7 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO { 'title' => ts('Cache ACL'), 'description' => ts('Foreign Key to ACL'), 'required' => TRUE, + 'where' => 'civicrm_acl_cache.acl_id', 'table_name' => 'civicrm_acl_cache', 'entity' => 'Cache', 'bao' => 'CRM_ACL_BAO_Cache', @@ -128,6 +131,7 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO { 'title' => ts('Cache Modified Date'), 'description' => ts('When was this cache entry last modified'), 'required' => FALSE, + 'where' => 'civicrm_acl_cache.modified_date', 'table_name' => 'civicrm_acl_cache', 'entity' => 'Cache', 'bao' => 'CRM_ACL_BAO_Cache', diff --git a/CRM/ACL/DAO/EntityRole.php b/CRM/ACL/DAO/EntityRole.php index bb0fda29f2..93956fc8b9 100644 --- a/CRM/ACL/DAO/EntityRole.php +++ b/CRM/ACL/DAO/EntityRole.php @@ -100,6 +100,7 @@ class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO { 'title' => ts('Entity Role'), 'description' => ts('Unique table ID'), 'required' => TRUE, + 'where' => 'civicrm_acl_entity_role.id', 'table_name' => 'civicrm_acl_entity_role', 'entity' => 'EntityRole', 'bao' => 'CRM_ACL_BAO_EntityRole', @@ -111,6 +112,7 @@ class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO { 'title' => ts('ACL Role ID'), 'description' => ts('Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)'), 'required' => TRUE, + 'where' => 'civicrm_acl_entity_role.acl_role_id', 'table_name' => 'civicrm_acl_entity_role', 'entity' => 'EntityRole', 'bao' => 'CRM_ACL_BAO_EntityRole', @@ -124,6 +126,7 @@ class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_acl_entity_role.entity_table', 'table_name' => 'civicrm_acl_entity_role', 'entity' => 'EntityRole', 'bao' => 'CRM_ACL_BAO_EntityRole', @@ -135,6 +138,7 @@ class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO { 'title' => ts('ACL Entity ID'), 'description' => ts('ID of the group/contact object being joined'), 'required' => TRUE, + 'where' => 'civicrm_acl_entity_role.entity_id', 'table_name' => 'civicrm_acl_entity_role', 'entity' => 'EntityRole', 'bao' => 'CRM_ACL_BAO_EntityRole', @@ -145,6 +149,7 @@ class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('ACL Entity Role is Active'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_acl_entity_role.is_active', 'table_name' => 'civicrm_acl_entity_role', 'entity' => 'EntityRole', 'bao' => 'CRM_ACL_BAO_EntityRole', diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php index b6434b2bf6..d81c1a82a8 100644 --- a/CRM/Activity/DAO/Activity.php +++ b/CRM/Activity/DAO/Activity.php @@ -250,8 +250,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_activity.id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -263,6 +261,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Source Record'), 'description' => ts('Artificial FK to original transaction (e.g. contribution) IF it is not an Activity. Table can be figured out through activity_type_id, and further through component registry.'), + 'where' => 'civicrm_activity.source_record_id', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', @@ -277,7 +276,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.activity_type_id', 'headerPattern' => '/(activity.)?type(.id$)/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '1', 'table_name' => 'civicrm_activity', @@ -302,7 +300,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.subject', 'headerPattern' => '/(activity.)?subject/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -320,7 +317,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.activity_date_time', 'headerPattern' => '/(activity.)?date(.time$)?/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -339,7 +335,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.duration', 'headerPattern' => '/(activity.)?duration(s)?$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -359,7 +354,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.location', 'headerPattern' => '/(activity.)?location$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -374,6 +368,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Phone (called) ID'), 'description' => ts('Phone ID of the number called (optional - used if an existing phone number is selected).'), + 'where' => 'civicrm_activity.phone_id', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', @@ -390,6 +385,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'description' => ts('Phone number in case the number does not exist in the civicrm_phone table.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_activity.phone_number', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', @@ -406,7 +402,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.details', 'headerPattern' => '/(activity.)?detail(s)?$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -424,7 +419,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.status_id', 'headerPattern' => '/(activity.)?status(.label$)?/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -443,6 +437,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Priority'), 'description' => ts('ID of the priority given to this activity. Foreign key to civicrm_option_value.'), + 'where' => 'civicrm_activity.priority_id', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', @@ -460,6 +455,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Parent Activity Id'), 'description' => ts('Parent meeting ID (if this is a follow-up item). This is not currently implemented'), + 'where' => 'civicrm_activity.parent_id', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', @@ -473,7 +469,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.is_test', 'headerPattern' => '/(is.)?test(.activity)?/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_activity', @@ -489,6 +484,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Activity Medium'), 'description' => ts('Activity Medium, Implicit FK to civicrm_option_value where option_group = encounter_medium.'), + 'where' => 'civicrm_activity.medium_id', 'default' => 'NULL', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -506,6 +502,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'name' => 'is_auto', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Auto'), + 'where' => 'civicrm_activity.is_auto', 'default' => '0', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -517,6 +514,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Relationship Id'), 'description' => ts('FK to Relationship ID'), + 'where' => 'civicrm_activity.relationship_id', 'default' => 'NULL', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -531,7 +529,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.is_current_revision', 'headerPattern' => '/(is.)?(current.)?(revision|version(ing)?)/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '1', 'table_name' => 'civicrm_activity', @@ -547,6 +544,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Original Activity ID '), 'description' => ts('Activity ID of the first activity record in versioning chain.'), + 'where' => 'civicrm_activity.original_id', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', @@ -560,6 +558,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'description' => ts('Currently being used to store result id for survey activity, FK to option value.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_activity.result', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', @@ -575,7 +574,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.is_deleted', 'headerPattern' => '/(activity.)?(trash|deleted)/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_activity', @@ -593,8 +591,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'description' => ts('The campaign for which this activity has been triggered.'), 'import' => TRUE, 'where' => 'civicrm_activity.campaign_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -617,8 +613,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'description' => ts('Assign a specific level of engagement to this activity. Used for tracking constituents in ladder of engagement.'), 'import' => TRUE, 'where' => 'civicrm_activity.engagement_level', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -636,6 +630,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'name' => 'weight', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Order'), + 'where' => 'civicrm_activity.weight', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', @@ -652,7 +647,6 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_activity.is_star', 'headerPattern' => '/(activity.)?(star|favorite)/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_activity', @@ -666,10 +660,8 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'title' => ts('Created Date'), 'description' => ts('When was the activity was created.'), 'required' => FALSE, - 'export' => TRUE, 'where' => 'civicrm_activity.created_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', @@ -682,10 +674,8 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'title' => ts('Modified Date'), 'description' => ts('When was the activity (or closely related entity) was created or modified or deleted.'), 'required' => FALSE, - 'export' => TRUE, 'where' => 'civicrm_activity.modified_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'table_name' => 'civicrm_activity', 'entity' => 'Activity', diff --git a/CRM/Activity/DAO/ActivityContact.php b/CRM/Activity/DAO/ActivityContact.php index eab2e15f2a..1eaa7ca825 100644 --- a/CRM/Activity/DAO/ActivityContact.php +++ b/CRM/Activity/DAO/ActivityContact.php @@ -94,6 +94,7 @@ class CRM_Activity_DAO_ActivityContact extends CRM_Core_DAO { 'title' => ts('Activity Contact ID'), 'description' => ts('Activity contact id'), 'required' => TRUE, + 'where' => 'civicrm_activity_contact.id', 'table_name' => 'civicrm_activity_contact', 'entity' => 'ActivityContact', 'bao' => 'CRM_Activity_BAO_ActivityContact', @@ -105,6 +106,7 @@ class CRM_Activity_DAO_ActivityContact extends CRM_Core_DAO { 'title' => ts('Activity ID'), 'description' => ts('Foreign key to the activity for this record.'), 'required' => TRUE, + 'where' => 'civicrm_activity_contact.activity_id', 'table_name' => 'civicrm_activity_contact', 'entity' => 'ActivityContact', 'bao' => 'CRM_Activity_BAO_ActivityContact', @@ -119,8 +121,6 @@ class CRM_Activity_DAO_ActivityContact extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_activity_contact.contact_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_activity_contact', 'entity' => 'ActivityContact', @@ -133,6 +133,7 @@ class CRM_Activity_DAO_ActivityContact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Record Type ID'), 'description' => ts('Nature of this contact\'s role in the activity: 1 assignee, 2 creator, 3 focus or target.'), + 'where' => 'civicrm_activity_contact.record_type_id', 'table_name' => 'civicrm_activity_contact', 'entity' => 'ActivityContact', 'bao' => 'CRM_Activity_BAO_ActivityContact', diff --git a/CRM/Batch/DAO/Batch.php b/CRM/Batch/DAO/Batch.php index a066888d14..cac1d10f15 100644 --- a/CRM/Batch/DAO/Batch.php +++ b/CRM/Batch/DAO/Batch.php @@ -184,6 +184,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'title' => ts('Batch ID'), 'description' => ts('Unique Address ID'), 'required' => TRUE, + 'where' => 'civicrm_batch.id', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -196,6 +197,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'description' => ts('Variable name/programmatic handle for this batch.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_batch.name', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -211,6 +213,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'description' => ts('Friendly Name.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_batch.title', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -226,6 +229,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'description' => ts('Description of this batch set.'), 'rows' => 4, 'cols' => 80, + 'where' => 'civicrm_batch.description', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -239,6 +243,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Batch Created By'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_batch.created_id', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -250,6 +255,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Batch Created Date'), 'description' => ts('When was this item created'), + 'where' => 'civicrm_batch.created_date', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -263,6 +269,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Batch Modified By'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_batch.modified_id', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -274,6 +281,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Batch Modified Date'), 'description' => ts('When was this item created'), + 'where' => 'civicrm_batch.modified_date', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -284,6 +292,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Batch Smart Group'), 'description' => ts('FK to Saved Search ID'), + 'where' => 'civicrm_batch.saved_search_id', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -299,6 +308,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'title' => ts('Batch Status'), 'description' => ts('fk to Batch Status options in civicrm_option_values'), 'required' => TRUE, + 'where' => 'civicrm_batch.status_id', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -316,6 +326,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Batch Type'), 'description' => ts('fk to Batch Type options in civicrm_option_values'), + 'where' => 'civicrm_batch.type_id', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -333,6 +344,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Batch Mode'), 'description' => ts('fk to Batch mode options in civicrm_option_values'), + 'where' => 'civicrm_batch.mode_id', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -354,6 +366,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_batch.total', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -367,6 +380,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Batch Number of Items'), 'description' => ts('Number of items in a batch.'), + 'where' => 'civicrm_batch.item_count', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -380,6 +394,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Batch Payment Method'), 'description' => ts('fk to Payment Instrument options in civicrm_option_values'), + 'where' => 'civicrm_batch.payment_instrument_id', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -396,6 +411,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'name' => 'exported_date', 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Batch Exported Date'), + 'where' => 'civicrm_batch.exported_date', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', @@ -406,6 +422,7 @@ class CRM_Batch_DAO_Batch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Batch Data'), 'description' => ts('cache entered data'), + 'where' => 'civicrm_batch.data', 'table_name' => 'civicrm_batch', 'entity' => 'Batch', 'bao' => 'CRM_Batch_BAO_Batch', diff --git a/CRM/Batch/DAO/EntityBatch.php b/CRM/Batch/DAO/EntityBatch.php index 7526bf3d91..a9ec632af0 100644 --- a/CRM/Batch/DAO/EntityBatch.php +++ b/CRM/Batch/DAO/EntityBatch.php @@ -94,6 +94,7 @@ class CRM_Batch_DAO_EntityBatch extends CRM_Core_DAO { 'title' => ts('EntityBatch ID'), 'description' => ts('primary key'), 'required' => TRUE, + 'where' => 'civicrm_entity_batch.id', 'table_name' => 'civicrm_entity_batch', 'entity' => 'EntityBatch', 'bao' => 'CRM_Batch_BAO_EntityBatch', @@ -106,6 +107,7 @@ class CRM_Batch_DAO_EntityBatch extends CRM_Core_DAO { 'description' => ts('physical tablename for entity being joined to file, e.g. civicrm_contact'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_entity_batch.entity_table', 'table_name' => 'civicrm_entity_batch', 'entity' => 'EntityBatch', 'bao' => 'CRM_Batch_BAO_EntityBatch', @@ -117,6 +119,7 @@ class CRM_Batch_DAO_EntityBatch extends CRM_Core_DAO { 'title' => ts('Entity ID'), 'description' => ts('FK to entity table specified in entity_table column.'), 'required' => TRUE, + 'where' => 'civicrm_entity_batch.entity_id', 'table_name' => 'civicrm_entity_batch', 'entity' => 'EntityBatch', 'bao' => 'CRM_Batch_BAO_EntityBatch', @@ -128,6 +131,7 @@ class CRM_Batch_DAO_EntityBatch extends CRM_Core_DAO { 'title' => ts('Batch ID'), 'description' => ts('FK to civicrm_batch'), 'required' => TRUE, + 'where' => 'civicrm_entity_batch.batch_id', 'table_name' => 'civicrm_entity_batch', 'entity' => 'EntityBatch', 'bao' => 'CRM_Batch_BAO_EntityBatch', diff --git a/CRM/Campaign/DAO/Campaign.php b/CRM/Campaign/DAO/Campaign.php index 3615394107..dad2b00def 100644 --- a/CRM/Campaign/DAO/Campaign.php +++ b/CRM/Campaign/DAO/Campaign.php @@ -188,8 +188,6 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_campaign.id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', @@ -206,8 +204,6 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_campaign.name', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', @@ -226,8 +222,6 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_campaign.title', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', @@ -244,6 +238,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'description' => ts('Full description of Campaign.'), 'rows' => 8, 'cols' => 60, + 'where' => 'civicrm_campaign.description', 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', @@ -260,7 +255,6 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_campaign.start_date', 'headerPattern' => '/^start|(s(tart\s)?date)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', @@ -278,7 +272,6 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_campaign.end_date', 'headerPattern' => '/^end|(e(nd\s)?date)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', @@ -295,8 +288,6 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'description' => ts('Campaign Type ID.Implicit FK to civicrm_option_value where option_group = campaign_type'), 'import' => TRUE, 'where' => 'civicrm_campaign.campaign_type_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_campaign', @@ -318,8 +309,6 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'description' => ts('Campaign status ID.Implicit FK to civicrm_option_value where option_group = campaign_status'), 'import' => TRUE, 'where' => 'civicrm_campaign.status_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_campaign', @@ -361,8 +350,6 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'description' => ts('Optional parent id for this Campaign.'), 'import' => TRUE, 'where' => 'civicrm_campaign.parent_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_campaign', @@ -379,6 +366,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Campaign Active?'), 'description' => ts('Is this Campaign enabled or disabled/cancelled?'), + 'where' => 'civicrm_campaign.is_active', 'default' => '1', 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', @@ -393,6 +381,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Campaign Created By'), 'description' => ts('FK to civicrm_contact, who created this Campaign.'), + 'where' => 'civicrm_campaign.created_id', 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', @@ -404,6 +393,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Campaign Created Date'), 'description' => ts('Date and time that Campaign was created.'), + 'where' => 'civicrm_campaign.created_date', 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', @@ -417,6 +407,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Campaign Modified By'), 'description' => ts('FK to civicrm_contact, who recently edited this Campaign.'), + 'where' => 'civicrm_campaign.last_modified_id', 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', @@ -428,6 +419,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Campaign Modified Date'), 'description' => ts('Date and time that Campaign was edited last time.'), + 'where' => 'civicrm_campaign.last_modified_date', 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', @@ -438,6 +430,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Campaign Goals'), 'description' => ts('General goals for Campaign.'), + 'where' => 'civicrm_campaign.goal_general', 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', @@ -455,6 +448,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_campaign.goal_revenue', 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', diff --git a/CRM/Campaign/DAO/CampaignGroup.php b/CRM/Campaign/DAO/CampaignGroup.php index 39807c1ac6..5c8ec894d4 100644 --- a/CRM/Campaign/DAO/CampaignGroup.php +++ b/CRM/Campaign/DAO/CampaignGroup.php @@ -101,6 +101,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO { 'title' => ts('Campaign Group ID'), 'description' => ts('Campaign Group id.'), 'required' => TRUE, + 'where' => 'civicrm_campaign_group.id', 'table_name' => 'civicrm_campaign_group', 'entity' => 'CampaignGroup', 'bao' => 'CRM_Campaign_DAO_CampaignGroup', @@ -112,6 +113,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO { 'title' => ts('Campaign'), 'description' => ts('Foreign key to the activity Campaign.'), 'required' => TRUE, + 'where' => 'civicrm_campaign_group.campaign_id', 'table_name' => 'civicrm_campaign_group', 'entity' => 'CampaignGroup', 'bao' => 'CRM_Campaign_DAO_CampaignGroup', @@ -130,6 +132,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO { 'description' => ts('Type of Group.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_campaign_group.group_type', 'default' => 'NULL', 'table_name' => 'civicrm_campaign_group', 'entity' => 'CampaignGroup', @@ -149,6 +152,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO { 'description' => ts('Name of table where item being referenced is stored.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_campaign_group.entity_table', 'default' => 'NULL', 'table_name' => 'civicrm_campaign_group', 'entity' => 'CampaignGroup', @@ -160,6 +164,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Entity ID'), 'description' => ts('Entity id of referenced table.'), + 'where' => 'civicrm_campaign_group.entity_id', 'default' => 'NULL', 'table_name' => 'civicrm_campaign_group', 'entity' => 'CampaignGroup', diff --git a/CRM/Campaign/DAO/Survey.php b/CRM/Campaign/DAO/Survey.php index 17cc7fcc90..763fd2f710 100644 --- a/CRM/Campaign/DAO/Survey.php +++ b/CRM/Campaign/DAO/Survey.php @@ -207,6 +207,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'title' => ts('Survey ID'), 'description' => ts('Survey id.'), 'required' => TRUE, + 'where' => 'civicrm_survey.id', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -222,8 +223,6 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_survey.title', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_survey', 'entity' => 'Survey', @@ -235,6 +234,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Survey Campaign ID'), 'description' => ts('Foreign key to the Campaign.'), + 'where' => 'civicrm_survey.campaign_id', 'default' => 'NULL', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', @@ -254,8 +254,6 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'description' => ts('Implicit FK to civicrm_option_value where option_group = activity_type'), 'import' => TRUE, 'where' => 'civicrm_survey.activity_type_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_survey', @@ -277,6 +275,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'description' => ts('Recontact intervals for each status.'), 'rows' => 20, 'cols' => 80, + 'where' => 'civicrm_survey.recontact_interval', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -292,6 +291,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'description' => ts('Script instructions for volunteers to use for the survey.'), 'rows' => 20, 'cols' => 80, + 'where' => 'civicrm_survey.instructions', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -305,6 +305,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Survey Hold Duration'), 'description' => ts('Number of days for recurrence of release.'), + 'where' => 'civicrm_survey.release_frequency', 'default' => 'NULL', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', @@ -316,6 +317,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Maximum number of contacts'), 'description' => ts('Maximum number of contacts to allow for survey.'), + 'where' => 'civicrm_survey.max_number_of_contacts', 'default' => 'NULL', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', @@ -327,6 +329,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Default number of contacts'), 'description' => ts('Default number of contacts to allow for survey.'), + 'where' => 'civicrm_survey.default_number_of_contacts', 'default' => 'NULL', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', @@ -338,6 +341,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Survey Is Active'), 'description' => ts('Is this survey enabled or disabled/cancelled?'), + 'where' => 'civicrm_survey.is_active', 'default' => '1', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', @@ -349,6 +353,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Default Survey'), 'description' => ts('Is this default survey?'), + 'where' => 'civicrm_survey.is_default', 'default' => '0', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', @@ -360,6 +365,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Survey Created By'), 'description' => ts('FK to civicrm_contact, who created this Survey.'), + 'where' => 'civicrm_survey.created_id', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -371,6 +377,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Campaign Created Date'), 'description' => ts('Date and time that Survey was created.'), + 'where' => 'civicrm_survey.created_date', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -381,6 +388,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Survey Modified'), 'description' => ts('FK to civicrm_contact, who recently edited this Survey.'), + 'where' => 'civicrm_survey.last_modified_id', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -392,6 +400,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Survey Modified On'), 'description' => ts('Date and time that Survey was edited last time.'), + 'where' => 'civicrm_survey.last_modified_date', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -402,6 +411,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Survey Result'), 'description' => ts('Used to store option group id.'), + 'where' => 'civicrm_survey.result_id', 'default' => 'NULL', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', @@ -413,6 +423,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('No Email Verification'), 'description' => ts('Bypass the email verification.'), + 'where' => 'civicrm_survey.bypass_confirm', 'default' => '0', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', @@ -426,6 +437,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'description' => ts('Title for Thank-you page (header title tag, and display at the top of the page).'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_survey.thankyou_title', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -438,6 +450,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'description' => ts('text and html allowed. displayed above result on success page'), 'rows' => 8, 'cols' => 60, + 'where' => 'civicrm_survey.thankyou_text', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -451,6 +464,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is shared through social media'), 'description' => ts('Can people share the petition through social media?'), + 'where' => 'civicrm_survey.is_share', 'default' => '1', 'table_name' => 'civicrm_survey', 'entity' => 'Survey', diff --git a/CRM/Case/DAO/Case.php b/CRM/Case/DAO/Case.php index 2405fa06e4..2323c780c4 100644 --- a/CRM/Case/DAO/Case.php +++ b/CRM/Case/DAO/Case.php @@ -135,8 +135,6 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_case.id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_case', 'entity' => 'Case', @@ -151,8 +149,6 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_case.case_type_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_case', 'entity' => 'Case', @@ -177,8 +173,6 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_case.subject', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_case', 'entity' => 'Case', @@ -195,8 +189,6 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'description' => ts('Date on which given case starts.'), 'import' => TRUE, 'where' => 'civicrm_case.start_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_case', 'entity' => 'Case', @@ -214,8 +206,6 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'description' => ts('Date on which given case ends.'), 'import' => TRUE, 'where' => 'civicrm_case.end_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_case', 'entity' => 'Case', @@ -233,6 +223,7 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'description' => ts('Details about the meeting (agenda, notes, etc).'), 'rows' => 8, 'cols' => 60, + 'where' => 'civicrm_case.details', 'table_name' => 'civicrm_case', 'entity' => 'Case', 'bao' => 'CRM_Case_BAO_Case', @@ -249,8 +240,6 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_case.status_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_case', 'entity' => 'Case', @@ -270,8 +259,6 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'title' => ts('Case is in the Trash'), 'import' => TRUE, 'where' => 'civicrm_case.is_deleted', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_case', @@ -285,10 +272,8 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'title' => ts('Created Date'), 'description' => ts('When was the case was created.'), 'required' => FALSE, - 'export' => TRUE, 'where' => 'civicrm_case.created_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_case', 'entity' => 'Case', @@ -301,10 +286,8 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'title' => ts('Modified Date'), 'description' => ts('When was the case (or closely related entity) was created or modified or deleted.'), 'required' => FALSE, - 'export' => TRUE, 'where' => 'civicrm_case.modified_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'table_name' => 'civicrm_case', 'entity' => 'Case', diff --git a/CRM/Case/DAO/CaseActivity.php b/CRM/Case/DAO/CaseActivity.php index f941d5cdd2..e6a9999b40 100644 --- a/CRM/Case/DAO/CaseActivity.php +++ b/CRM/Case/DAO/CaseActivity.php @@ -87,6 +87,7 @@ class CRM_Case_DAO_CaseActivity extends CRM_Core_DAO { 'title' => ts('Case Activity ID'), 'description' => ts('Unique case-activity association id'), 'required' => TRUE, + 'where' => 'civicrm_case_activity.id', 'table_name' => 'civicrm_case_activity', 'entity' => 'CaseActivity', 'bao' => 'CRM_Case_DAO_CaseActivity', @@ -98,6 +99,7 @@ class CRM_Case_DAO_CaseActivity extends CRM_Core_DAO { 'title' => ts('Case'), 'description' => ts('Case ID of case-activity association.'), 'required' => TRUE, + 'where' => 'civicrm_case_activity.case_id', 'table_name' => 'civicrm_case_activity', 'entity' => 'CaseActivity', 'bao' => 'CRM_Case_DAO_CaseActivity', @@ -110,6 +112,7 @@ class CRM_Case_DAO_CaseActivity extends CRM_Core_DAO { 'title' => ts('Activity ID'), 'description' => ts('Activity ID of case-activity association.'), 'required' => TRUE, + 'where' => 'civicrm_case_activity.activity_id', 'table_name' => 'civicrm_case_activity', 'entity' => 'CaseActivity', 'bao' => 'CRM_Case_DAO_CaseActivity', diff --git a/CRM/Case/DAO/CaseContact.php b/CRM/Case/DAO/CaseContact.php index 641b5e5ae5..40b3e158cf 100644 --- a/CRM/Case/DAO/CaseContact.php +++ b/CRM/Case/DAO/CaseContact.php @@ -87,6 +87,7 @@ class CRM_Case_DAO_CaseContact extends CRM_Core_DAO { 'title' => ts('Case Contact ID'), 'description' => ts('Unique case-contact association id'), 'required' => TRUE, + 'where' => 'civicrm_case_contact.id', 'table_name' => 'civicrm_case_contact', 'entity' => 'CaseContact', 'bao' => 'CRM_Case_BAO_CaseContact', @@ -98,6 +99,7 @@ class CRM_Case_DAO_CaseContact extends CRM_Core_DAO { 'title' => ts('Case'), 'description' => ts('Case ID of case-contact association.'), 'required' => TRUE, + 'where' => 'civicrm_case_contact.case_id', 'table_name' => 'civicrm_case_contact', 'entity' => 'CaseContact', 'bao' => 'CRM_Case_BAO_CaseContact', @@ -110,6 +112,7 @@ class CRM_Case_DAO_CaseContact extends CRM_Core_DAO { 'title' => ts('Contact ID'), 'description' => ts('Contact ID of contact record given case belongs to.'), 'required' => TRUE, + 'where' => 'civicrm_case_contact.contact_id', 'table_name' => 'civicrm_case_contact', 'entity' => 'CaseContact', 'bao' => 'CRM_Case_BAO_CaseContact', diff --git a/CRM/Case/DAO/CaseType.php b/CRM/Case/DAO/CaseType.php index f187f9d650..3a0b59404e 100644 --- a/CRM/Case/DAO/CaseType.php +++ b/CRM/Case/DAO/CaseType.php @@ -106,6 +106,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO { 'title' => ts('Case Type ID'), 'description' => ts('Autoincremented type id'), 'required' => TRUE, + 'where' => 'civicrm_case_type.id', 'table_name' => 'civicrm_case_type', 'entity' => 'CaseType', 'bao' => 'CRM_Case_BAO_CaseType', @@ -119,6 +120,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_case_type.name', 'table_name' => 'civicrm_case_type', 'entity' => 'CaseType', 'bao' => 'CRM_Case_BAO_CaseType', @@ -132,6 +134,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_case_type.title', 'table_name' => 'civicrm_case_type', 'entity' => 'CaseType', 'bao' => 'CRM_Case_BAO_CaseType', @@ -144,6 +147,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO { 'description' => ts('Description of the Case Type'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_case_type.description', 'table_name' => 'civicrm_case_type', 'entity' => 'CaseType', 'bao' => 'CRM_Case_BAO_CaseType', @@ -154,6 +158,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Case Type Is Active'), 'description' => ts('Is this entry active?'), + 'where' => 'civicrm_case_type.is_active', 'table_name' => 'civicrm_case_type', 'entity' => 'CaseType', 'bao' => 'CRM_Case_BAO_CaseType', @@ -164,6 +169,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Case Type Is Reserved'), 'description' => ts('Is this case type a predefined system type?'), + 'where' => 'civicrm_case_type.is_reserved', 'table_name' => 'civicrm_case_type', 'entity' => 'CaseType', 'bao' => 'CRM_Case_BAO_CaseType', @@ -175,6 +181,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO { 'title' => ts('Order'), 'description' => ts('Ordering of the case types'), 'required' => TRUE, + 'where' => 'civicrm_case_type.weight', 'default' => '1', 'table_name' => 'civicrm_case_type', 'entity' => 'CaseType', @@ -186,6 +193,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BLOB, 'title' => ts('Case Type Definition'), 'description' => ts('xml definition of case type'), + 'where' => 'civicrm_case_type.definition', 'table_name' => 'civicrm_case_type', 'entity' => 'CaseType', 'bao' => 'CRM_Case_BAO_CaseType', diff --git a/CRM/Contact/DAO/ACLContactCache.php b/CRM/Contact/DAO/ACLContactCache.php index b1c08f0f3f..456ca86348 100644 --- a/CRM/Contact/DAO/ACLContactCache.php +++ b/CRM/Contact/DAO/ACLContactCache.php @@ -93,6 +93,7 @@ class CRM_Contact_DAO_ACLContactCache extends CRM_Core_DAO { 'title' => ts('ACL Contact Cache ID'), 'description' => ts('primary key'), 'required' => TRUE, + 'where' => 'civicrm_acl_contact_cache.id', 'table_name' => 'civicrm_acl_contact_cache', 'entity' => 'ACLContactCache', 'bao' => 'CRM_Contact_DAO_ACLContactCache', @@ -103,6 +104,7 @@ class CRM_Contact_DAO_ACLContactCache extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contact ID'), 'description' => ts('FK to civicrm_contact (could be null for anon user)'), + 'where' => 'civicrm_acl_contact_cache.user_id', 'table_name' => 'civicrm_acl_contact_cache', 'entity' => 'ACLContactCache', 'bao' => 'CRM_Contact_DAO_ACLContactCache', @@ -114,6 +116,7 @@ class CRM_Contact_DAO_ACLContactCache extends CRM_Core_DAO { 'title' => ts('Contact ID'), 'description' => ts('FK to civicrm_contact'), 'required' => TRUE, + 'where' => 'civicrm_acl_contact_cache.contact_id', 'table_name' => 'civicrm_acl_contact_cache', 'entity' => 'ACLContactCache', 'bao' => 'CRM_Contact_DAO_ACLContactCache', @@ -128,6 +131,7 @@ class CRM_Contact_DAO_ACLContactCache extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_acl_contact_cache.operation', 'table_name' => 'civicrm_acl_contact_cache', 'entity' => 'ACLContactCache', 'bao' => 'CRM_Contact_DAO_ACLContactCache', diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php index c5833d27b8..736dffa2f7 100644 --- a/CRM/Contact/DAO/Contact.php +++ b/CRM/Contact/DAO/Contact.php @@ -419,7 +419,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.id', 'headerPattern' => '/internal|contact?|id$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -433,10 +432,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'description' => ts('Type of Contact.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, - 'export' => TRUE, 'where' => 'civicrm_contact.contact_type', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -461,7 +458,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.contact_sub_type', 'headerPattern' => '/C(ontact )?(subtype|sub-type|sub type)/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -576,8 +572,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_contact.is_opt_out', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_contact', @@ -636,10 +630,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'description' => ts('Name used for sorting different contact types'), 'maxlength' => 128, 'size' => 30, - 'export' => TRUE, 'where' => 'civicrm_contact.sort_name', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -655,10 +647,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'description' => ts('Formatted name representing preferred format for display/print/other output.'), 'maxlength' => 128, 'size' => 30, - 'export' => TRUE, 'where' => 'civicrm_contact.display_name', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -697,7 +687,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.legal_name', 'headerPattern' => '/^legal|(l(egal\s)?name)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -714,8 +703,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'description' => ts('optional URL for preferred image (photo, logo, etc.) to display for this contact.'), 'import' => TRUE, 'where' => 'civicrm_contact.image_URL', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -760,7 +747,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.preferred_language', 'headerPattern' => '/^lang/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -785,7 +771,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.preferred_mail_format', 'headerPattern' => '/^p(ref\w*\s)?m(ail\s)?f(orm\w*)$/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'Both', 'table_name' => 'civicrm_contact', @@ -806,10 +791,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'description' => ts('Key for validating requests related to this contact.'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, - 'export' => TRUE, 'where' => 'civicrm_contact.hash', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -822,6 +805,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'description' => ts('API Key for validating requests related to this contact.'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_contact.api_key', 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -837,7 +821,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.source', 'headerPattern' => '/(C(ontact\s)?Source)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -961,7 +944,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.formal_title', 'headerPattern' => '/^title/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -976,10 +958,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Communication Style'), 'description' => ts('Communication style (e.g. formal vs. familiar) to use with this contact. FK to communication styles in civicrm_option_value.'), - 'export' => TRUE, 'where' => 'civicrm_contact.communication_style_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -997,10 +977,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Email Greeting ID'), 'description' => ts('FK to civicrm_option_value.id, that has to be valid registered Email Greeting.'), - 'export' => TRUE, 'where' => 'civicrm_contact.email_greeting_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -1019,8 +997,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_contact.email_greeting_custom', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -1037,6 +1013,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'description' => ts('Cache Email Greeting.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contact.email_greeting_display', 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -1050,10 +1027,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Postal Greeting ID'), 'description' => ts('FK to civicrm_option_value.id, that has to be valid registered Postal Greeting.'), - 'export' => TRUE, 'where' => 'civicrm_contact.postal_greeting_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -1075,8 +1050,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_contact.postal_greeting_custom', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -1093,6 +1066,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'description' => ts('Cache Postal greeting.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contact.postal_greeting_display', 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -1106,10 +1080,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Addressee ID'), 'description' => ts('FK to civicrm_option_value.id, that has to be valid registered Addressee.'), - 'export' => TRUE, 'where' => 'civicrm_contact.addressee_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -1128,8 +1100,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_contact.addressee_custom', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -1146,6 +1116,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'description' => ts('Cache Addressee.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contact.addressee_display', 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -1182,7 +1153,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.gender_id', 'headerPattern' => '/^gender$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -1222,7 +1192,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.is_deceased', 'headerPattern' => '/i(s\s)?d(eceased)$/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_contact', @@ -1241,7 +1210,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.deceased_date', 'headerPattern' => '/^deceased|(d(eceased\s)?date)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -1277,6 +1245,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Household Primary Contact ID'), 'description' => ts('Optional FK to Primary Contact for this household.'), + 'where' => 'civicrm_contact.primary_contact_id', 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -1316,7 +1285,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contact.sic_code', 'headerPattern' => '/^sic|(s(ic\s)?code)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -1352,10 +1320,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Current Employer'), 'description' => ts('OPTIONAL FK to civicrm_contact record.'), - 'export' => TRUE, 'where' => 'civicrm_contact.employer_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', @@ -1370,10 +1336,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Contact is in Trash'), 'required' => TRUE, - 'export' => TRUE, 'where' => 'civicrm_contact.is_deleted', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -1389,10 +1353,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'title' => ts('Created Date'), 'description' => ts('When was the contact was created.'), 'required' => FALSE, - 'export' => TRUE, 'where' => 'civicrm_contact.created_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_contact', 'entity' => 'Contact', @@ -1405,10 +1367,8 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'title' => ts('Modified Date'), 'description' => ts('When was the contact (or closely related entity) was created or modified or deleted.'), 'required' => FALSE, - 'export' => TRUE, 'where' => 'civicrm_contact.modified_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'table_name' => 'civicrm_contact', 'entity' => 'Contact', diff --git a/CRM/Contact/DAO/ContactType.php b/CRM/Contact/DAO/ContactType.php index db032d503f..f76bbaab4c 100644 --- a/CRM/Contact/DAO/ContactType.php +++ b/CRM/Contact/DAO/ContactType.php @@ -121,6 +121,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO { 'title' => ts('Contact Type ID'), 'description' => ts('Contact Type ID'), 'required' => TRUE, + 'where' => 'civicrm_contact_type.id', 'table_name' => 'civicrm_contact_type', 'entity' => 'ContactType', 'bao' => 'CRM_Contact_BAO_ContactType', @@ -133,6 +134,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO { 'description' => ts('Internal name of Contact Type (or Subtype).'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_contact_type.name', 'table_name' => 'civicrm_contact_type', 'entity' => 'ContactType', 'bao' => 'CRM_Contact_BAO_ContactType', @@ -145,6 +147,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO { 'description' => ts('localized Name of Contact Type.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_contact_type.label', 'table_name' => 'civicrm_contact_type', 'entity' => 'ContactType', 'bao' => 'CRM_Contact_BAO_ContactType', @@ -157,6 +160,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO { 'description' => ts('localized Optional verbose description of the type.'), 'rows' => 2, 'cols' => 60, + 'where' => 'civicrm_contact_type.description', 'table_name' => 'civicrm_contact_type', 'entity' => 'ContactType', 'bao' => 'CRM_Contact_BAO_ContactType', @@ -172,6 +176,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO { 'description' => ts('URL of image if any.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contact_type.image_URL', 'table_name' => 'civicrm_contact_type', 'entity' => 'ContactType', 'bao' => 'CRM_Contact_BAO_ContactType', @@ -182,6 +187,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contact Type Parent'), 'description' => ts('Optional FK to parent contact type.'), + 'where' => 'civicrm_contact_type.parent_id', 'table_name' => 'civicrm_contact_type', 'entity' => 'ContactType', 'bao' => 'CRM_Contact_BAO_ContactType', @@ -199,6 +205,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Contact Type Is Active?'), 'description' => ts('Is this entry active?'), + 'where' => 'civicrm_contact_type.is_active', 'table_name' => 'civicrm_contact_type', 'entity' => 'ContactType', 'bao' => 'CRM_Contact_BAO_ContactType', @@ -209,6 +216,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Contact Type is Reserved?'), 'description' => ts('Is this contact type a predefined system type'), + 'where' => 'civicrm_contact_type.is_reserved', 'table_name' => 'civicrm_contact_type', 'entity' => 'ContactType', 'bao' => 'CRM_Contact_BAO_ContactType', diff --git a/CRM/Contact/DAO/DashboardContact.php b/CRM/Contact/DAO/DashboardContact.php index 8b354a2bb3..4585ec169a 100644 --- a/CRM/Contact/DAO/DashboardContact.php +++ b/CRM/Contact/DAO/DashboardContact.php @@ -105,6 +105,7 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Dashboard Contact ID'), 'required' => TRUE, + 'where' => 'civicrm_dashboard_contact.id', 'table_name' => 'civicrm_dashboard_contact', 'entity' => 'DashboardContact', 'bao' => 'CRM_Contact_BAO_DashboardContact', @@ -116,6 +117,7 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO { 'title' => ts('Dashboard'), 'description' => ts('Dashboard ID'), 'required' => TRUE, + 'where' => 'civicrm_dashboard_contact.dashboard_id', 'table_name' => 'civicrm_dashboard_contact', 'entity' => 'DashboardContact', 'bao' => 'CRM_Contact_BAO_DashboardContact', @@ -128,6 +130,7 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO { 'title' => ts('Dashboard Contact'), 'description' => ts('Contact ID'), 'required' => TRUE, + 'where' => 'civicrm_dashboard_contact.contact_id', 'table_name' => 'civicrm_dashboard_contact', 'entity' => 'DashboardContact', 'bao' => 'CRM_Contact_BAO_DashboardContact', @@ -139,6 +142,7 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Column No'), 'description' => ts('column no for this widget'), + 'where' => 'civicrm_dashboard_contact.column_no', 'default' => '0', 'table_name' => 'civicrm_dashboard_contact', 'entity' => 'DashboardContact', @@ -150,6 +154,7 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Dashlet is Active?'), 'description' => ts('Is this widget active?'), + 'where' => 'civicrm_dashboard_contact.is_active', 'default' => '0', 'table_name' => 'civicrm_dashboard_contact', 'entity' => 'DashboardContact', @@ -161,6 +166,7 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Order'), 'description' => ts('Ordering of the widgets.'), + 'where' => 'civicrm_dashboard_contact.weight', 'default' => '0', 'table_name' => 'civicrm_dashboard_contact', 'entity' => 'DashboardContact', diff --git a/CRM/Contact/DAO/Group.php b/CRM/Contact/DAO/Group.php index 1213b90fc6..1174320105 100644 --- a/CRM/Contact/DAO/Group.php +++ b/CRM/Contact/DAO/Group.php @@ -205,6 +205,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'title' => ts('Group ID'), 'description' => ts('Group ID'), 'required' => TRUE, + 'where' => 'civicrm_group.id', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -217,6 +218,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'description' => ts('Internal name of Group.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_group.name', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -229,6 +231,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'description' => ts('Name of Group.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_group.title', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -241,6 +244,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'description' => ts('Optional verbose description of the group.'), 'rows' => 2, 'cols' => 60, + 'where' => 'civicrm_group.description', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -256,6 +260,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'description' => ts('Module or process which created this group.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_group.source', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -266,6 +271,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Saved Search ID'), 'description' => ts('FK to saved search table.'), + 'where' => 'civicrm_group.saved_search_id', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -277,6 +283,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Group Enabled'), 'description' => ts('Is this entry active?'), + 'where' => 'civicrm_group.is_active', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -289,6 +296,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'description' => ts('In what context(s) is this field visible.'), 'maxlength' => 24, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_group.visibility', 'default' => 'User and User Admin Only', 'table_name' => 'civicrm_group', 'entity' => 'Group', @@ -306,6 +314,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Group Where Clause'), 'description' => ts('the sql where clause if a saved search acl'), + 'where' => 'civicrm_group.where_clause', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -316,6 +325,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Tables For Select Clause'), 'description' => ts('the tables to be included in a select data'), + 'where' => 'civicrm_group.select_tables', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -327,6 +337,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Tables For Where Clause'), 'description' => ts('the tables to be included in the count statement'), + 'where' => 'civicrm_group.where_tables', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -340,6 +351,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'description' => ts('FK to group type'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_group.group_type', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -356,6 +368,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'title' => ts('Group Cache Date'), 'description' => ts('Date when we created the cache for a smart group'), 'required' => FALSE, + 'where' => 'civicrm_group.cache_date', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -367,6 +380,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'title' => ts('Next Group Refresh Time'), 'description' => ts('Date and time when we need to refresh the cache next.'), 'required' => FALSE, + 'where' => 'civicrm_group.refresh_date', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -377,6 +391,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Group Parents'), 'description' => ts('IDs of the parent(s)'), + 'where' => 'civicrm_group.parents', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -391,6 +406,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Group Children'), 'description' => ts('IDs of the child(ren)'), + 'where' => 'civicrm_group.children', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -401,6 +417,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Group is Hidden'), 'description' => ts('Is this group hidden?'), + 'where' => 'civicrm_group.is_hidden', 'default' => '0', 'table_name' => 'civicrm_group', 'entity' => 'Group', @@ -411,6 +428,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'name' => 'is_reserved', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Group is Reserved'), + 'where' => 'civicrm_group.is_reserved', 'default' => '0', 'table_name' => 'civicrm_group', 'entity' => 'Group', @@ -422,6 +440,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Group Created By'), 'description' => ts('FK to contact table.'), + 'where' => 'civicrm_group.created_id', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -433,6 +452,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Group Modified By'), 'description' => ts('FK to contact table.'), + 'where' => 'civicrm_group.modified_id', 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', diff --git a/CRM/Contact/DAO/GroupContact.php b/CRM/Contact/DAO/GroupContact.php index 8a259670c6..8980f8c8bf 100644 --- a/CRM/Contact/DAO/GroupContact.php +++ b/CRM/Contact/DAO/GroupContact.php @@ -110,6 +110,7 @@ class CRM_Contact_DAO_GroupContact extends CRM_Core_DAO { 'title' => ts('Group Contact ID'), 'description' => ts('primary key'), 'required' => TRUE, + 'where' => 'civicrm_group_contact.id', 'table_name' => 'civicrm_group_contact', 'entity' => 'GroupContact', 'bao' => 'CRM_Contact_BAO_GroupContact', @@ -121,6 +122,7 @@ class CRM_Contact_DAO_GroupContact extends CRM_Core_DAO { 'title' => ts('Group ID'), 'description' => ts('FK to civicrm_group'), 'required' => TRUE, + 'where' => 'civicrm_group_contact.group_id', 'table_name' => 'civicrm_group_contact', 'entity' => 'GroupContact', 'bao' => 'CRM_Contact_BAO_GroupContact', @@ -141,6 +143,7 @@ class CRM_Contact_DAO_GroupContact extends CRM_Core_DAO { 'title' => ts('Contact ID'), 'description' => ts('FK to civicrm_contact'), 'required' => TRUE, + 'where' => 'civicrm_group_contact.contact_id', 'table_name' => 'civicrm_group_contact', 'entity' => 'GroupContact', 'bao' => 'CRM_Contact_BAO_GroupContact', @@ -154,6 +157,7 @@ class CRM_Contact_DAO_GroupContact extends CRM_Core_DAO { 'description' => ts('status of contact relative to membership in group'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_group_contact.status', 'table_name' => 'civicrm_group_contact', 'entity' => 'GroupContact', 'bao' => 'CRM_Contact_BAO_GroupContact', @@ -170,6 +174,7 @@ class CRM_Contact_DAO_GroupContact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Group Contact Location'), 'description' => ts('Optional location to associate with this membership'), + 'where' => 'civicrm_group_contact.location_id', 'table_name' => 'civicrm_group_contact', 'entity' => 'GroupContact', 'bao' => 'CRM_Contact_BAO_GroupContact', @@ -181,6 +186,7 @@ class CRM_Contact_DAO_GroupContact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Group Contact Email'), 'description' => ts('Optional email to associate with this membership'), + 'where' => 'civicrm_group_contact.email_id', 'table_name' => 'civicrm_group_contact', 'entity' => 'GroupContact', 'bao' => 'CRM_Contact_BAO_GroupContact', diff --git a/CRM/Contact/DAO/GroupContactCache.php b/CRM/Contact/DAO/GroupContactCache.php index 7e97bd7b86..0370dcc98c 100644 --- a/CRM/Contact/DAO/GroupContactCache.php +++ b/CRM/Contact/DAO/GroupContactCache.php @@ -87,6 +87,7 @@ class CRM_Contact_DAO_GroupContactCache extends CRM_Core_DAO { 'title' => ts('Group Contact Cache ID'), 'description' => ts('primary key'), 'required' => TRUE, + 'where' => 'civicrm_group_contact_cache.id', 'table_name' => 'civicrm_group_contact_cache', 'entity' => 'GroupContactCache', 'bao' => 'CRM_Contact_BAO_GroupContactCache', @@ -98,6 +99,7 @@ class CRM_Contact_DAO_GroupContactCache extends CRM_Core_DAO { 'title' => ts('Group'), 'description' => ts('FK to civicrm_group'), 'required' => TRUE, + 'where' => 'civicrm_group_contact_cache.group_id', 'table_name' => 'civicrm_group_contact_cache', 'entity' => 'GroupContactCache', 'bao' => 'CRM_Contact_BAO_GroupContactCache', @@ -118,6 +120,7 @@ class CRM_Contact_DAO_GroupContactCache extends CRM_Core_DAO { 'title' => ts('Contact ID'), 'description' => ts('FK to civicrm_contact'), 'required' => TRUE, + 'where' => 'civicrm_group_contact_cache.contact_id', 'table_name' => 'civicrm_group_contact_cache', 'entity' => 'GroupContactCache', 'bao' => 'CRM_Contact_BAO_GroupContactCache', diff --git a/CRM/Contact/DAO/GroupNesting.php b/CRM/Contact/DAO/GroupNesting.php index d7a59df693..e2d83582c8 100644 --- a/CRM/Contact/DAO/GroupNesting.php +++ b/CRM/Contact/DAO/GroupNesting.php @@ -87,6 +87,7 @@ class CRM_Contact_DAO_GroupNesting extends CRM_Core_DAO { 'title' => ts('Group Nesting ID'), 'description' => ts('Relationship ID'), 'required' => TRUE, + 'where' => 'civicrm_group_nesting.id', 'table_name' => 'civicrm_group_nesting', 'entity' => 'GroupNesting', 'bao' => 'CRM_Contact_BAO_GroupNesting', @@ -98,6 +99,7 @@ class CRM_Contact_DAO_GroupNesting extends CRM_Core_DAO { 'title' => ts('Child Group'), 'description' => ts('ID of the child group'), 'required' => TRUE, + 'where' => 'civicrm_group_nesting.child_group_id', 'table_name' => 'civicrm_group_nesting', 'entity' => 'GroupNesting', 'bao' => 'CRM_Contact_BAO_GroupNesting', @@ -110,6 +112,7 @@ class CRM_Contact_DAO_GroupNesting extends CRM_Core_DAO { 'title' => ts('Parent Group'), 'description' => ts('ID of the parent group'), 'required' => TRUE, + 'where' => 'civicrm_group_nesting.parent_group_id', 'table_name' => 'civicrm_group_nesting', 'entity' => 'GroupNesting', 'bao' => 'CRM_Contact_BAO_GroupNesting', diff --git a/CRM/Contact/DAO/GroupOrganization.php b/CRM/Contact/DAO/GroupOrganization.php index fd90ae2bfb..b16db55d39 100644 --- a/CRM/Contact/DAO/GroupOrganization.php +++ b/CRM/Contact/DAO/GroupOrganization.php @@ -87,6 +87,7 @@ class CRM_Contact_DAO_GroupOrganization extends CRM_Core_DAO { 'title' => ts('Group Organization ID'), 'description' => ts('Relationship ID'), 'required' => TRUE, + 'where' => 'civicrm_group_organization.id', 'table_name' => 'civicrm_group_organization', 'entity' => 'GroupOrganization', 'bao' => 'CRM_Contact_BAO_GroupOrganization', @@ -98,6 +99,7 @@ class CRM_Contact_DAO_GroupOrganization extends CRM_Core_DAO { 'title' => ts('Group'), 'description' => ts('ID of the group'), 'required' => TRUE, + 'where' => 'civicrm_group_organization.group_id', 'table_name' => 'civicrm_group_organization', 'entity' => 'GroupOrganization', 'bao' => 'CRM_Contact_BAO_GroupOrganization', @@ -118,6 +120,7 @@ class CRM_Contact_DAO_GroupOrganization extends CRM_Core_DAO { 'title' => ts('Organization'), 'description' => ts('ID of the Organization Contact'), 'required' => TRUE, + 'where' => 'civicrm_group_organization.organization_id', 'table_name' => 'civicrm_group_organization', 'entity' => 'GroupOrganization', 'bao' => 'CRM_Contact_BAO_GroupOrganization', diff --git a/CRM/Contact/DAO/Relationship.php b/CRM/Contact/DAO/Relationship.php index c40f421831..f6dcce482c 100644 --- a/CRM/Contact/DAO/Relationship.php +++ b/CRM/Contact/DAO/Relationship.php @@ -145,6 +145,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'title' => ts('Relationship ID'), 'description' => ts('Relationship ID'), 'required' => TRUE, + 'where' => 'civicrm_relationship.id', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', 'bao' => 'CRM_Contact_BAO_Relationship', @@ -156,6 +157,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'title' => ts('Contact A'), 'description' => ts('id of the first contact'), 'required' => TRUE, + 'where' => 'civicrm_relationship.contact_id_a', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', 'bao' => 'CRM_Contact_BAO_Relationship', @@ -168,6 +170,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'title' => ts('Contact B'), 'description' => ts('id of the second contact'), 'required' => TRUE, + 'where' => 'civicrm_relationship.contact_id_b', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', 'bao' => 'CRM_Contact_BAO_Relationship', @@ -183,6 +186,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'title' => ts('Relationship Type'), 'description' => ts('id of the relationship'), 'required' => TRUE, + 'where' => 'civicrm_relationship.relationship_type_id', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', 'bao' => 'CRM_Contact_BAO_Relationship', @@ -197,6 +201,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Relationship Start Date'), 'description' => ts('date when the relationship started'), + 'where' => 'civicrm_relationship.start_date', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', 'bao' => 'CRM_Contact_BAO_Relationship', @@ -211,6 +216,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Relationship End Date'), 'description' => ts('date when the relationship ended'), + 'where' => 'civicrm_relationship.end_date', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', 'bao' => 'CRM_Contact_BAO_Relationship', @@ -225,6 +231,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Relationship Is Active'), 'description' => ts('is the relationship active ?'), + 'where' => 'civicrm_relationship.is_active', 'default' => '1', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', @@ -241,6 +248,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'description' => ts('Optional verbose description for the relationship.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_relationship.description', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', 'bao' => 'CRM_Contact_BAO_Relationship', @@ -255,6 +263,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'title' => ts('Contact A has Permission Over Contact B'), 'description' => ts('Permission that Contact A has to view/update Contact B'), 'required' => TRUE, + 'where' => 'civicrm_relationship.is_permission_a_b', 'default' => '0', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', @@ -273,6 +282,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'title' => ts('Contact B has Permission Over Contact A'), 'description' => ts('Permission that Contact B has to view/update Contact A'), 'required' => TRUE, + 'where' => 'civicrm_relationship.is_permission_b_a', 'default' => '0', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', @@ -290,6 +300,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Relationship Case'), 'description' => ts('FK to civicrm_case'), + 'where' => 'civicrm_relationship.case_id', 'default' => 'NULL', 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', diff --git a/CRM/Contact/DAO/RelationshipType.php b/CRM/Contact/DAO/RelationshipType.php index 11bb3d1ba0..7a3a77e310 100644 --- a/CRM/Contact/DAO/RelationshipType.php +++ b/CRM/Contact/DAO/RelationshipType.php @@ -134,6 +134,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'title' => ts('Relationship Type ID'), 'description' => ts('Primary key'), 'required' => TRUE, + 'where' => 'civicrm_relationship_type.id', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -146,6 +147,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'description' => ts('name for relationship of contact_a to contact_b.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_relationship_type.name_a_b', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -158,6 +160,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'description' => ts('label for relationship of contact_a to contact_b.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_relationship_type.label_a_b', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -173,6 +176,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'description' => ts('Optional name for relationship of contact_b to contact_a.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_relationship_type.name_b_a', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -185,6 +189,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'description' => ts('Optional label for relationship of contact_b to contact_a.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_relationship_type.label_b_a', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -200,6 +205,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'description' => ts('Optional verbose description of the relationship type.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_relationship_type.description', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -215,6 +221,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'description' => ts('If defined, contact_a in a relationship of this type must be a specific contact_type.'), 'maxlength' => 12, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_relationship_type.contact_type_a', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -236,6 +243,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'description' => ts('If defined, contact_b in a relationship of this type must be a specific contact_type.'), 'maxlength' => 12, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_relationship_type.contact_type_b', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -258,6 +266,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { '), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_relationship_type.contact_sub_type_a', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -280,6 +289,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { '), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_relationship_type.contact_sub_type_b', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -299,6 +309,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Relationship Type is Reserved'), 'description' => ts('Is this relationship type a predefined system type (can not be changed or de-activated)?'), + 'where' => 'civicrm_relationship_type.is_reserved', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', 'bao' => 'CRM_Contact_BAO_RelationshipType', @@ -313,6 +324,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO { 'title' => ts('Relationship Type is Active'), 'description' => ts('Is this relationship type currently active (i.e. can be used when creating or editing relationships)? '), + 'where' => 'civicrm_relationship_type.is_active', 'default' => '1', 'table_name' => 'civicrm_relationship_type', 'entity' => 'RelationshipType', diff --git a/CRM/Contact/DAO/SavedSearch.php b/CRM/Contact/DAO/SavedSearch.php index e1c75e9bac..b7fd62c31a 100644 --- a/CRM/Contact/DAO/SavedSearch.php +++ b/CRM/Contact/DAO/SavedSearch.php @@ -114,6 +114,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO { 'title' => ts('Saved Search ID'), 'description' => ts('Saved Search ID'), 'required' => TRUE, + 'where' => 'civicrm_saved_search.id', 'table_name' => 'civicrm_saved_search', 'entity' => 'SavedSearch', 'bao' => 'CRM_Contact_BAO_SavedSearch', @@ -126,8 +127,6 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO { 'description' => ts('Submitted form values for this search'), 'import' => TRUE, 'where' => 'civicrm_saved_search.form_values', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_saved_search', 'entity' => 'SavedSearch', @@ -140,6 +139,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mapping ID'), 'description' => ts('Foreign key to civicrm_mapping used for saved search-builder searches.'), + 'where' => 'civicrm_saved_search.mapping_id', 'table_name' => 'civicrm_saved_search', 'entity' => 'SavedSearch', 'bao' => 'CRM_Contact_BAO_SavedSearch', @@ -151,6 +151,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Option Value ID'), 'description' => ts('Foreign key to civicrm_option value table used for saved custom searches.'), + 'where' => 'civicrm_saved_search.search_custom_id', 'table_name' => 'civicrm_saved_search', 'entity' => 'SavedSearch', 'bao' => 'CRM_Contact_BAO_SavedSearch', @@ -161,6 +162,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Where Clause'), 'description' => ts('the sql where clause if a saved search acl'), + 'where' => 'civicrm_saved_search.where_clause', 'table_name' => 'civicrm_saved_search', 'entity' => 'SavedSearch', 'bao' => 'CRM_Contact_BAO_SavedSearch', @@ -171,6 +173,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Select Tables'), 'description' => ts('the tables to be included in a select data'), + 'where' => 'civicrm_saved_search.select_tables', 'table_name' => 'civicrm_saved_search', 'entity' => 'SavedSearch', 'bao' => 'CRM_Contact_BAO_SavedSearch', @@ -182,6 +185,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Where Tables'), 'description' => ts('the tables to be included in the count statement'), + 'where' => 'civicrm_saved_search.where_tables', 'table_name' => 'civicrm_saved_search', 'entity' => 'SavedSearch', 'bao' => 'CRM_Contact_BAO_SavedSearch', diff --git a/CRM/Contact/DAO/SubscriptionHistory.php b/CRM/Contact/DAO/SubscriptionHistory.php index 90f7ea3d8f..1df68f7f33 100644 --- a/CRM/Contact/DAO/SubscriptionHistory.php +++ b/CRM/Contact/DAO/SubscriptionHistory.php @@ -115,6 +115,7 @@ class CRM_Contact_DAO_SubscriptionHistory extends CRM_Core_DAO { 'title' => ts('Group Membership History ID'), 'description' => ts('Internal Id'), 'required' => TRUE, + 'where' => 'civicrm_subscription_history.id', 'table_name' => 'civicrm_subscription_history', 'entity' => 'SubscriptionHistory', 'bao' => 'CRM_Contact_BAO_SubscriptionHistory', @@ -126,6 +127,7 @@ class CRM_Contact_DAO_SubscriptionHistory extends CRM_Core_DAO { 'title' => ts('Contact ID'), 'description' => ts('Contact Id'), 'required' => TRUE, + 'where' => 'civicrm_subscription_history.contact_id', 'table_name' => 'civicrm_subscription_history', 'entity' => 'SubscriptionHistory', 'bao' => 'CRM_Contact_BAO_SubscriptionHistory', @@ -137,6 +139,7 @@ class CRM_Contact_DAO_SubscriptionHistory extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Group'), 'description' => ts('Group Id'), + 'where' => 'civicrm_subscription_history.group_id', 'table_name' => 'civicrm_subscription_history', 'entity' => 'SubscriptionHistory', 'bao' => 'CRM_Contact_BAO_SubscriptionHistory', @@ -157,6 +160,7 @@ class CRM_Contact_DAO_SubscriptionHistory extends CRM_Core_DAO { 'title' => ts('Group Membership Action Date'), 'description' => ts('Date of the (un)subscription'), 'required' => TRUE, + 'where' => 'civicrm_subscription_history.date', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_subscription_history', 'entity' => 'SubscriptionHistory', @@ -170,6 +174,7 @@ class CRM_Contact_DAO_SubscriptionHistory extends CRM_Core_DAO { 'description' => ts('How the (un)subscription was triggered'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_subscription_history.method', 'table_name' => 'civicrm_subscription_history', 'entity' => 'SubscriptionHistory', 'bao' => 'CRM_Contact_BAO_SubscriptionHistory', @@ -188,6 +193,7 @@ class CRM_Contact_DAO_SubscriptionHistory extends CRM_Core_DAO { 'description' => ts('The state of the contact within the group'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_subscription_history.status', 'table_name' => 'civicrm_subscription_history', 'entity' => 'SubscriptionHistory', 'bao' => 'CRM_Contact_BAO_SubscriptionHistory', @@ -203,6 +209,7 @@ class CRM_Contact_DAO_SubscriptionHistory extends CRM_Core_DAO { 'description' => ts('IP address or other tracking info'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_subscription_history.tracking', 'table_name' => 'civicrm_subscription_history', 'entity' => 'SubscriptionHistory', 'bao' => 'CRM_Contact_BAO_SubscriptionHistory', diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php index a3640ef1a4..c95672ed77 100644 --- a/CRM/Contribute/DAO/Contribution.php +++ b/CRM/Contribute/DAO/Contribution.php @@ -270,8 +270,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_contribution.id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -303,10 +301,8 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('FK to Financial Type for (total_amount - non_deductible_amount).'), - 'export' => TRUE, 'where' => 'civicrm_contribution.financial_type_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', 'bao' => 'CRM_Contribute_BAO_Contribution', @@ -328,8 +324,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'description' => ts('The Contribution Page which triggered this contribution'), 'import' => TRUE, 'where' => 'civicrm_contribution.contribution_page_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -350,10 +344,9 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Method ID'), 'description' => ts('FK to Payment Instrument'), - 'export' => TRUE, 'where' => 'civicrm_contribution.payment_instrument_id', 'headerPattern' => '/^payment|(p(ayment\s)?instrument)$/i', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', 'bao' => 'CRM_Contribute_BAO_Contribution', @@ -485,7 +478,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contribution.trxn_id', 'headerPattern' => '/tr(ansactio|x)n(.?id)?/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -505,7 +497,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contribution.invoice_id', 'headerPattern' => '/invoice(.?id)?/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -525,7 +516,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contribution.invoice_number', 'headerPattern' => '/invoice(.?number)?/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -588,7 +578,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contribution.cancel_reason', 'headerPattern' => '/(cancel.?)?reason/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -646,7 +635,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contribution.source', 'headerPattern' => '/source/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -662,8 +650,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'title' => ts('Amount Label'), 'import' => TRUE, 'where' => 'civicrm_contribution.amount_level', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -678,10 +664,8 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Recurring Contribution ID'), 'description' => ts('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.'), - 'export' => TRUE, 'where' => 'civicrm_contribution.contribution_recur_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', 'bao' => 'CRM_Contribute_BAO_Contribution', @@ -694,8 +678,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'title' => ts('Test'), 'import' => TRUE, 'where' => 'civicrm_contribution.is_test', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_contribution', @@ -712,8 +694,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'title' => ts('Is Pay Later'), 'import' => TRUE, 'where' => 'civicrm_contribution.is_pay_later', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_contribution', @@ -731,7 +711,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contribution.contribution_status_id', 'headerPattern' => '/status/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '1', 'table_name' => 'civicrm_contribution', @@ -751,10 +730,8 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contribution Address'), 'description' => ts('Conditional foreign key to civicrm_address.id. We insert an address record for each contribution when we have associated billing name and address data.'), - 'export' => TRUE, 'where' => 'civicrm_contribution.address_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', 'bao' => 'CRM_Contribute_BAO_Contribution', @@ -770,7 +747,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contribution.check_number', 'headerPattern' => '/check(.?number)?/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -787,8 +763,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'description' => ts('The campaign for which this contribution has been triggered.'), 'import' => TRUE, 'where' => 'civicrm_contribution.campaign_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', @@ -814,7 +788,6 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_contribution.creditnote_id', 'headerPattern' => '/creditnote(.?id)?/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', diff --git a/CRM/Contribute/DAO/ContributionPage.php b/CRM/Contribute/DAO/ContributionPage.php index 116c52df9d..e75fa97d99 100644 --- a/CRM/Contribute/DAO/ContributionPage.php +++ b/CRM/Contribute/DAO/ContributionPage.php @@ -382,6 +382,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'title' => ts('Contribution Page ID'), 'description' => ts('Contribution Id'), 'required' => TRUE, + 'where' => 'civicrm_contribution_page.id', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -394,6 +395,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('Contribution Page title. For top of page display'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_page.title', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -406,6 +408,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('Text and html allowed. Displayed below title.'), 'rows' => 6, 'cols' => 50, + 'where' => 'civicrm_contribution_page.intro_text', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -419,6 +422,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('default financial type assigned to contributions submitted via this page, e.g. Contribution, Campaign Contribution'), + 'where' => 'civicrm_contribution_page.financial_type_id', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -440,6 +444,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('Payment Processors configured for this contribution Page'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_page.payment_processor', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -458,6 +463,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Credit Card Only?'), 'description' => ts('if true - processing logic must reject transaction at confirmation stage if pay method != credit card'), + 'where' => 'civicrm_contribution_page.is_credit_card_only', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -469,6 +475,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Monetary'), 'description' => ts('if true - allows real-time monetary transactions otherwise non-monetary transactions'), + 'where' => 'civicrm_contribution_page.is_monetary', 'default' => '1', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -480,6 +487,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Recurring'), 'description' => ts('if true - allows recurring contributions, valid only for PayPal_Standard'), + 'where' => 'civicrm_contribution_page.is_recur', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -491,6 +499,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Confirmation Page?'), 'description' => ts('if false, the confirm page in contribution pages gets skipped'), + 'where' => 'civicrm_contribution_page.is_confirm_enabled', 'default' => '1', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -504,6 +513,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('Supported recurring frequency units.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_page.recur_frequency_unit', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -523,6 +533,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Support Recurring Intervals'), 'description' => ts('if true - supports recurring intervals'), + 'where' => 'civicrm_contribution_page.is_recur_interval', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -534,6 +545,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Recurring Installments?'), 'description' => ts('if true - asks user for recurring installments'), + 'where' => 'civicrm_contribution_page.is_recur_installments', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -545,6 +557,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Adjust Recurring Start Date'), 'description' => ts('if true - user is able to adjust payment start date'), + 'where' => 'civicrm_contribution_page.adjust_recur_start_date', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -556,6 +569,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Pay Later'), 'description' => ts('if true - allows the user to send payment directly to the org later'), + 'where' => 'civicrm_contribution_page.is_pay_later', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -567,6 +581,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Pay Later Text'), 'description' => ts('The text displayed to the user in the main form'), + 'where' => 'civicrm_contribution_page.pay_later_text', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -577,6 +592,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Pay Later Receipt'), 'description' => ts('The receipt sent to the user instead of the normal receipt text'), + 'where' => 'civicrm_contribution_page.pay_later_receipt', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -587,6 +603,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Allow Partial Payment'), 'description' => ts('is partial payment enabled for this online contribution page'), + 'where' => 'civicrm_contribution_page.is_partial_payment', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -600,6 +617,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('Initial amount label for partial payment'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_page.initial_amount_label', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -610,6 +628,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Initial Amount Help Text'), 'description' => ts('Initial amount help text for partial payment'), + 'where' => 'civicrm_contribution_page.initial_amount_help_text', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -624,6 +643,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_contribution_page.min_initial_amount', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -634,6 +654,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Allow Other Amounts'), 'description' => ts('if true, page will include an input text field where user can enter their own amount'), + 'where' => 'civicrm_contribution_page.is_allow_other_amount', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -645,6 +666,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Default Amount'), 'description' => ts('FK to civicrm_option_value.'), + 'where' => 'civicrm_contribution_page.default_amount_id', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -659,6 +681,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_contribution_page.min_amount', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -673,6 +696,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_contribution_page.max_amount', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -687,6 +711,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_contribution_page.goal_amount', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -699,6 +724,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('Title for Thank-you page (header title tag, and display at the top of the page).'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_page.thankyou_title', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -711,6 +737,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('text and html allowed. displayed above result on success page'), 'rows' => 8, 'cols' => 60, + 'where' => 'civicrm_contribution_page.thankyou_text', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -726,6 +753,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('Text and html allowed. displayed at the bottom of the success page. Common usage is to include link(s) to other pages such as tell-a-friend, etc.'), 'rows' => 8, 'cols' => 60, + 'where' => 'civicrm_contribution_page.thankyou_footer', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -739,6 +767,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Send email Receipt'), 'description' => ts('if true, receipt is automatically emailed to contact on success'), + 'where' => 'civicrm_contribution_page.is_email_receipt', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -752,6 +781,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('FROM email name used for receipts generated by contributions to this contribution page.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_page.receipt_from_name', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -764,6 +794,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('FROM email address used for receipts generated by contributions to this contribution page.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_page.receipt_from_email', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -776,6 +807,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('comma-separated list of email addresses to cc each time a receipt is sent'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_page.cc_receipt', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -788,6 +820,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('comma-separated list of email addresses to bcc each time a receipt is sent'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_page.bcc_receipt', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -800,6 +833,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('text to include above standard receipt info on receipt email. emails are text-only, so do not allow html for now'), 'rows' => 6, 'cols' => 50, + 'where' => 'civicrm_contribution_page.receipt_text', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -813,6 +847,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Page Active?'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_contribution_page.is_active', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -825,6 +860,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.'), 'rows' => 6, 'cols' => 50, + 'where' => 'civicrm_contribution_page.footer_text', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -838,6 +874,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Amount Block Active?'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_contribution_page.amount_block_is_active', 'default' => '1', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -849,6 +886,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Contribution Page Start Date'), 'description' => ts('Date and time that this page starts.'), + 'where' => 'civicrm_contribution_page.start_date', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -859,6 +897,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Contribution Page End Date'), 'description' => ts('Date and time that this page ends. May be NULL if no defined end date/time'), + 'where' => 'civicrm_contribution_page.end_date', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -869,6 +908,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contribution Page Created By'), 'description' => ts('FK to civicrm_contact, who created this contribution page'), + 'where' => 'civicrm_contribution_page.created_id', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -880,6 +920,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Contribution Page Created Date'), 'description' => ts('Date and time that contribution page was created.'), + 'where' => 'civicrm_contribution_page.created_date', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -892,6 +933,9 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'description' => ts('3 character string, value from config setting or input via user.'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_contribution_page.currency', + 'headerPattern' => '/cur(rency)?/i', + 'dataPattern' => '/^[A-Z]{3}$/i', 'default' => 'NULL', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -912,6 +956,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contribution Page Campaign ID'), 'description' => ts('The campaign for which we are collecting contributions with this page.'), + 'where' => 'civicrm_contribution_page.campaign_id', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -928,6 +973,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Contribution Page Shared?'), 'description' => ts('Can people share the contribution page through social media?'), + 'where' => 'civicrm_contribution_page.is_share', 'default' => '1', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', @@ -939,6 +985,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is billing block required'), 'description' => ts('if true - billing block is required for online contribution page'), + 'where' => 'civicrm_contribution_page.is_billing_required', 'default' => '0', 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', diff --git a/CRM/Contribute/DAO/ContributionProduct.php b/CRM/Contribute/DAO/ContributionProduct.php index 58dd6257ce..8fa970114c 100644 --- a/CRM/Contribute/DAO/ContributionProduct.php +++ b/CRM/Contribute/DAO/ContributionProduct.php @@ -125,6 +125,7 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contribution Product ID'), 'required' => TRUE, + 'where' => 'civicrm_contribution_product.id', 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', @@ -135,6 +136,7 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Product ID'), 'required' => TRUE, + 'where' => 'civicrm_contribution_product.product_id', 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', @@ -145,6 +147,7 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contribution ID'), 'required' => TRUE, + 'where' => 'civicrm_contribution_product.contribution_id', 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', @@ -158,10 +161,8 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'description' => ts('Option value selected if applicable - e.g. color, size etc.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, - 'export' => TRUE, 'where' => 'civicrm_contribution_product.product_option', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', @@ -171,10 +172,8 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'name' => 'quantity', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Quantity'), - 'export' => TRUE, 'where' => 'civicrm_contribution_product.quantity', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', @@ -185,10 +184,8 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Fulfilled Date'), 'description' => ts('Optional. Can be used to record the date this product was fulfilled or shipped.'), - 'export' => TRUE, 'where' => 'civicrm_contribution_product.fulfilled_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', @@ -203,10 +200,8 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Start date for premium'), 'description' => ts('Actual start date for a time-delimited premium (subscription, service or membership)'), - 'export' => TRUE, 'where' => 'civicrm_contribution_product.start_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', @@ -217,10 +212,8 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('End date for premium'), 'description' => ts('Actual end date for a time-delimited premium (subscription, service or membership)'), - 'export' => TRUE, 'where' => 'civicrm_contribution_product.end_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', @@ -230,6 +223,7 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'name' => 'comment', 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Premium comment'), + 'where' => 'civicrm_contribution_product.comment', 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', @@ -240,6 +234,7 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('FK to Financial Type(for membership price sets only).'), + 'where' => 'civicrm_contribution_product.financial_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php index ba78c33c9c..9eedb5c307 100644 --- a/CRM/Contribute/DAO/ContributionRecur.php +++ b/CRM/Contribute/DAO/ContributionRecur.php @@ -268,6 +268,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'title' => ts('Recurring Contribution ID'), 'description' => ts('Contribution Recur ID'), 'required' => TRUE, + 'where' => 'civicrm_contribution_recur.id', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -279,6 +280,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'title' => ts('Contact'), 'description' => ts('Foreign key to civicrm_contact.id.'), 'required' => TRUE, + 'where' => 'civicrm_contribution_recur.contact_id', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -298,6 +300,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_contribution_recur.amount', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -313,6 +316,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'description' => ts('3 character string, value from config setting or input via user.'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_contribution_recur.currency', 'default' => 'NULL', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', @@ -335,6 +339,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'description' => ts('Time units for recurrence of payment.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_contribution_recur.frequency_unit', 'default' => 'month', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', @@ -355,6 +360,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'title' => ts('Interval (number of units)'), 'description' => ts('Number of time units for recurrence of payment.'), 'required' => TRUE, + 'where' => 'civicrm_contribution_recur.frequency_interval', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -368,6 +374,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Number of Installments'), 'description' => ts('Total number of payments to be made. Set this to 0 if this is an open-ended commitment i.e. no set end date.'), + 'where' => 'civicrm_contribution_recur.installments', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -382,6 +389,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'title' => ts('Start Date'), 'description' => ts('The date the first scheduled recurring contribution occurs.'), 'required' => TRUE, + 'where' => 'civicrm_contribution_recur.start_date', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -397,6 +405,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'title' => ts('Created Date'), 'description' => ts('When this recurring contribution record was created.'), 'required' => TRUE, + 'where' => 'civicrm_contribution_recur.create_date', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -411,6 +420,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Modified Date'), 'description' => ts('Last updated date for this record. mostly the last time a payment was received'), + 'where' => 'civicrm_contribution_recur.modified_date', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -425,6 +435,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Cancel Date'), 'description' => ts('Date this recurring contribution was cancelled by contributor- if we can get access to it'), + 'where' => 'civicrm_contribution_recur.cancel_date', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -439,6 +450,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Cancellation Reason'), 'description' => ts('Free text field for a reason for cancelling'), + 'where' => 'civicrm_contribution_recur.cancel_reason', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -452,6 +464,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Recurring Contribution End Date'), 'description' => ts('Date this recurring contribution finished successfully'), + 'where' => 'civicrm_contribution_recur.end_date', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -468,6 +481,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'description' => ts('Possibly needed to store a unique identifier for this recurring payment order - if this is available from the processor??'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_recur.processor_id', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -481,6 +495,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Token ID'), 'description' => ts('Optionally used to store a link to a payment token used for this recurring contribution.'), + 'where' => 'civicrm_contribution_recur.payment_token_id', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -494,6 +509,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'description' => ts('unique transaction id. may be processor id, bank id + trans id, or account number + check number... depending on payment_method'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_recur.trxn_id', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -509,6 +525,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'description' => ts('unique invoice id, system generated or passed in'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_recur.invoice_id', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -523,8 +540,6 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'title' => ts('Status'), 'import' => TRUE, 'where' => 'civicrm_contribution_recur.contribution_status_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '1', 'table_name' => 'civicrm_contribution_recur', @@ -545,8 +560,6 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'title' => ts('Test'), 'import' => TRUE, 'where' => 'civicrm_contribution_recur.is_test', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_contribution_recur', @@ -563,6 +576,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'title' => ts('Cycle Day'), 'description' => ts('Day in the period when the payment should be charged e.g. 1st of month, 15th etc.'), 'required' => TRUE, + 'where' => 'civicrm_contribution_recur.cycle_day', 'default' => '1', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', @@ -577,6 +591,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Next Scheduled Contribution Date'), 'description' => ts('Next scheduled date'), + 'where' => 'civicrm_contribution_recur.next_sched_contribution_date', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -591,6 +606,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Number of Failures'), 'description' => ts('Number of failed charge attempts since last success. Business rule could be set to deactivate on more than x failures.'), + 'where' => 'civicrm_contribution_recur.failure_count', 'default' => '0', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', @@ -605,6 +621,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Retry Failed Attempt Date'), 'description' => ts('Date to retry failed attempt'), + 'where' => 'civicrm_contribution_recur.failure_retry_date', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -620,6 +637,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'title' => ts('Auto Renew'), 'description' => ts('Some systems allow contributor to set a number of installments - but then auto-renew the subscription or commitment if they do not cancel.'), 'required' => TRUE, + 'where' => 'civicrm_contribution_recur.auto_renew', 'default' => '0', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', @@ -634,6 +652,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Processor'), 'description' => ts('Foreign key to civicrm_payment_processor.id'), + 'where' => 'civicrm_contribution_recur.payment_processor_id', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -653,10 +672,8 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('FK to Financial Type'), - 'export' => FALSE, 'where' => 'civicrm_contribution_recur.financial_type_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => FALSE, 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -676,6 +693,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Method'), 'description' => ts('FK to Payment Instrument'), + 'where' => 'civicrm_contribution_recur.payment_instrument_id', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', @@ -695,8 +713,6 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'description' => ts('The campaign for which this contribution has been triggered.'), 'import' => TRUE, 'where' => 'civicrm_contribution_recur.campaign_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', @@ -717,6 +733,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Send email Receipt?'), 'description' => ts('if true, receipt is automatically emailed to contact on each successful payment'), + 'where' => 'civicrm_contribution_recur.is_email_receipt', 'default' => '1', 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php index ae009420f0..75f2dcd4a7 100644 --- a/CRM/Contribute/DAO/ContributionSoft.php +++ b/CRM/Contribute/DAO/ContributionSoft.php @@ -133,8 +133,6 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_contribution_soft.id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', @@ -147,6 +145,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'title' => ts('Soft Contribution - Contribution'), 'description' => ts('FK to contribution table.'), 'required' => TRUE, + 'where' => 'civicrm_contribution_soft.contribution_id', 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', 'bao' => 'CRM_Contribute_BAO_ContributionSoft', @@ -197,6 +196,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'description' => ts('3 character string, value from config setting or input via user.'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_contribution_soft.currency', 'default' => 'NULL', 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', @@ -217,6 +217,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Soft Contribution PCP'), 'description' => ts('FK to civicrm_pcp.id'), + 'where' => 'civicrm_contribution_soft.pcp_id', 'default' => 'NULL', 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', @@ -233,6 +234,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'name' => 'pcp_display_in_roll', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Soft Contribution Display on PCP'), + 'where' => 'civicrm_contribution_soft.pcp_display_in_roll', 'default' => '0', 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', @@ -245,6 +247,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'title' => ts('Soft Contribution PCP Nickname'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_soft.pcp_roll_nickname', 'default' => 'NULL', 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', @@ -257,6 +260,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'title' => ts('Soft Contribution PCP Note'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_soft.pcp_personal_note', 'default' => 'NULL', 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', @@ -271,6 +275,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Soft Credit Type'), 'description' => ts('Soft Credit Type ID.Implicit FK to civicrm_option_value where option_group = soft_credit_type.'), + 'where' => 'civicrm_contribution_soft.soft_credit_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', diff --git a/CRM/Contribute/DAO/Premium.php b/CRM/Contribute/DAO/Premium.php index 643bf1dbaf..8302aef5e5 100644 --- a/CRM/Contribute/DAO/Premium.php +++ b/CRM/Contribute/DAO/Premium.php @@ -135,6 +135,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Premium ID'), 'required' => TRUE, + 'where' => 'civicrm_premiums.id', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', 'bao' => 'CRM_Contribute_BAO_Premium', @@ -148,6 +149,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_premiums.entity_table', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', 'bao' => 'CRM_Contribute_BAO_Premium', @@ -158,6 +160,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Premium entity ID'), 'required' => TRUE, + 'where' => 'civicrm_premiums.entity_id', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', 'bao' => 'CRM_Contribute_BAO_Premium', @@ -169,6 +172,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'title' => ts('Is Premium Active?'), 'description' => ts('Is the Premiums feature enabled for this page?'), 'required' => TRUE, + 'where' => 'civicrm_premiums.premiums_active', 'default' => '0', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', @@ -182,6 +186,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'description' => ts('Title for Premiums section.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_premiums.premiums_intro_title', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', 'bao' => 'CRM_Contribute_BAO_Premium', @@ -192,6 +197,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Premium Introductory Text'), 'description' => ts('Displayed in
at top of Premiums section of page. Text and HTML allowed.'), + 'where' => 'civicrm_premiums.premiums_intro_text', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', 'bao' => 'CRM_Contribute_BAO_Premium', @@ -204,6 +210,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'description' => ts('This email address is included in receipts if it is populated and a premium has been selected.'), 'maxlength' => 100, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_premiums.premiums_contact_email', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', 'bao' => 'CRM_Contribute_BAO_Premium', @@ -216,6 +223,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'description' => ts('This phone number is included in receipts if it is populated and a premium has been selected.'), 'maxlength' => 50, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_premiums.premiums_contact_phone', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', 'bao' => 'CRM_Contribute_BAO_Premium', @@ -227,6 +235,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'title' => ts('Display Minimum Contribution?'), 'description' => ts('Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.'), 'required' => TRUE, + 'where' => 'civicrm_premiums.premiums_display_min_contribution', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', 'bao' => 'CRM_Contribute_BAO_Premium', @@ -239,6 +248,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'description' => ts('Label displayed for No Thank-you option in premiums block (e.g. No thank you)'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_premiums.premiums_nothankyou_label', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', 'bao' => 'CRM_Contribute_BAO_Premium', @@ -248,6 +258,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO { 'name' => 'premiums_nothankyou_position', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('No Thank-you Position'), + 'where' => 'civicrm_premiums.premiums_nothankyou_position', 'default' => '1', 'table_name' => 'civicrm_premiums', 'entity' => 'Premium', diff --git a/CRM/Contribute/DAO/PremiumsProduct.php b/CRM/Contribute/DAO/PremiumsProduct.php index 7f319b0669..ff19638fb7 100644 --- a/CRM/Contribute/DAO/PremiumsProduct.php +++ b/CRM/Contribute/DAO/PremiumsProduct.php @@ -100,6 +100,7 @@ class CRM_Contribute_DAO_PremiumsProduct extends CRM_Core_DAO { 'title' => ts('Premium Product ID'), 'description' => ts('Contribution ID'), 'required' => TRUE, + 'where' => 'civicrm_premiums_product.id', 'table_name' => 'civicrm_premiums_product', 'entity' => 'PremiumsProduct', 'bao' => 'CRM_Contribute_DAO_PremiumsProduct', @@ -111,6 +112,7 @@ class CRM_Contribute_DAO_PremiumsProduct extends CRM_Core_DAO { 'title' => ts('Premium'), 'description' => ts('Foreign key to premiums settings record.'), 'required' => TRUE, + 'where' => 'civicrm_premiums_product.premiums_id', 'table_name' => 'civicrm_premiums_product', 'entity' => 'PremiumsProduct', 'bao' => 'CRM_Contribute_DAO_PremiumsProduct', @@ -123,6 +125,7 @@ class CRM_Contribute_DAO_PremiumsProduct extends CRM_Core_DAO { 'title' => ts('Product'), 'description' => ts('Foreign key to each product object.'), 'required' => TRUE, + 'where' => 'civicrm_premiums_product.product_id', 'table_name' => 'civicrm_premiums_product', 'entity' => 'PremiumsProduct', 'bao' => 'CRM_Contribute_DAO_PremiumsProduct', @@ -134,6 +137,7 @@ class CRM_Contribute_DAO_PremiumsProduct extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Order'), 'required' => TRUE, + 'where' => 'civicrm_premiums_product.weight', 'table_name' => 'civicrm_premiums_product', 'entity' => 'PremiumsProduct', 'bao' => 'CRM_Contribute_DAO_PremiumsProduct', @@ -144,6 +148,7 @@ class CRM_Contribute_DAO_PremiumsProduct extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('FK to Financial Type.'), + 'where' => 'civicrm_premiums_product.financial_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_premiums_product', 'entity' => 'PremiumsProduct', diff --git a/CRM/Contribute/DAO/Product.php b/CRM/Contribute/DAO/Product.php index d4e1e75ef5..e897a54766 100644 --- a/CRM/Contribute/DAO/Product.php +++ b/CRM/Contribute/DAO/Product.php @@ -194,6 +194,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Product ID'), 'required' => TRUE, + 'where' => 'civicrm_product.id', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -207,10 +208,8 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, - 'export' => TRUE, 'where' => 'civicrm_product.name', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -221,6 +220,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Description'), 'description' => ts('Optional description of the product/premium.'), + 'where' => 'civicrm_product.description', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -233,10 +233,8 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'description' => ts('Optional product sku or code.'), 'maxlength' => 50, 'size' => CRM_Utils_Type::BIG, - 'export' => TRUE, 'where' => 'civicrm_product.sku', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -247,6 +245,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Options'), 'description' => ts('Store comma-delimited list of color, size, etc. options for the product.'), + 'where' => 'civicrm_product.options', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -259,6 +258,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'description' => ts('Full or relative URL to uploaded image - fullsize.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_product.image', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -271,6 +271,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'description' => ts('Full or relative URL to image thumbnail.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_product.thumbnail', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -285,6 +286,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_product.price', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -297,6 +299,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'description' => ts('3 character string, value from config setting or input via user.'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_product.currency', 'default' => 'NULL', 'table_name' => 'civicrm_product', 'entity' => 'Product', @@ -317,6 +320,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('FK to Financial Type.'), + 'where' => 'civicrm_product.financial_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_product', 'entity' => 'Product', @@ -338,6 +342,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_product.min_contribution', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -352,6 +357,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_product.cost', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -363,6 +369,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'title' => ts('Is Active'), 'description' => ts('Disabling premium removes it from the premiums_premium join table below.'), 'required' => TRUE, + 'where' => 'civicrm_product.is_active', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -376,6 +383,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006) '), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_product.period_type', 'default' => 'rolling', 'table_name' => 'civicrm_product', 'entity' => 'Product', @@ -393,6 +401,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Fixed Period Start Day'), 'description' => ts('Month and day (MMDD) that fixed period type subscription or membership starts.'), + 'where' => 'civicrm_product.fixed_period_start_day', 'default' => '0101', 'table_name' => 'civicrm_product', 'entity' => 'Product', @@ -405,6 +414,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'title' => ts('Duration Unit'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_product.duration_unit', 'default' => 'year', 'table_name' => 'civicrm_product', 'entity' => 'Product', @@ -422,6 +432,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Duration Interval'), 'description' => ts('Number of units for total duration of subscription, service, membership (e.g. 12 Months).'), + 'where' => 'civicrm_product.duration_interval', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -434,6 +445,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'description' => ts('Frequency unit and interval allow option to store actual delivery frequency for a subscription or service.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_product.frequency_unit', 'default' => 'month', 'table_name' => 'civicrm_product', 'entity' => 'Product', @@ -451,6 +463,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Frequency Interval'), 'description' => ts('Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).'), + 'where' => 'civicrm_product.frequency_interval', 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', diff --git a/CRM/Contribute/DAO/Widget.php b/CRM/Contribute/DAO/Widget.php index fb7eb5e58e..9d77dfb9bf 100644 --- a/CRM/Contribute/DAO/Widget.php +++ b/CRM/Contribute/DAO/Widget.php @@ -166,6 +166,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('Widget ID'), 'description' => ts('Contribution Id'), 'required' => TRUE, + 'where' => 'civicrm_contribution_widget.id', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -176,6 +177,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contribution Page'), 'description' => ts('The Contribution Page which triggered this contribution'), + 'where' => 'civicrm_contribution_widget.contribution_page_id', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -187,6 +189,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Enabled?'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_contribution_widget.is_active', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -199,6 +202,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'description' => ts('Widget title.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_widget.title', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -211,6 +215,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'description' => ts('URL to Widget logo'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_widget.url_logo', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -223,6 +228,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'description' => ts('Button title.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_widget.button_title', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -233,6 +239,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Description'), 'description' => ts('About description.'), + 'where' => 'civicrm_contribution_widget.about', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -245,6 +252,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'description' => ts('URL to Homepage.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_contribution_widget.url_homepage', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -256,6 +264,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('Title Color'), 'maxlength' => 10, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_contribution_widget.color_title', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -267,6 +276,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('Button Colour'), 'maxlength' => 10, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_contribution_widget.color_button', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -278,6 +288,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('Bar Color'), 'maxlength' => 10, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_contribution_widget.color_bar', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -289,6 +300,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('Main Text Color'), 'maxlength' => 10, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_contribution_widget.color_main_text', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -300,6 +312,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('Main Colour'), 'maxlength' => 10, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_contribution_widget.color_main', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -311,6 +324,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('Backgroup Color'), 'maxlength' => 10, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_contribution_widget.color_main_bg', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -322,6 +336,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('Other Backgroun Colour'), 'maxlength' => 10, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_contribution_widget.color_bg', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -333,6 +348,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('About Link Colour'), 'maxlength' => 10, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_contribution_widget.color_about_link', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', @@ -344,6 +360,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO { 'title' => ts('Homepage Link Colour'), 'maxlength' => 10, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_contribution_widget.color_homepage_link', 'table_name' => 'civicrm_contribution_widget', 'entity' => 'Widget', 'bao' => 'CRM_Contribute_BAO_Widget', diff --git a/CRM/Core/DAO/ActionLog.php b/CRM/Core/DAO/ActionLog.php index cdccd9babb..3ebd410fec 100644 --- a/CRM/Core/DAO/ActionLog.php +++ b/CRM/Core/DAO/ActionLog.php @@ -134,6 +134,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Action Schedule ID'), 'required' => TRUE, + 'where' => 'civicrm_action_log.id', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', 'bao' => 'CRM_Core_BAO_ActionLog', @@ -144,6 +145,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Action Schedule Contact ID'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_action_log.contact_id', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', 'bao' => 'CRM_Core_BAO_ActionLog', @@ -156,6 +158,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'title' => ts('Entity ID'), 'description' => ts('FK to id of the entity that the action was performed on. Pseudo - FK.'), 'required' => TRUE, + 'where' => 'civicrm_action_log.entity_id', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', 'bao' => 'CRM_Core_BAO_ActionLog', @@ -168,6 +171,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'description' => ts('name of the entity table for the above id, e.g. civicrm_activity, civicrm_participant'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_action_log.entity_table', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', 'bao' => 'CRM_Core_BAO_ActionLog', @@ -179,6 +183,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'title' => ts('Schedule'), 'description' => ts('FK to the action schedule that this action originated from.'), 'required' => TRUE, + 'where' => 'civicrm_action_log.action_schedule_id', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', 'bao' => 'CRM_Core_BAO_ActionLog', @@ -190,6 +195,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Action Date And Time'), 'description' => ts('date time that the action was performed on.'), + 'where' => 'civicrm_action_log.action_date_time', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', 'bao' => 'CRM_Core_BAO_ActionLog', @@ -200,6 +206,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Error?'), 'description' => ts('Was there any error sending the reminder?'), + 'where' => 'civicrm_action_log.is_error', 'default' => '0', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', @@ -211,6 +218,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Message'), 'description' => ts('Description / text in case there was an error encountered.'), + 'where' => 'civicrm_action_log.message', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', 'bao' => 'CRM_Core_BAO_ActionLog', @@ -221,6 +229,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Repetition Number'), 'description' => ts('Keeps track of the sequence number of this repetition.'), + 'where' => 'civicrm_action_log.repetition_number', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', 'bao' => 'CRM_Core_BAO_ActionLog', @@ -231,6 +240,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Reference Date'), 'description' => ts('Stores the date from the entity which triggered this reminder action (e.g. membership.end_date for most membership renewal reminders)'), + 'where' => 'civicrm_action_log.reference_date', 'default' => 'NULL', 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', diff --git a/CRM/Core/DAO/ActionMapping.php b/CRM/Core/DAO/ActionMapping.php index cafb30f2aa..fce373b430 100644 --- a/CRM/Core/DAO/ActionMapping.php +++ b/CRM/Core/DAO/ActionMapping.php @@ -110,6 +110,7 @@ class CRM_Core_DAO_ActionMapping extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Action Mapping ID'), 'required' => TRUE, + 'where' => 'civicrm_action_mapping.id', 'table_name' => 'civicrm_action_mapping', 'entity' => 'ActionMapping', 'bao' => 'CRM_Core_DAO_ActionMapping', @@ -122,6 +123,7 @@ class CRM_Core_DAO_ActionMapping extends CRM_Core_DAO { 'description' => ts('Entity for which the reminder is created'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_mapping.entity', 'table_name' => 'civicrm_action_mapping', 'entity' => 'ActionMapping', 'bao' => 'CRM_Core_DAO_ActionMapping', @@ -134,6 +136,7 @@ class CRM_Core_DAO_ActionMapping extends CRM_Core_DAO { 'description' => ts('Entity value'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_mapping.entity_value', 'table_name' => 'civicrm_action_mapping', 'entity' => 'ActionMapping', 'bao' => 'CRM_Core_DAO_ActionMapping', @@ -146,6 +149,7 @@ class CRM_Core_DAO_ActionMapping extends CRM_Core_DAO { 'description' => ts('Entity value label'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_mapping.entity_value_label', 'table_name' => 'civicrm_action_mapping', 'entity' => 'ActionMapping', 'bao' => 'CRM_Core_DAO_ActionMapping', @@ -158,6 +162,7 @@ class CRM_Core_DAO_ActionMapping extends CRM_Core_DAO { 'description' => ts('Entity status'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_mapping.entity_status', 'table_name' => 'civicrm_action_mapping', 'entity' => 'ActionMapping', 'bao' => 'CRM_Core_DAO_ActionMapping', @@ -170,6 +175,7 @@ class CRM_Core_DAO_ActionMapping extends CRM_Core_DAO { 'description' => ts('Entity status label'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_mapping.entity_status_label', 'table_name' => 'civicrm_action_mapping', 'entity' => 'ActionMapping', 'bao' => 'CRM_Core_DAO_ActionMapping', @@ -182,6 +188,7 @@ class CRM_Core_DAO_ActionMapping extends CRM_Core_DAO { 'description' => ts('Entity date'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_mapping.entity_date_start', 'table_name' => 'civicrm_action_mapping', 'entity' => 'ActionMapping', 'bao' => 'CRM_Core_DAO_ActionMapping', @@ -194,6 +201,7 @@ class CRM_Core_DAO_ActionMapping extends CRM_Core_DAO { 'description' => ts('Entity date'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_mapping.entity_date_end', 'table_name' => 'civicrm_action_mapping', 'entity' => 'ActionMapping', 'bao' => 'CRM_Core_DAO_ActionMapping', @@ -206,6 +214,7 @@ class CRM_Core_DAO_ActionMapping extends CRM_Core_DAO { 'description' => ts('Entity recipient'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_mapping.entity_recipient', 'table_name' => 'civicrm_action_mapping', 'entity' => 'ActionMapping', 'bao' => 'CRM_Core_DAO_ActionMapping', diff --git a/CRM/Core/DAO/ActionSchedule.php b/CRM/Core/DAO/ActionSchedule.php index 7e5afe04e9..25b0376dda 100644 --- a/CRM/Core/DAO/ActionSchedule.php +++ b/CRM/Core/DAO/ActionSchedule.php @@ -327,6 +327,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Action Schedule ID'), 'required' => TRUE, + 'where' => 'civicrm_action_schedule.id', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -339,6 +340,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Name of the action(reminder)'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_schedule.name', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -351,6 +353,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Title of the action(reminder)'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_schedule.title', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -363,6 +366,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Recipient'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_schedule.recipient', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -373,6 +377,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Limit To'), 'description' => ts('Is this the recipient criteria limited to OR in addition to?'), + 'where' => 'civicrm_action_schedule.limit_to', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -385,6 +390,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Entity value'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_action_schedule.entity_value', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -397,6 +403,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Entity status'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_schedule.entity_status', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -407,6 +414,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Start Action Offset'), 'description' => ts('Reminder Interval.'), + 'where' => 'civicrm_action_schedule.start_action_offset', 'default' => '0', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', @@ -420,6 +428,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Time units for reminder.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_action_schedule.start_action_unit', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -438,6 +447,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Reminder Action'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_schedule.start_action_condition', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -450,6 +460,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Entity date'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_schedule.start_action_date', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -459,6 +470,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'name' => 'is_repeat', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Repeat?'), + 'where' => 'civicrm_action_schedule.is_repeat', 'default' => '0', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', @@ -472,6 +484,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Time units for repetition of reminder.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_action_schedule.repetition_frequency_unit', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -488,6 +501,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Repetition Frequency Interval'), 'description' => ts('Time interval for repeating the reminder.'), + 'where' => 'civicrm_action_schedule.repetition_frequency_interval', 'default' => '0', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', @@ -501,6 +515,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Time units till repetition of reminder.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_action_schedule.end_frequency_unit', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -517,6 +532,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('End Frequency Interval'), 'description' => ts('Time interval till repeating the reminder.'), + 'where' => 'civicrm_action_schedule.end_frequency_interval', 'default' => '0', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', @@ -530,6 +546,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Reminder Action till repeating the reminder.'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_action_schedule.end_action', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -542,6 +559,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Entity end date'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_schedule.end_date', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -552,6 +570,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Schedule is Active?'), 'description' => ts('Is this option active?'), + 'where' => 'civicrm_action_schedule.is_active', 'default' => '1', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', @@ -565,6 +584,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Contact IDs to which reminder should be sent.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_action_schedule.recipient_manual', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -577,6 +597,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('listing based on recipient field.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_action_schedule.recipient_listing', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -587,6 +608,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Reminder Text'), 'description' => ts('Body of the mailing in text format.'), + 'where' => 'civicrm_action_schedule.body_text', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -597,6 +619,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Reminder HTML'), 'description' => ts('Body of the mailing in html format.'), + 'where' => 'civicrm_action_schedule.body_html', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -607,6 +630,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('SMS Reminder Text'), 'description' => ts('Content of the SMS text.'), + 'where' => 'civicrm_action_schedule.sms_body_text', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -619,6 +643,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Subject of mailing'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_action_schedule.subject', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -629,6 +654,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Record Activity for Reminder?'), 'description' => ts('Record Activity for this reminder?'), + 'where' => 'civicrm_action_schedule.record_activity', 'default' => 'NULL', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', @@ -642,6 +668,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Name/ID of the mapping to use on this table'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_schedule.mapping_id', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -652,6 +679,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Reminder Group'), 'description' => ts('FK to Group'), + 'where' => 'civicrm_action_schedule.group_id', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -671,6 +699,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Reminder Template'), 'description' => ts('FK to the message template.'), + 'where' => 'civicrm_action_schedule.msg_template_id', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -682,6 +711,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('SMS Reminder Template'), 'description' => ts('FK to the message template.'), + 'where' => 'civicrm_action_schedule.sms_template_id', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -693,6 +723,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Fixed Date for Reminder'), 'description' => ts('Date on which the reminder be sent.'), + 'where' => 'civicrm_action_schedule.absolute_date', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -705,6 +736,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Name in "from" field'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_action_schedule.from_name', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -717,6 +749,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Email address in "from" field'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_action_schedule.from_email', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -729,6 +762,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Send the message as email or sms or both.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_action_schedule.mode', 'default' => 'Email', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', @@ -746,6 +780,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'name' => 'sms_provider_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('SMS Provider'), + 'where' => 'civicrm_action_schedule.sms_provider_id', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -762,6 +797,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Used for repeating entity'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_action_schedule.used_for', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -774,6 +810,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Used for multilingual installation'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_action_schedule.filter_contact_language', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', @@ -786,6 +823,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'description' => ts('Used for multilingual installation'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_action_schedule.communication_language', 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', diff --git a/CRM/Core/DAO/Address.php b/CRM/Core/DAO/Address.php index 05402a732e..f020412740 100644 --- a/CRM/Core/DAO/Address.php +++ b/CRM/Core/DAO/Address.php @@ -272,6 +272,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'title' => ts('Address ID'), 'description' => ts('Unique Address ID'), 'required' => TRUE, + 'where' => 'civicrm_address.id', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -282,6 +283,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contact ID'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_address.contact_id', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -293,6 +295,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Address Location Type'), 'description' => ts('Which Location does this address belong to.'), + 'where' => 'civicrm_address.location_type_id', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -311,6 +314,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Address Primary?'), 'description' => ts('Is this the primary address.'), + 'where' => 'civicrm_address.is_primary', 'default' => '0', 'table_name' => 'civicrm_address', 'entity' => 'Address', @@ -325,6 +329,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Billing Address'), 'description' => ts('Is this the billing address.'), + 'where' => 'civicrm_address.is_billing', 'default' => '0', 'table_name' => 'civicrm_address', 'entity' => 'Address', @@ -362,10 +367,8 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Street Number'), 'description' => ts('Numeric portion of address number on the street, e.g. For 112A Main St, the street_number = 112.'), - 'export' => TRUE, 'where' => 'civicrm_address.street_number', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -382,10 +385,8 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { '), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, - 'export' => TRUE, 'where' => 'civicrm_address.street_number_suffix', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -401,6 +402,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'description' => ts('Directional prefix, e.g. SE Main St, SE is the prefix.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_address.street_number_predirectional', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -416,10 +418,8 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'description' => ts('Actual street name, excluding St, Dr, Rd, Ave, e.g. For 112 Main St, the street_name = Main.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, - 'export' => TRUE, 'where' => 'civicrm_address.street_name', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -435,6 +435,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'description' => ts('St, Rd, Dr, etc.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_address.street_type', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -450,6 +451,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'description' => ts('Directional prefix, e.g. Main St S, S is the suffix.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_address.street_number_postdirectional', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -465,10 +467,8 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'description' => ts('Secondary unit designator, e.g. Apt 3 or Unit # 14, or Bldg 1200'), 'maxlength' => 16, 'size' => CRM_Utils_Type::TWELVE, - 'export' => TRUE, 'where' => 'civicrm_address.street_unit', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -562,6 +562,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('County'), 'description' => ts('Which County does this address belong to.'), + 'where' => 'civicrm_address.county_id', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -581,6 +582,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('State/Province'), 'description' => ts('Which State_Province does this address belong to.'), + 'where' => 'civicrm_address.state_province_id', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -643,6 +645,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'description' => ts('USPS Bulk mailing code.'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_address.usps_adc', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -653,6 +656,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Country'), 'description' => ts('Which Country does this address belong to.'), + 'where' => 'civicrm_address.country_id', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -677,7 +681,6 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_address.geo_code_1', 'headerPattern' => '/geo/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_address', 'entity' => 'Address', @@ -695,7 +698,6 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_address.geo_code_2', 'headerPattern' => '/geo/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_address', 'entity' => 'Address', @@ -710,6 +712,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is manually geocoded'), 'description' => ts('Is this a manually entered geo code'), + 'where' => 'civicrm_address.manual_geo_code', 'default' => '0', 'table_name' => 'civicrm_address', 'entity' => 'Address', @@ -726,6 +729,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'description' => ts('Timezone expressed as a UTC offset - e.g. United States CST would be written as "UTC-6".'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_address.timezone', 'table_name' => 'civicrm_address', 'entity' => 'Address', 'bao' => 'CRM_Core_BAO_Address', @@ -760,8 +764,6 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO { 'description' => ts('FK to Address ID'), 'import' => TRUE, 'where' => 'civicrm_address.master_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_address', 'entity' => 'Address', diff --git a/CRM/Core/DAO/AddressFormat.php b/CRM/Core/DAO/AddressFormat.php index d9286653a4..6db05ca4ad 100644 --- a/CRM/Core/DAO/AddressFormat.php +++ b/CRM/Core/DAO/AddressFormat.php @@ -64,6 +64,7 @@ class CRM_Core_DAO_AddressFormat extends CRM_Core_DAO { 'title' => ts('Address Format ID'), 'description' => ts('Address Format Id'), 'required' => TRUE, + 'where' => 'civicrm_address_format.id', 'table_name' => 'civicrm_address_format', 'entity' => 'AddressFormat', 'bao' => 'CRM_Core_DAO_AddressFormat', @@ -74,6 +75,7 @@ class CRM_Core_DAO_AddressFormat extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Address Format'), 'description' => ts('The format of an address'), + 'where' => 'civicrm_address_format.format', 'table_name' => 'civicrm_address_format', 'entity' => 'AddressFormat', 'bao' => 'CRM_Core_DAO_AddressFormat', diff --git a/CRM/Core/DAO/Cache.php b/CRM/Core/DAO/Cache.php index d378cc8dd9..a92e8ad977 100644 --- a/CRM/Core/DAO/Cache.php +++ b/CRM/Core/DAO/Cache.php @@ -110,6 +110,7 @@ class CRM_Core_DAO_Cache extends CRM_Core_DAO { 'name' => 'id', 'type' => CRM_Utils_Type::T_INT, 'required' => TRUE, + 'where' => 'civicrm_cache.id', 'table_name' => 'civicrm_cache', 'entity' => 'Cache', 'bao' => 'CRM_Core_BAO_Cache', @@ -123,6 +124,7 @@ class CRM_Core_DAO_Cache extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_cache.group_name', 'table_name' => 'civicrm_cache', 'entity' => 'Cache', 'bao' => 'CRM_Core_BAO_Cache', @@ -135,6 +137,7 @@ class CRM_Core_DAO_Cache extends CRM_Core_DAO { 'description' => ts('Unique path name for cache element'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_cache.path', 'table_name' => 'civicrm_cache', 'entity' => 'Cache', 'bao' => 'CRM_Core_BAO_Cache', @@ -145,6 +148,7 @@ class CRM_Core_DAO_Cache extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Data'), 'description' => ts('data associated with this path'), + 'where' => 'civicrm_cache.data', 'table_name' => 'civicrm_cache', 'entity' => 'Cache', 'bao' => 'CRM_Core_BAO_Cache', @@ -154,6 +158,7 @@ class CRM_Core_DAO_Cache extends CRM_Core_DAO { 'name' => 'component_id', 'type' => CRM_Utils_Type::T_INT, 'description' => ts('Component that this menu item belongs to'), + 'where' => 'civicrm_cache.component_id', 'table_name' => 'civicrm_cache', 'entity' => 'Cache', 'bao' => 'CRM_Core_BAO_Cache', @@ -173,6 +178,7 @@ class CRM_Core_DAO_Cache extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TIMESTAMP, 'title' => ts('Created Date'), 'description' => ts('When was the cache item created'), + 'where' => 'civicrm_cache.created_date', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_cache', 'entity' => 'Cache', @@ -185,6 +191,7 @@ class CRM_Core_DAO_Cache extends CRM_Core_DAO { 'title' => ts('Expired Date'), 'description' => ts('When should the cache item expire'), 'required' => FALSE, + 'where' => 'civicrm_cache.expired_date', 'default' => 'NULL', 'table_name' => 'civicrm_cache', 'entity' => 'Cache', diff --git a/CRM/Core/DAO/Component.php b/CRM/Core/DAO/Component.php index 6303b7b100..710c3b1593 100644 --- a/CRM/Core/DAO/Component.php +++ b/CRM/Core/DAO/Component.php @@ -72,6 +72,7 @@ class CRM_Core_DAO_Component extends CRM_Core_DAO { 'title' => ts('Component ID'), 'description' => ts('Component ID'), 'required' => TRUE, + 'where' => 'civicrm_component.id', 'table_name' => 'civicrm_component', 'entity' => 'Component', 'bao' => 'CRM_Core_DAO_Component', @@ -85,6 +86,7 @@ class CRM_Core_DAO_Component extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_component.name', 'table_name' => 'civicrm_component', 'entity' => 'Component', 'bao' => 'CRM_Core_DAO_Component', @@ -99,6 +101,7 @@ class CRM_Core_DAO_Component extends CRM_Core_DAO { '), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_component.namespace', 'table_name' => 'civicrm_component', 'entity' => 'Component', 'bao' => 'CRM_Core_DAO_Component', diff --git a/CRM/Core/DAO/Country.php b/CRM/Core/DAO/Country.php index 376f3738f8..fa5108bc65 100644 --- a/CRM/Core/DAO/Country.php +++ b/CRM/Core/DAO/Country.php @@ -129,6 +129,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO { 'title' => ts('Country ID'), 'description' => ts('Country Id'), 'required' => TRUE, + 'where' => 'civicrm_country.id', 'table_name' => 'civicrm_country', 'entity' => 'Country', 'bao' => 'CRM_Core_BAO_Country', @@ -158,6 +159,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO { 'description' => ts('ISO Code'), 'maxlength' => 2, 'size' => CRM_Utils_Type::TWO, + 'where' => 'civicrm_country.iso_code', 'table_name' => 'civicrm_country', 'entity' => 'Country', 'bao' => 'CRM_Core_BAO_Country', @@ -170,6 +172,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO { 'description' => ts('National prefix to be used when dialing TO this country.'), 'maxlength' => 4, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_country.country_code', 'table_name' => 'civicrm_country', 'entity' => 'Country', 'bao' => 'CRM_Core_BAO_Country', @@ -180,6 +183,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Address Format'), 'description' => ts('Foreign key to civicrm_address_format.id.'), + 'where' => 'civicrm_country.address_format_id', 'table_name' => 'civicrm_country', 'entity' => 'Country', 'bao' => 'CRM_Core_BAO_Country', @@ -193,6 +197,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO { 'description' => ts('International direct dialing prefix from within the country TO another country'), 'maxlength' => 4, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_country.idd_prefix', 'table_name' => 'civicrm_country', 'entity' => 'Country', 'bao' => 'CRM_Core_BAO_Country', @@ -205,6 +210,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO { 'description' => ts('Access prefix to call within a country to a different area'), 'maxlength' => 4, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_country.ndd_prefix', 'table_name' => 'civicrm_country', 'entity' => 'Country', 'bao' => 'CRM_Core_BAO_Country', @@ -216,6 +222,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO { 'title' => ts('World Region ID'), 'description' => ts('Foreign key to civicrm_worldregion.id.'), 'required' => TRUE, + 'where' => 'civicrm_country.region_id', 'table_name' => 'civicrm_country', 'entity' => 'Country', 'bao' => 'CRM_Core_BAO_Country', @@ -233,6 +240,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Abbreviate Province?'), 'description' => ts('Should state/province be displayed as abbreviation for contacts from this country?'), + 'where' => 'civicrm_country.is_province_abbreviated', 'default' => '0', 'table_name' => 'civicrm_country', 'entity' => 'Country', diff --git a/CRM/Core/DAO/County.php b/CRM/Core/DAO/County.php index 6858becf82..f3dedbed8e 100644 --- a/CRM/Core/DAO/County.php +++ b/CRM/Core/DAO/County.php @@ -93,6 +93,7 @@ class CRM_Core_DAO_County extends CRM_Core_DAO { 'title' => ts('County ID'), 'description' => ts('County ID'), 'required' => TRUE, + 'where' => 'civicrm_county.id', 'table_name' => 'civicrm_county', 'entity' => 'County', 'bao' => 'CRM_Core_DAO_County', @@ -122,6 +123,7 @@ class CRM_Core_DAO_County extends CRM_Core_DAO { 'description' => ts('2-4 Character Abbreviation of County'), 'maxlength' => 4, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_county.abbreviation', 'table_name' => 'civicrm_county', 'entity' => 'County', 'bao' => 'CRM_Core_DAO_County', @@ -133,6 +135,7 @@ class CRM_Core_DAO_County extends CRM_Core_DAO { 'title' => ts('State'), 'description' => ts('ID of State/Province that County belongs'), 'required' => TRUE, + 'where' => 'civicrm_county.state_province_id', 'table_name' => 'civicrm_county', 'entity' => 'County', 'bao' => 'CRM_Core_DAO_County', diff --git a/CRM/Core/DAO/CustomField.php b/CRM/Core/DAO/CustomField.php index 8d06e9a74c..ee0fb15f20 100644 --- a/CRM/Core/DAO/CustomField.php +++ b/CRM/Core/DAO/CustomField.php @@ -276,6 +276,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'title' => ts('Custom Field ID'), 'description' => ts('Unique Custom Field ID'), 'required' => TRUE, + 'where' => 'civicrm_custom_field.id', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -287,6 +288,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'title' => ts('Custom Group'), 'description' => ts('FK to civicrm_custom_group.'), 'required' => TRUE, + 'where' => 'civicrm_custom_field.custom_group_id', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -308,6 +310,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'description' => ts('Variable name/programmatic handle for this group.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_custom_field.name', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -321,6 +324,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_custom_field.label', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -334,6 +338,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 16, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_custom_field.data_type', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -353,6 +358,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_custom_field.html_type', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -368,6 +374,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'description' => ts('Use form_options.is_default for field_types which use options.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_custom_field.default_value', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -378,6 +385,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Custom Field Is Required?'), 'description' => ts('Is a value required for this property.'), + 'where' => 'civicrm_custom_field.is_required', 'default' => '0', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', @@ -389,6 +397,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Allow Searching on Field?'), 'description' => ts('Is this property searchable.'), + 'where' => 'civicrm_custom_field.is_searchable', 'default' => '0', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', @@ -400,6 +409,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Search as a Range'), 'description' => ts('Is this property range searchable.'), + 'where' => 'civicrm_custom_field.is_search_range', 'default' => '0', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', @@ -412,6 +422,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'title' => ts('Order'), 'description' => ts('Controls field display order within an extended property group.'), 'required' => TRUE, + 'where' => 'civicrm_custom_field.weight', 'default' => '1', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', @@ -423,6 +434,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Custom Field Pre Text'), 'description' => ts('Description and/or help text to display before this field.'), + 'where' => 'civicrm_custom_field.help_pre', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -433,6 +445,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Custom Field Post Text'), 'description' => ts('Description and/or help text to display after this field.'), + 'where' => 'civicrm_custom_field.help_post', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -445,6 +458,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'description' => ts('Optional format instructions for specific field types, like date types.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_custom_field.mask', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -457,6 +471,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'description' => ts('Store collection of type-appropriate attributes, e.g. textarea needs rows/cols attributes'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_custom_field.attributes', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -469,6 +484,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'description' => ts('Optional scripting attributes for field.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_custom_field.javascript', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -479,6 +495,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Custom Field Is Active?'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_custom_field.is_active', 'default' => '1', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', @@ -490,6 +507,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Field is Viewable'), 'description' => ts('Is this property set by PHP Code? A code field is viewable but not editable'), + 'where' => 'civicrm_custom_field.is_view', 'default' => '0', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', @@ -501,6 +519,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Field Options Per Line'), 'description' => ts('number of options per line for checkbox and radio'), + 'where' => 'civicrm_custom_field.options_per_line', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -511,6 +530,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Field Length'), 'description' => ts('field length if alphanumeric'), + 'where' => 'civicrm_custom_field.text_length', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -521,6 +541,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Field Start Date'), 'description' => ts('Date may be up to start_date_years years prior to the current date.'), + 'where' => 'civicrm_custom_field.start_date_years', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -531,6 +552,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Field End Date'), 'description' => ts('Date may be up to end_date_years years after the current date.'), + 'where' => 'civicrm_custom_field.end_date_years', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -543,6 +565,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'description' => ts('date format for custom date'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_custom_field.date_format', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -553,6 +576,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Field Time Format'), 'description' => ts('time format for custom date'), + 'where' => 'civicrm_custom_field.time_format', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -563,6 +587,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Field Note Columns'), 'description' => ts(' Number of columns in Note Field '), + 'where' => 'civicrm_custom_field.note_columns', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -573,6 +598,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Field Note Rows'), 'description' => ts(' Number of rows in Note Field '), + 'where' => 'civicrm_custom_field.note_rows', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -585,6 +611,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'description' => ts('Name of the column that holds the values for this field.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_custom_field.column_name', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -595,6 +622,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Field Option Group'), 'description' => ts('For elements with options, the option group id that is used'), + 'where' => 'civicrm_custom_field.option_group_id', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -613,6 +641,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'description' => ts('Stores Contact Get API params contact reference custom fields. May be used for other filters in the future.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_custom_field.filter', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', 'bao' => 'CRM_Core_BAO_CustomField', @@ -623,6 +652,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Field Display'), 'description' => ts('Should the multi-record custom field values be displayed in tab table listing'), + 'where' => 'civicrm_custom_field.in_selector', 'default' => '0', 'table_name' => 'civicrm_custom_field', 'entity' => 'CustomField', diff --git a/CRM/Core/DAO/CustomGroup.php b/CRM/Core/DAO/CustomGroup.php index dbb98871ca..aa7f05551f 100644 --- a/CRM/Core/DAO/CustomGroup.php +++ b/CRM/Core/DAO/CustomGroup.php @@ -212,6 +212,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'title' => ts('Custom Group ID'), 'description' => ts('Unique Custom Group ID'), 'required' => TRUE, + 'where' => 'civicrm_custom_group.id', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -224,6 +225,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'description' => ts('Variable name/programmatic handle for this group.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_custom_group.name', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -237,6 +239,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_custom_group.title', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -249,6 +252,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'description' => ts('Type of object this group extends (can add other options later e.g. contact_address, etc.).'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_custom_group.extends', 'default' => 'Contact', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', @@ -260,6 +264,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Custom Group Subtype List'), 'description' => ts('FK to civicrm_option_value.id (for option group custom_data_type.)'), + 'where' => 'civicrm_custom_group.extends_entity_column_id', 'default' => 'NULL', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', @@ -280,6 +285,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'description' => ts('linking custom group for dynamic object'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_custom_group.extends_entity_column_value', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -293,6 +299,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'description' => ts('Visual relationship between this form and its parent.'), 'maxlength' => 15, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_custom_group.style', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -309,6 +316,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Collapse Custom Group?'), 'description' => ts('Will this group be in collapsed or expanded mode on initial display ?'), + 'where' => 'civicrm_custom_group.collapse_display', 'default' => '0', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', @@ -322,6 +330,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'description' => ts('Description and/or help text to display before fields in form.'), 'rows' => 4, 'cols' => 80, + 'where' => 'civicrm_custom_group.help_pre', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -337,6 +346,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'description' => ts('Description and/or help text to display after fields in form.'), 'rows' => 4, 'cols' => 80, + 'where' => 'civicrm_custom_group.help_post', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -351,6 +361,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'title' => ts('Order'), 'description' => ts('Controls display order when multiple extended property groups are setup for the same class.'), 'required' => TRUE, + 'where' => 'civicrm_custom_group.weight', 'default' => '1', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', @@ -362,6 +373,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Custom Group Is Active?'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_custom_group.is_active', 'default' => '1', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', @@ -375,6 +387,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'description' => ts('Name of the table that holds the values for this group.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_custom_group.table_name', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -385,6 +398,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Supports Multiple Records'), 'description' => ts('Does this group hold multiple values?'), + 'where' => 'civicrm_custom_group.is_multiple', 'default' => '0', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', @@ -396,6 +410,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Minimum Multiple Records'), 'description' => ts('minimum number of multiple records (typically 0?)'), + 'where' => 'civicrm_custom_group.min_multiple', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -406,6 +421,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Maximum Multiple Records'), 'description' => ts('maximum number of multiple records, if 0 - no max'), + 'where' => 'civicrm_custom_group.max_multiple', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -416,6 +432,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Collapse Group Display'), 'description' => ts('Will this group be in collapsed or expanded mode on advanced search display ?'), + 'where' => 'civicrm_custom_group.collapse_adv_display', 'default' => '0', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', @@ -427,6 +444,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Custom Group Created By'), 'description' => ts('FK to civicrm_contact, who created this custom group'), + 'where' => 'civicrm_custom_group.created_id', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -438,6 +456,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Custom Group Created Date'), 'description' => ts('Date and time this custom group was created.'), + 'where' => 'civicrm_custom_group.created_date', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -448,6 +467,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Reserved Group?'), 'description' => ts('Is this a reserved Custom Group?'), + 'where' => 'civicrm_custom_group.is_reserved', 'default' => '0', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', @@ -459,6 +479,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Custom Group Is Public?'), 'description' => ts('Is this property public?'), + 'where' => 'civicrm_custom_group.is_public', 'default' => '1', 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', diff --git a/CRM/Core/DAO/Dashboard.php b/CRM/Core/DAO/Dashboard.php index b9fe1d241c..42aa0ab23a 100644 --- a/CRM/Core/DAO/Dashboard.php +++ b/CRM/Core/DAO/Dashboard.php @@ -139,6 +139,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('DashletID'), 'required' => TRUE, + 'where' => 'civicrm_dashboard.id', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', 'bao' => 'CRM_Core_BAO_Dashboard', @@ -150,6 +151,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'title' => ts('Dashlet Domain'), 'description' => ts('Domain for dashboard'), 'required' => TRUE, + 'where' => 'civicrm_dashboard.domain_id', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', 'bao' => 'CRM_Core_BAO_Dashboard', @@ -168,6 +170,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'description' => ts('Internal name of dashlet.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_dashboard.name', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', 'bao' => 'CRM_Core_BAO_Dashboard', @@ -180,6 +183,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'description' => ts('dashlet title'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_dashboard.label', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', 'bao' => 'CRM_Core_BAO_Dashboard', @@ -192,6 +196,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'description' => ts('url in case of external dashlet'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_dashboard.url', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', 'bao' => 'CRM_Core_BAO_Dashboard', @@ -204,6 +209,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'description' => ts('Permission for the dashlet'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_dashboard.permission', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', 'bao' => 'CRM_Core_BAO_Dashboard', @@ -216,6 +222,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'description' => ts('Permission Operator'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_dashboard.permission_operator', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', 'bao' => 'CRM_Core_BAO_Dashboard', @@ -228,6 +235,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'description' => ts('fullscreen url for dashlet'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_dashboard.fullscreen_url', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', 'bao' => 'CRM_Core_BAO_Dashboard', @@ -238,6 +246,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Dashlet Active?'), 'description' => ts('Is this dashlet active?'), + 'where' => 'civicrm_dashboard.is_active', 'default' => '0', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', @@ -249,6 +258,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Dashlet Reserved?'), 'description' => ts('Is this dashlet reserved?'), + 'where' => 'civicrm_dashboard.is_reserved', 'default' => '0', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', @@ -261,6 +271,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO { 'title' => ts('Cache Minutes'), 'description' => ts('Number of minutes to cache dashlet content in browser localStorage.'), 'required' => TRUE, + 'where' => 'civicrm_dashboard.cache_minutes', 'default' => '60', 'table_name' => 'civicrm_dashboard', 'entity' => 'Dashboard', diff --git a/CRM/Core/DAO/Discount.php b/CRM/Core/DAO/Discount.php index eff4329fbb..32dbbb454e 100644 --- a/CRM/Core/DAO/Discount.php +++ b/CRM/Core/DAO/Discount.php @@ -108,6 +108,7 @@ class CRM_Core_DAO_Discount extends CRM_Core_DAO { 'title' => ts('Discount ID'), 'description' => ts('primary key'), 'required' => TRUE, + 'where' => 'civicrm_discount.id', 'table_name' => 'civicrm_discount', 'entity' => 'Discount', 'bao' => 'CRM_Core_BAO_Discount', @@ -120,6 +121,7 @@ class CRM_Core_DAO_Discount extends CRM_Core_DAO { 'description' => ts('physical tablename for entity being joined to discount, e.g. civicrm_event'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_discount.entity_table', 'table_name' => 'civicrm_discount', 'entity' => 'Discount', 'bao' => 'CRM_Core_BAO_Discount', @@ -131,6 +133,7 @@ class CRM_Core_DAO_Discount extends CRM_Core_DAO { 'title' => ts('Entity ID'), 'description' => ts('FK to entity table specified in entity_table column.'), 'required' => TRUE, + 'where' => 'civicrm_discount.entity_id', 'table_name' => 'civicrm_discount', 'entity' => 'Discount', 'bao' => 'CRM_Core_BAO_Discount', @@ -142,10 +145,8 @@ class CRM_Core_DAO_Discount extends CRM_Core_DAO { 'title' => ts('Discount Name'), 'description' => ts('FK to civicrm_price_set'), 'required' => TRUE, - 'export' => TRUE, 'where' => 'civicrm_discount.price_set_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_discount', 'entity' => 'Discount', 'bao' => 'CRM_Core_BAO_Discount', @@ -157,6 +158,7 @@ class CRM_Core_DAO_Discount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Discount Start Date'), 'description' => ts('Date when discount starts.'), + 'where' => 'civicrm_discount.start_date', 'table_name' => 'civicrm_discount', 'entity' => 'Discount', 'bao' => 'CRM_Core_BAO_Discount', @@ -167,6 +169,7 @@ class CRM_Core_DAO_Discount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Discount End Date'), 'description' => ts('Date when discount ends.'), + 'where' => 'civicrm_discount.end_date', 'table_name' => 'civicrm_discount', 'entity' => 'Discount', 'bao' => 'CRM_Core_BAO_Discount', diff --git a/CRM/Core/DAO/Domain.php b/CRM/Core/DAO/Domain.php index b3abdbb2d5..2f84735d72 100644 --- a/CRM/Core/DAO/Domain.php +++ b/CRM/Core/DAO/Domain.php @@ -121,6 +121,7 @@ class CRM_Core_DAO_Domain extends CRM_Core_DAO { 'title' => ts('Domain ID'), 'description' => ts('Domain ID'), 'required' => TRUE, + 'where' => 'civicrm_domain.id', 'table_name' => 'civicrm_domain', 'entity' => 'Domain', 'bao' => 'CRM_Core_BAO_Domain', @@ -133,6 +134,7 @@ class CRM_Core_DAO_Domain extends CRM_Core_DAO { 'description' => ts('Name of Domain / Organization'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_domain.name', 'table_name' => 'civicrm_domain', 'entity' => 'Domain', 'bao' => 'CRM_Core_BAO_Domain', @@ -148,6 +150,7 @@ class CRM_Core_DAO_Domain extends CRM_Core_DAO { 'description' => ts('Description of Domain.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_domain.description', 'table_name' => 'civicrm_domain', 'entity' => 'Domain', 'bao' => 'CRM_Core_BAO_Domain', @@ -161,6 +164,7 @@ class CRM_Core_DAO_Domain extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Domain Configuration'), 'description' => ts('Backend configuration.'), + 'where' => 'civicrm_domain.config_backend', 'table_name' => 'civicrm_domain', 'entity' => 'Domain', 'bao' => 'CRM_Core_BAO_Domain', @@ -174,6 +178,7 @@ class CRM_Core_DAO_Domain extends CRM_Core_DAO { 'description' => ts('The civicrm version this instance is running'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_domain.version', 'table_name' => 'civicrm_domain', 'entity' => 'Domain', 'bao' => 'CRM_Core_BAO_Domain', @@ -184,6 +189,7 @@ class CRM_Core_DAO_Domain extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Domain Contact'), 'description' => ts('FK to Contact ID. This is specifically not an FK to avoid circular constraints'), + 'where' => 'civicrm_domain.contact_id', 'table_name' => 'civicrm_domain', 'entity' => 'Domain', 'bao' => 'CRM_Core_BAO_Domain', @@ -195,6 +201,7 @@ class CRM_Core_DAO_Domain extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Supported Languages'), 'description' => ts('list of locales supported by the current db state (NULL for single-lang install)'), + 'where' => 'civicrm_domain.locales', 'table_name' => 'civicrm_domain', 'entity' => 'Domain', 'bao' => 'CRM_Core_BAO_Domain', @@ -205,6 +212,7 @@ class CRM_Core_DAO_Domain extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Language Customizations'), 'description' => ts('Locale specific string overrides'), + 'where' => 'civicrm_domain.locale_custom_strings', 'table_name' => 'civicrm_domain', 'entity' => 'Domain', 'bao' => 'CRM_Core_BAO_Domain', diff --git a/CRM/Core/DAO/Email.php b/CRM/Core/DAO/Email.php index cd169bef4a..ac48170dec 100644 --- a/CRM/Core/DAO/Email.php +++ b/CRM/Core/DAO/Email.php @@ -149,6 +149,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'title' => ts('Email ID'), 'description' => ts('Unique Email ID'), 'required' => TRUE, + 'where' => 'civicrm_email.id', 'table_name' => 'civicrm_email', 'entity' => 'Email', 'bao' => 'CRM_Core_BAO_Email', @@ -159,6 +160,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Email Contact'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_email.contact_id', 'table_name' => 'civicrm_email', 'entity' => 'Email', 'bao' => 'CRM_Core_BAO_Email', @@ -170,6 +172,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Email Location Type'), 'description' => ts('Which Location does this email belong to.'), + 'where' => 'civicrm_email.location_type_id', 'table_name' => 'civicrm_email', 'entity' => 'Email', 'bao' => 'CRM_Core_BAO_Email', @@ -209,6 +212,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Primary email'), 'description' => ts('Is this the primary?'), + 'where' => 'civicrm_email.is_primary', 'default' => '0', 'table_name' => 'civicrm_email', 'entity' => 'Email', @@ -220,6 +224,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Billing Email?'), 'description' => ts('Is this the billing?'), + 'where' => 'civicrm_email.is_billing', 'default' => '0', 'table_name' => 'civicrm_email', 'entity' => 'Email', @@ -232,10 +237,8 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'title' => ts('On Hold'), 'description' => ts('Implicit FK to civicrm_option_value where option_group = email_on_hold.'), 'required' => TRUE, - 'export' => TRUE, 'where' => 'civicrm_email.on_hold', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_email', 'entity' => 'Email', @@ -254,10 +257,8 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'title' => ts('Use for Bulk Mail'), 'description' => ts('Is this address for bulk mail ?'), 'required' => TRUE, - 'export' => TRUE, 'where' => 'civicrm_email.is_bulkmail', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_email', 'entity' => 'Email', @@ -269,6 +270,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Hold Date'), 'description' => ts('When the address went on bounce hold'), + 'where' => 'civicrm_email.hold_date', 'table_name' => 'civicrm_email', 'entity' => 'Email', 'bao' => 'CRM_Core_BAO_Email', @@ -279,6 +281,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Reset Date'), 'description' => ts('When the address bounce status was last reset'), + 'where' => 'civicrm_email.reset_date', 'table_name' => 'civicrm_email', 'entity' => 'Email', 'bao' => 'CRM_Core_BAO_Email', @@ -291,8 +294,6 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'description' => ts('Text formatted signature for the email.'), 'import' => TRUE, 'where' => 'civicrm_email.signature_text', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_email', @@ -307,8 +308,6 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'description' => ts('HTML formatted signature for the email.'), 'import' => TRUE, 'where' => 'civicrm_email.signature_html', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_email', diff --git a/CRM/Core/DAO/EntityFile.php b/CRM/Core/DAO/EntityFile.php index 388f6b02dc..26069113cb 100644 --- a/CRM/Core/DAO/EntityFile.php +++ b/CRM/Core/DAO/EntityFile.php @@ -94,6 +94,7 @@ class CRM_Core_DAO_EntityFile extends CRM_Core_DAO { 'title' => ts('Entity File ID'), 'description' => ts('primary key'), 'required' => TRUE, + 'where' => 'civicrm_entity_file.id', 'table_name' => 'civicrm_entity_file', 'entity' => 'EntityFile', 'bao' => 'CRM_Core_DAO_EntityFile', @@ -106,6 +107,7 @@ class CRM_Core_DAO_EntityFile extends CRM_Core_DAO { 'description' => ts('physical tablename for entity being joined to file, e.g. civicrm_contact'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_entity_file.entity_table', 'table_name' => 'civicrm_entity_file', 'entity' => 'EntityFile', 'bao' => 'CRM_Core_DAO_EntityFile', @@ -117,6 +119,7 @@ class CRM_Core_DAO_EntityFile extends CRM_Core_DAO { 'title' => ts('Entity ID'), 'description' => ts('FK to entity table specified in entity_table column.'), 'required' => TRUE, + 'where' => 'civicrm_entity_file.entity_id', 'table_name' => 'civicrm_entity_file', 'entity' => 'EntityFile', 'bao' => 'CRM_Core_DAO_EntityFile', @@ -128,6 +131,7 @@ class CRM_Core_DAO_EntityFile extends CRM_Core_DAO { 'title' => ts('File'), 'description' => ts('FK to civicrm_file'), 'required' => TRUE, + 'where' => 'civicrm_entity_file.file_id', 'table_name' => 'civicrm_entity_file', 'entity' => 'EntityFile', 'bao' => 'CRM_Core_DAO_EntityFile', diff --git a/CRM/Core/DAO/EntityTag.php b/CRM/Core/DAO/EntityTag.php index 47bd481d6a..11bcdfcb5b 100644 --- a/CRM/Core/DAO/EntityTag.php +++ b/CRM/Core/DAO/EntityTag.php @@ -94,6 +94,7 @@ class CRM_Core_DAO_EntityTag extends CRM_Core_DAO { 'title' => ts('Entity Tag ID'), 'description' => ts('primary key'), 'required' => TRUE, + 'where' => 'civicrm_entity_tag.id', 'table_name' => 'civicrm_entity_tag', 'entity' => 'EntityTag', 'bao' => 'CRM_Core_BAO_EntityTag', @@ -106,6 +107,7 @@ class CRM_Core_DAO_EntityTag extends CRM_Core_DAO { 'description' => ts('physical tablename for entity being joined to file, e.g. civicrm_contact'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_entity_tag.entity_table', 'table_name' => 'civicrm_entity_tag', 'entity' => 'EntityTag', 'bao' => 'CRM_Core_BAO_EntityTag', @@ -121,6 +123,7 @@ class CRM_Core_DAO_EntityTag extends CRM_Core_DAO { 'title' => ts('Entity ID'), 'description' => ts('FK to entity table specified in entity_table column.'), 'required' => TRUE, + 'where' => 'civicrm_entity_tag.entity_id', 'table_name' => 'civicrm_entity_tag', 'entity' => 'EntityTag', 'bao' => 'CRM_Core_BAO_EntityTag', @@ -132,6 +135,7 @@ class CRM_Core_DAO_EntityTag extends CRM_Core_DAO { 'title' => ts('Tag'), 'description' => ts('FK to civicrm_tag'), 'required' => TRUE, + 'where' => 'civicrm_entity_tag.tag_id', 'table_name' => 'civicrm_entity_tag', 'entity' => 'EntityTag', 'bao' => 'CRM_Core_BAO_EntityTag', diff --git a/CRM/Core/DAO/Extension.php b/CRM/Core/DAO/Extension.php index be80ddb697..9bb233277e 100644 --- a/CRM/Core/DAO/Extension.php +++ b/CRM/Core/DAO/Extension.php @@ -104,6 +104,7 @@ class CRM_Core_DAO_Extension extends CRM_Core_DAO { 'title' => ts('Extension ID'), 'description' => ts('Local Extension ID'), 'required' => TRUE, + 'where' => 'civicrm_extension.id', 'table_name' => 'civicrm_extension', 'entity' => 'Extension', 'bao' => 'CRM_Core_BAO_Extension', @@ -116,6 +117,7 @@ class CRM_Core_DAO_Extension extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_extension.type', 'table_name' => 'civicrm_extension', 'entity' => 'Extension', 'bao' => 'CRM_Core_BAO_Extension', @@ -135,6 +137,7 @@ class CRM_Core_DAO_Extension extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_extension.full_name', 'table_name' => 'civicrm_extension', 'entity' => 'Extension', 'bao' => 'CRM_Core_BAO_Extension', @@ -149,8 +152,6 @@ class CRM_Core_DAO_Extension extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_extension.name', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_extension', 'entity' => 'Extension', @@ -166,8 +167,6 @@ class CRM_Core_DAO_Extension extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_extension.label', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_extension', 'entity' => 'Extension', @@ -183,8 +182,6 @@ class CRM_Core_DAO_Extension extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_extension.file', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_extension', 'entity' => 'Extension', @@ -200,8 +197,6 @@ class CRM_Core_DAO_Extension extends CRM_Core_DAO { 'size' => CRM_Utils_Type::BIG, 'import' => TRUE, 'where' => 'civicrm_extension.schema_version', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_extension', 'entity' => 'Extension', @@ -213,6 +208,7 @@ class CRM_Core_DAO_Extension extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Extension is Active?'), 'description' => ts('Is this extension active?'), + 'where' => 'civicrm_extension.is_active', 'default' => '1', 'table_name' => 'civicrm_extension', 'entity' => 'Extension', diff --git a/CRM/Core/DAO/File.php b/CRM/Core/DAO/File.php index 41911d9b89..fe4ae741f4 100644 --- a/CRM/Core/DAO/File.php +++ b/CRM/Core/DAO/File.php @@ -121,6 +121,7 @@ class CRM_Core_DAO_File extends CRM_Core_DAO { 'title' => ts('File ID'), 'description' => ts('Unique ID'), 'required' => TRUE, + 'where' => 'civicrm_file.id', 'table_name' => 'civicrm_file', 'entity' => 'File', 'bao' => 'CRM_Core_BAO_File', @@ -131,6 +132,7 @@ class CRM_Core_DAO_File extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('File Type'), 'description' => ts('Type of file (e.g. Transcript, Income Tax Return, etc). FK to civicrm_option_value.'), + 'where' => 'civicrm_file.file_type_id', 'table_name' => 'civicrm_file', 'entity' => 'File', 'bao' => 'CRM_Core_BAO_File', @@ -143,6 +145,7 @@ class CRM_Core_DAO_File extends CRM_Core_DAO { 'description' => ts('mime type of the document'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_file.mime_type', 'table_name' => 'civicrm_file', 'entity' => 'File', 'bao' => 'CRM_Core_BAO_File', @@ -155,6 +158,7 @@ class CRM_Core_DAO_File extends CRM_Core_DAO { 'description' => ts('uri of the file on disk'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_file.uri', 'table_name' => 'civicrm_file', 'entity' => 'File', 'bao' => 'CRM_Core_BAO_File', @@ -165,6 +169,7 @@ class CRM_Core_DAO_File extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_MEDIUMBLOB, 'title' => ts('File Contents'), 'description' => ts('contents of the document'), + 'where' => 'civicrm_file.document', 'table_name' => 'civicrm_file', 'entity' => 'File', 'bao' => 'CRM_Core_BAO_File', @@ -177,6 +182,7 @@ class CRM_Core_DAO_File extends CRM_Core_DAO { 'description' => ts('Additional descriptive text regarding this attachment (optional).'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_file.description', 'table_name' => 'civicrm_file', 'entity' => 'File', 'bao' => 'CRM_Core_BAO_File', @@ -187,6 +193,7 @@ class CRM_Core_DAO_File extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('File Upload Date'), 'description' => ts('Date and time that this attachment was uploaded or written to server.'), + 'where' => 'civicrm_file.upload_date', 'table_name' => 'civicrm_file', 'entity' => 'File', 'bao' => 'CRM_Core_BAO_File', @@ -197,6 +204,7 @@ class CRM_Core_DAO_File extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Created By Contact ID'), 'description' => ts('FK to civicrm_contact, who uploaded this file'), + 'where' => 'civicrm_file.created_id', 'table_name' => 'civicrm_file', 'entity' => 'File', 'bao' => 'CRM_Core_BAO_File', diff --git a/CRM/Core/DAO/IM.php b/CRM/Core/DAO/IM.php index eed59c3908..e53ce78aff 100644 --- a/CRM/Core/DAO/IM.php +++ b/CRM/Core/DAO/IM.php @@ -114,6 +114,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO { 'title' => ts('Instant Messenger ID'), 'description' => ts('Unique IM ID'), 'required' => TRUE, + 'where' => 'civicrm_im.id', 'table_name' => 'civicrm_im', 'entity' => 'IM', 'bao' => 'CRM_Core_BAO_IM', @@ -124,6 +125,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('IM Contact'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_im.contact_id', 'table_name' => 'civicrm_im', 'entity' => 'IM', 'bao' => 'CRM_Core_BAO_IM', @@ -135,6 +137,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('IM Location Type'), 'description' => ts('Which Location does this email belong to.'), + 'where' => 'civicrm_im.location_type_id', 'table_name' => 'civicrm_im', 'entity' => 'IM', 'bao' => 'CRM_Core_BAO_IM', @@ -173,6 +176,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('IM Provider'), 'description' => ts('Which IM Provider does this screen name belong to.'), + 'where' => 'civicrm_im.provider_id', 'table_name' => 'civicrm_im', 'entity' => 'IM', 'bao' => 'CRM_Core_BAO_IM', @@ -190,6 +194,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is IM Primary?'), 'description' => ts('Is this the primary IM for this contact and location.'), + 'where' => 'civicrm_im.is_primary', 'default' => '0', 'table_name' => 'civicrm_im', 'entity' => 'IM', @@ -201,6 +206,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is IM Billing?'), 'description' => ts('Is this the billing?'), + 'where' => 'civicrm_im.is_billing', 'default' => '0', 'table_name' => 'civicrm_im', 'entity' => 'IM', diff --git a/CRM/Core/DAO/Job.php b/CRM/Core/DAO/Job.php index 7c6ff616ef..3c0961ef24 100644 --- a/CRM/Core/DAO/Job.php +++ b/CRM/Core/DAO/Job.php @@ -142,6 +142,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'title' => ts('Job ID'), 'description' => ts('Job Id'), 'required' => TRUE, + 'where' => 'civicrm_job.id', 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', @@ -153,6 +154,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'title' => ts('Job Domain'), 'description' => ts('Which Domain is this scheduled job for'), 'required' => TRUE, + 'where' => 'civicrm_job.domain_id', 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', @@ -171,6 +173,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'description' => ts('Scheduled job run frequency.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_job.run_frequency', 'default' => 'Daily', 'table_name' => 'civicrm_job', 'entity' => 'Job', @@ -189,6 +192,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'title' => ts('Last Run'), 'description' => ts('When was this cron entry last run'), 'required' => FALSE, + 'where' => 'civicrm_job.last_run', 'default' => 'NULL', 'table_name' => 'civicrm_job', 'entity' => 'Job', @@ -201,6 +205,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'title' => ts('Scheduled Run Date'), 'description' => ts('When is this cron entry scheduled to run'), 'required' => FALSE, + 'where' => 'civicrm_job.scheduled_run_date', 'default' => 'NULL', 'table_name' => 'civicrm_job', 'entity' => 'Job', @@ -214,6 +219,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'description' => ts('Title of the job'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_job.name', 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', @@ -226,6 +232,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'description' => ts('Description of the job'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_job.description', 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', @@ -238,6 +245,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'description' => ts('Entity of the job api call'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_job.api_entity', 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', @@ -250,6 +258,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'description' => ts('Action of the job api call'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_job.api_action', 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', @@ -262,6 +271,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'description' => ts('List of parameters to the command.'), 'rows' => 4, 'cols' => 60, + 'where' => 'civicrm_job.parameters', 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', @@ -275,6 +285,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Job Is Active?'), 'description' => ts('Is this job active?'), + 'where' => 'civicrm_job.is_active', 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', diff --git a/CRM/Core/DAO/JobLog.php b/CRM/Core/DAO/JobLog.php index aaa71773e7..65737e4fff 100644 --- a/CRM/Core/DAO/JobLog.php +++ b/CRM/Core/DAO/JobLog.php @@ -121,6 +121,7 @@ class CRM_Core_DAO_JobLog extends CRM_Core_DAO { 'title' => ts('Job Log ID'), 'description' => ts('Job log entry Id'), 'required' => TRUE, + 'where' => 'civicrm_job_log.id', 'table_name' => 'civicrm_job_log', 'entity' => 'JobLog', 'bao' => 'CRM_Core_DAO_JobLog', @@ -132,6 +133,7 @@ class CRM_Core_DAO_JobLog extends CRM_Core_DAO { 'title' => ts('Domain ID'), 'description' => ts('Which Domain is this scheduled job for'), 'required' => TRUE, + 'where' => 'civicrm_job_log.domain_id', 'table_name' => 'civicrm_job_log', 'entity' => 'JobLog', 'bao' => 'CRM_Core_DAO_JobLog', @@ -148,6 +150,7 @@ class CRM_Core_DAO_JobLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TIMESTAMP, 'title' => ts('Timestamp'), 'description' => ts('Log entry date'), + 'where' => 'civicrm_job_log.run_time', 'table_name' => 'civicrm_job_log', 'entity' => 'JobLog', 'bao' => 'CRM_Core_DAO_JobLog', @@ -158,6 +161,7 @@ class CRM_Core_DAO_JobLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Job ID'), 'description' => ts('Pointer to job id - not a FK though, just for logging purposes'), + 'where' => 'civicrm_job_log.job_id', 'table_name' => 'civicrm_job_log', 'entity' => 'JobLog', 'bao' => 'CRM_Core_DAO_JobLog', @@ -170,6 +174,7 @@ class CRM_Core_DAO_JobLog extends CRM_Core_DAO { 'description' => ts('Title of the job'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_job_log.name', 'table_name' => 'civicrm_job_log', 'entity' => 'JobLog', 'bao' => 'CRM_Core_DAO_JobLog', @@ -182,6 +187,7 @@ class CRM_Core_DAO_JobLog extends CRM_Core_DAO { 'description' => ts('Full path to file containing job script'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_job_log.command', 'table_name' => 'civicrm_job_log', 'entity' => 'JobLog', 'bao' => 'CRM_Core_DAO_JobLog', @@ -194,6 +200,7 @@ class CRM_Core_DAO_JobLog extends CRM_Core_DAO { 'description' => ts('Title line of log entry'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_job_log.description', 'table_name' => 'civicrm_job_log', 'entity' => 'JobLog', 'bao' => 'CRM_Core_DAO_JobLog', @@ -204,6 +211,7 @@ class CRM_Core_DAO_JobLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Extended Data'), 'description' => ts('Potential extended data for specific job run (e.g. tracebacks).'), + 'where' => 'civicrm_job_log.data', 'table_name' => 'civicrm_job_log', 'entity' => 'JobLog', 'bao' => 'CRM_Core_DAO_JobLog', diff --git a/CRM/Core/DAO/LocBlock.php b/CRM/Core/DAO/LocBlock.php index 8862e752b5..c48de8d06d 100644 --- a/CRM/Core/DAO/LocBlock.php +++ b/CRM/Core/DAO/LocBlock.php @@ -119,6 +119,7 @@ class CRM_Core_DAO_LocBlock extends CRM_Core_DAO { 'title' => ts('Location Block ID'), 'description' => ts('Unique ID'), 'required' => TRUE, + 'where' => 'civicrm_loc_block.id', 'table_name' => 'civicrm_loc_block', 'entity' => 'LocBlock', 'bao' => 'CRM_Core_DAO_LocBlock', @@ -128,6 +129,7 @@ class CRM_Core_DAO_LocBlock extends CRM_Core_DAO { 'name' => 'address_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Location Block Address'), + 'where' => 'civicrm_loc_block.address_id', 'table_name' => 'civicrm_loc_block', 'entity' => 'LocBlock', 'bao' => 'CRM_Core_DAO_LocBlock', @@ -138,6 +140,7 @@ class CRM_Core_DAO_LocBlock extends CRM_Core_DAO { 'name' => 'email_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Location Block Email'), + 'where' => 'civicrm_loc_block.email_id', 'table_name' => 'civicrm_loc_block', 'entity' => 'LocBlock', 'bao' => 'CRM_Core_DAO_LocBlock', @@ -148,6 +151,7 @@ class CRM_Core_DAO_LocBlock extends CRM_Core_DAO { 'name' => 'phone_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Location Block Phone'), + 'where' => 'civicrm_loc_block.phone_id', 'table_name' => 'civicrm_loc_block', 'entity' => 'LocBlock', 'bao' => 'CRM_Core_DAO_LocBlock', @@ -158,6 +162,7 @@ class CRM_Core_DAO_LocBlock extends CRM_Core_DAO { 'name' => 'im_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Location Block IM'), + 'where' => 'civicrm_loc_block.im_id', 'table_name' => 'civicrm_loc_block', 'entity' => 'LocBlock', 'bao' => 'CRM_Core_DAO_LocBlock', @@ -168,6 +173,7 @@ class CRM_Core_DAO_LocBlock extends CRM_Core_DAO { 'name' => 'address_2_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Location Block IM 2'), + 'where' => 'civicrm_loc_block.address_2_id', 'table_name' => 'civicrm_loc_block', 'entity' => 'LocBlock', 'bao' => 'CRM_Core_DAO_LocBlock', @@ -178,6 +184,7 @@ class CRM_Core_DAO_LocBlock extends CRM_Core_DAO { 'name' => 'email_2_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Email 2'), + 'where' => 'civicrm_loc_block.email_2_id', 'table_name' => 'civicrm_loc_block', 'entity' => 'LocBlock', 'bao' => 'CRM_Core_DAO_LocBlock', @@ -188,6 +195,7 @@ class CRM_Core_DAO_LocBlock extends CRM_Core_DAO { 'name' => 'phone_2_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Phone 2'), + 'where' => 'civicrm_loc_block.phone_2_id', 'table_name' => 'civicrm_loc_block', 'entity' => 'LocBlock', 'bao' => 'CRM_Core_DAO_LocBlock', @@ -198,6 +206,7 @@ class CRM_Core_DAO_LocBlock extends CRM_Core_DAO { 'name' => 'im_2_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Instant Messenger 2'), + 'where' => 'civicrm_loc_block.im_2_id', 'table_name' => 'civicrm_loc_block', 'entity' => 'LocBlock', 'bao' => 'CRM_Core_DAO_LocBlock', diff --git a/CRM/Core/DAO/LocationType.php b/CRM/Core/DAO/LocationType.php index ebbe98c330..fbab7fe2da 100644 --- a/CRM/Core/DAO/LocationType.php +++ b/CRM/Core/DAO/LocationType.php @@ -106,6 +106,7 @@ class CRM_Core_DAO_LocationType extends CRM_Core_DAO { 'title' => ts('Location Type ID'), 'description' => ts('Location Type ID'), 'required' => TRUE, + 'where' => 'civicrm_location_type.id', 'table_name' => 'civicrm_location_type', 'entity' => 'LocationType', 'bao' => 'CRM_Core_BAO_LocationType', @@ -118,6 +119,7 @@ class CRM_Core_DAO_LocationType extends CRM_Core_DAO { 'description' => ts('Location Type Name.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_location_type.name', 'table_name' => 'civicrm_location_type', 'entity' => 'LocationType', 'bao' => 'CRM_Core_BAO_LocationType', @@ -130,6 +132,7 @@ class CRM_Core_DAO_LocationType extends CRM_Core_DAO { 'description' => ts('Location Type Display Name.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_location_type.display_name', 'table_name' => 'civicrm_location_type', 'entity' => 'LocationType', 'bao' => 'CRM_Core_BAO_LocationType', @@ -142,6 +145,7 @@ class CRM_Core_DAO_LocationType extends CRM_Core_DAO { 'description' => ts('vCard Location Type Name.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_location_type.vcard_name', 'table_name' => 'civicrm_location_type', 'entity' => 'LocationType', 'bao' => 'CRM_Core_BAO_LocationType', @@ -154,6 +158,7 @@ class CRM_Core_DAO_LocationType extends CRM_Core_DAO { 'description' => ts('Location Type Description.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_location_type.description', 'table_name' => 'civicrm_location_type', 'entity' => 'LocationType', 'bao' => 'CRM_Core_BAO_LocationType', @@ -164,6 +169,7 @@ class CRM_Core_DAO_LocationType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Location Type is Reserved?'), 'description' => ts('Is this location type a predefined system location?'), + 'where' => 'civicrm_location_type.is_reserved', 'table_name' => 'civicrm_location_type', 'entity' => 'LocationType', 'bao' => 'CRM_Core_BAO_LocationType', @@ -174,6 +180,7 @@ class CRM_Core_DAO_LocationType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Location Type is Active?'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_location_type.is_active', 'table_name' => 'civicrm_location_type', 'entity' => 'LocationType', 'bao' => 'CRM_Core_BAO_LocationType', @@ -184,6 +191,7 @@ class CRM_Core_DAO_LocationType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Default Location Type?'), 'description' => ts('Is this location type the default?'), + 'where' => 'civicrm_location_type.is_default', 'table_name' => 'civicrm_location_type', 'entity' => 'LocationType', 'bao' => 'CRM_Core_BAO_LocationType', diff --git a/CRM/Core/DAO/Log.php b/CRM/Core/DAO/Log.php index 61b9ab668c..61a74d8a3f 100644 --- a/CRM/Core/DAO/Log.php +++ b/CRM/Core/DAO/Log.php @@ -108,6 +108,7 @@ class CRM_Core_DAO_Log extends CRM_Core_DAO { 'title' => ts('Log ID'), 'description' => ts('Log ID'), 'required' => TRUE, + 'where' => 'civicrm_log.id', 'table_name' => 'civicrm_log', 'entity' => 'Log', 'bao' => 'CRM_Core_BAO_Log', @@ -121,6 +122,7 @@ class CRM_Core_DAO_Log extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_log.entity_table', 'table_name' => 'civicrm_log', 'entity' => 'Log', 'bao' => 'CRM_Core_BAO_Log', @@ -132,6 +134,7 @@ class CRM_Core_DAO_Log extends CRM_Core_DAO { 'title' => ts('Entity ID '), 'description' => ts('Foreign key to the referenced item.'), 'required' => TRUE, + 'where' => 'civicrm_log.entity_id', 'table_name' => 'civicrm_log', 'entity' => 'Log', 'bao' => 'CRM_Core_BAO_Log', @@ -142,6 +145,7 @@ class CRM_Core_DAO_Log extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Data'), 'description' => ts('Updates does to this object if any.'), + 'where' => 'civicrm_log.data', 'table_name' => 'civicrm_log', 'entity' => 'Log', 'bao' => 'CRM_Core_BAO_Log', @@ -152,6 +156,7 @@ class CRM_Core_DAO_Log extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Modified By'), 'description' => ts('FK to Contact ID of person under whose credentials this data modification was made.'), + 'where' => 'civicrm_log.modified_id', 'table_name' => 'civicrm_log', 'entity' => 'Log', 'bao' => 'CRM_Core_BAO_Log', @@ -163,6 +168,7 @@ class CRM_Core_DAO_Log extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Modified Date'), 'description' => ts('When was the referenced entity created or modified or deleted.'), + 'where' => 'civicrm_log.modified_date', 'table_name' => 'civicrm_log', 'entity' => 'Log', 'bao' => 'CRM_Core_BAO_Log', diff --git a/CRM/Core/DAO/MailSettings.php b/CRM/Core/DAO/MailSettings.php index 5ffd0c27fe..7657ad3a72 100644 --- a/CRM/Core/DAO/MailSettings.php +++ b/CRM/Core/DAO/MailSettings.php @@ -170,6 +170,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'title' => ts('Mail Settings ID'), 'description' => ts('primary key'), 'required' => TRUE, + 'where' => 'civicrm_mail_settings.id', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -181,6 +182,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'title' => ts('Mail Settings Domain'), 'description' => ts('Which Domain is this match entry for'), 'required' => TRUE, + 'where' => 'civicrm_mail_settings.domain_id', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -199,6 +201,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('name of this group of settings'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.name', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -209,6 +212,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Default Mail Settings?'), 'description' => ts('whether this is the default set of settings for this domain'), + 'where' => 'civicrm_mail_settings.is_default', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -221,6 +225,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('email address domain (the part after @)'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.domain', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -233,6 +238,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('optional local part (like civimail+ for addresses like civimail+s.1.2@example.com)'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.localpart', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -245,6 +251,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('contents of the Return-Path header'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.return_path', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -257,6 +264,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('name of the protocol to use for polling (like IMAP, POP3 or Maildir)'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.protocol', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -276,6 +284,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('server to use when polling'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.server', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -286,6 +295,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mail Port'), 'description' => ts('port to use when polling'), + 'where' => 'civicrm_mail_settings.port', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -298,6 +308,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('username to use when polling'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.username', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -310,6 +321,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('password to use when polling'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.password', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -320,6 +332,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Mail Account Uses SSL'), 'description' => ts('whether to use SSL or not'), + 'where' => 'civicrm_mail_settings.is_ssl', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -332,6 +345,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('folder to poll from when using IMAP, path to poll from when using Maildir, etc.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.source', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', @@ -344,6 +358,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO { 'description' => ts('Name of status to use when creating email to activity.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mail_settings.activity_status', 'table_name' => 'civicrm_mail_settings', 'entity' => 'MailSettings', 'bao' => 'CRM_Core_BAO_MailSettings', diff --git a/CRM/Core/DAO/Managed.php b/CRM/Core/DAO/Managed.php index 4ba363ef56..940c62e686 100644 --- a/CRM/Core/DAO/Managed.php +++ b/CRM/Core/DAO/Managed.php @@ -92,6 +92,7 @@ class CRM_Core_DAO_Managed extends CRM_Core_DAO { 'title' => ts('Managed ID'), 'description' => ts('Surrogate Key'), 'required' => TRUE, + 'where' => 'civicrm_managed.id', 'table_name' => 'civicrm_managed', 'entity' => 'Managed', 'bao' => 'CRM_Core_DAO_Managed', @@ -105,6 +106,7 @@ class CRM_Core_DAO_Managed extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 127, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_managed.module', 'table_name' => 'civicrm_managed', 'entity' => 'Managed', 'bao' => 'CRM_Core_DAO_Managed', @@ -117,6 +119,7 @@ class CRM_Core_DAO_Managed extends CRM_Core_DAO { 'description' => ts('Symbolic name used by the module to identify the object'), 'maxlength' => 127, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_managed.name', 'table_name' => 'civicrm_managed', 'entity' => 'Managed', 'bao' => 'CRM_Core_DAO_Managed', @@ -130,6 +133,7 @@ class CRM_Core_DAO_Managed extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_managed.entity_type', 'table_name' => 'civicrm_managed', 'entity' => 'Managed', 'bao' => 'CRM_Core_DAO_Managed', @@ -141,6 +145,7 @@ class CRM_Core_DAO_Managed extends CRM_Core_DAO { 'title' => ts('Entity ID'), 'description' => ts('Foreign key to the referenced item.'), 'required' => TRUE, + 'where' => 'civicrm_managed.entity_id', 'table_name' => 'civicrm_managed', 'entity' => 'Managed', 'bao' => 'CRM_Core_DAO_Managed', @@ -153,6 +158,7 @@ class CRM_Core_DAO_Managed extends CRM_Core_DAO { 'description' => ts('Policy on when to cleanup entity (always, never, unused)'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_managed.cleanup', 'table_name' => 'civicrm_managed', 'entity' => 'Managed', 'bao' => 'CRM_Core_DAO_Managed', diff --git a/CRM/Core/DAO/Mapping.php b/CRM/Core/DAO/Mapping.php index e2e3a90a0c..a4c2e3556a 100644 --- a/CRM/Core/DAO/Mapping.php +++ b/CRM/Core/DAO/Mapping.php @@ -78,6 +78,7 @@ class CRM_Core_DAO_Mapping extends CRM_Core_DAO { 'title' => ts('Mapping ID'), 'description' => ts('Mapping ID'), 'required' => TRUE, + 'where' => 'civicrm_mapping.id', 'table_name' => 'civicrm_mapping', 'entity' => 'Mapping', 'bao' => 'CRM_Core_BAO_Mapping', @@ -90,6 +91,7 @@ class CRM_Core_DAO_Mapping extends CRM_Core_DAO { 'description' => ts('Name of Mapping'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_mapping.name', 'table_name' => 'civicrm_mapping', 'entity' => 'Mapping', 'bao' => 'CRM_Core_BAO_Mapping', @@ -102,6 +104,7 @@ class CRM_Core_DAO_Mapping extends CRM_Core_DAO { 'description' => ts('Description of Mapping.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mapping.description', 'table_name' => 'civicrm_mapping', 'entity' => 'Mapping', 'bao' => 'CRM_Core_BAO_Mapping', @@ -112,6 +115,7 @@ class CRM_Core_DAO_Mapping extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mapping Type'), 'description' => ts('Mapping Type'), + 'where' => 'civicrm_mapping.mapping_type_id', 'table_name' => 'civicrm_mapping', 'entity' => 'Mapping', 'bao' => 'CRM_Core_BAO_Mapping', diff --git a/CRM/Core/DAO/MappingField.php b/CRM/Core/DAO/MappingField.php index c7b228c75a..eecc8d44bf 100644 --- a/CRM/Core/DAO/MappingField.php +++ b/CRM/Core/DAO/MappingField.php @@ -164,6 +164,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'title' => ts('Mapping Field ID'), 'description' => ts('Mapping Field ID'), 'required' => TRUE, + 'where' => 'civicrm_mapping_field.id', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -175,6 +176,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'title' => ts('Mapping ID'), 'description' => ts('Mapping to which this field belongs'), 'required' => TRUE, + 'where' => 'civicrm_mapping_field.mapping_id', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -188,6 +190,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'description' => ts('Mapping field key'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mapping_field.name', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -200,6 +203,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'description' => ts('Contact Type in mapping'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_mapping_field.contact_type', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -214,6 +218,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'title' => ts('Column Number'), 'description' => ts('Column number for mapping set'), 'required' => TRUE, + 'where' => 'civicrm_mapping_field.column_number', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -224,6 +229,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Location type ID'), 'description' => ts('Location type of this mapping, if required'), + 'where' => 'civicrm_mapping_field.location_type_id', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -235,6 +241,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Phone type ID'), 'description' => ts('Which type of phone does this number belongs.'), + 'where' => 'civicrm_mapping_field.phone_type_id', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -245,6 +252,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('IM provider ID'), 'description' => ts('Which type of IM Provider does this name belong.'), + 'where' => 'civicrm_mapping_field.im_provider_id', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -262,6 +270,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Website type ID'), 'description' => ts('Which type of website does this site belong'), + 'where' => 'civicrm_mapping_field.website_type_id', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -279,6 +288,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Relationship type ID'), 'description' => ts('Relationship type, if required'), + 'where' => 'civicrm_mapping_field.relationship_type_id', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -291,6 +301,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'title' => ts('Relationship Direction'), 'maxlength' => 6, 'size' => CRM_Utils_Type::SIX, + 'where' => 'civicrm_mapping_field.relationship_direction', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -303,6 +314,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'description' => ts('Used to group mapping_field records into related sets (e.g. for criteria sets in search builder mappings). '), + 'where' => 'civicrm_mapping_field.grouping', 'default' => '1', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', @@ -316,6 +328,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'description' => ts('SQL WHERE operator for search-builder mapping fields (search criteria).'), 'maxlength' => 16, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_mapping_field.operator', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', @@ -334,6 +347,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO { 'description' => ts('SQL WHERE value for search-builder mapping fields.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mapping_field.value', 'table_name' => 'civicrm_mapping_field', 'entity' => 'MappingField', 'bao' => 'CRM_Core_DAO_MappingField', diff --git a/CRM/Core/DAO/Menu.php b/CRM/Core/DAO/Menu.php index 10b3f14316..3815647ba2 100644 --- a/CRM/Core/DAO/Menu.php +++ b/CRM/Core/DAO/Menu.php @@ -215,6 +215,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Menu ID'), 'required' => TRUE, + 'where' => 'civicrm_menu.id', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -226,6 +227,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'title' => ts('Domain'), 'description' => ts('Which Domain is this menu item for'), 'required' => TRUE, + 'where' => 'civicrm_menu.domain_id', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -244,6 +246,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'description' => ts('Path Name'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_menu.path', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -254,6 +257,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Arguments'), 'description' => ts('Arguments to pass to the url'), + 'where' => 'civicrm_menu.path_arguments', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -265,6 +269,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'title' => ts('Menu Title'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_menu.title', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -277,6 +282,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'description' => ts('Function to call to check access permissions'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_menu.access_callback', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -287,6 +293,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Access Arguments'), 'description' => ts('Arguments to pass to access callback'), + 'where' => 'civicrm_menu.access_arguments', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -299,6 +306,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'description' => ts('function to call for this url'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_menu.page_callback', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -309,6 +317,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Page Arguments'), 'description' => ts('Arguments to pass to page callback'), + 'where' => 'civicrm_menu.page_arguments', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -319,6 +328,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Breadcrumb'), 'description' => ts('Breadcrumb for the path.'), + 'where' => 'civicrm_menu.breadcrumb', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -331,6 +341,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'description' => ts('Url where a page should redirected to, if next url not known.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_menu.return_url', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -343,6 +354,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'description' => ts('Arguments to pass to return_url'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_menu.return_url_args', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -353,6 +365,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Component'), 'description' => ts('Component that this menu item belongs to'), + 'where' => 'civicrm_menu.component_id', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -372,6 +385,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Enabled?'), 'description' => ts('Is this menu item active?'), + 'where' => 'civicrm_menu.is_active', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -382,6 +396,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Public?'), 'description' => ts('Is this menu accessible to the public?'), + 'where' => 'civicrm_menu.is_public', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -392,6 +407,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Exposed?'), 'description' => ts('Is this menu exposed to the navigation system?'), + 'where' => 'civicrm_menu.is_exposed', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -402,6 +418,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Use SSL?'), 'description' => ts('Should this menu be exposed via SSL if enabled?'), + 'where' => 'civicrm_menu.is_ssl', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -413,6 +430,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'title' => ts('Order'), 'description' => ts('Ordering of the menu items in various blocks.'), 'required' => TRUE, + 'where' => 'civicrm_menu.weight', 'default' => '1', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', @@ -425,6 +443,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'title' => ts('Type'), 'description' => ts('Drupal menu type.'), 'required' => TRUE, + 'where' => 'civicrm_menu.type', 'default' => '1', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', @@ -437,6 +456,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'title' => ts('Page Type'), 'description' => ts('CiviCRM menu type.'), 'required' => TRUE, + 'where' => 'civicrm_menu.page_type', 'default' => '1', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', @@ -448,6 +468,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Hide Breadcrumb?'), 'description' => ts('skip this url being exposed to breadcrumb'), + 'where' => 'civicrm_menu.skipBreadcrumb', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', @@ -458,6 +479,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Other menu data'), 'description' => ts('All other menu metadata not stored in other fields'), + 'where' => 'civicrm_menu.module_data', 'table_name' => 'civicrm_menu', 'entity' => 'Menu', 'bao' => 'CRM_Core_DAO_Menu', diff --git a/CRM/Core/DAO/MessageTemplate.php b/CRM/Core/DAO/MessageTemplate.php index 3fee5bb1f1..7ba1243909 100644 --- a/CRM/Core/DAO/MessageTemplate.php +++ b/CRM/Core/DAO/MessageTemplate.php @@ -125,6 +125,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'title' => ts('Message Template ID'), 'description' => ts('Message Template ID'), 'required' => TRUE, + 'where' => 'civicrm_msg_template.id', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', 'bao' => 'CRM_Core_BAO_MessageTemplate', @@ -137,6 +138,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'description' => ts('Descriptive title of message'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_msg_template.msg_title', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', 'bao' => 'CRM_Core_BAO_MessageTemplate', @@ -147,6 +149,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Message Template Subject'), 'description' => ts('Subject for email message.'), + 'where' => 'civicrm_msg_template.msg_subject', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', 'bao' => 'CRM_Core_BAO_MessageTemplate', @@ -157,6 +160,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Message Template Text'), 'description' => ts('Text formatted message'), + 'where' => 'civicrm_msg_template.msg_text', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', 'bao' => 'CRM_Core_BAO_MessageTemplate', @@ -170,6 +174,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Message Template HTML'), 'description' => ts('HTML formatted message'), + 'where' => 'civicrm_msg_template.msg_html', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', 'bao' => 'CRM_Core_BAO_MessageTemplate', @@ -182,6 +187,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'name' => 'is_active', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Active'), + 'where' => 'civicrm_msg_template.is_active', 'default' => '1', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', @@ -193,6 +199,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Message Template Workflow'), 'description' => ts('a pseudo-FK to civicrm_option_value'), + 'where' => 'civicrm_msg_template.workflow_id', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', 'bao' => 'CRM_Core_BAO_MessageTemplate', @@ -203,6 +210,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Message Template Is Default?'), 'description' => ts('is this the default message template for the workflow referenced by workflow_id?'), + 'where' => 'civicrm_msg_template.is_default', 'default' => '1', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', @@ -214,6 +222,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Message Template Is Reserved?'), 'description' => ts('is this the reserved message template which we ship for the workflow referenced by workflow_id?'), + 'where' => 'civicrm_msg_template.is_reserved', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', 'bao' => 'CRM_Core_BAO_MessageTemplate', @@ -224,6 +233,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Message Template is used for SMS?'), 'description' => ts('Is this message template used for sms?'), + 'where' => 'civicrm_msg_template.is_sms', 'default' => '0', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', @@ -235,6 +245,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Message Template Format'), 'description' => ts('a pseudo-FK to civicrm_option_value containing PDF Page Format.'), + 'where' => 'civicrm_msg_template.pdf_format_id', 'table_name' => 'civicrm_msg_template', 'entity' => 'MessageTemplate', 'bao' => 'CRM_Core_BAO_MessageTemplate', diff --git a/CRM/Core/DAO/Navigation.php b/CRM/Core/DAO/Navigation.php index 60f0c807dd..3e025a452b 100644 --- a/CRM/Core/DAO/Navigation.php +++ b/CRM/Core/DAO/Navigation.php @@ -147,6 +147,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Navigation ID'), 'required' => TRUE, + 'where' => 'civicrm_navigation.id', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -158,6 +159,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'title' => ts('Navigation Domain'), 'description' => ts('Which Domain is this navigation item for'), 'required' => TRUE, + 'where' => 'civicrm_navigation.domain_id', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -176,6 +178,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'description' => ts('Navigation Title'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_navigation.label', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -188,6 +191,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'description' => ts('Internal Name'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_navigation.name', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -200,6 +204,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'description' => ts('url in case of custom navigation link'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_navigation.url', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -213,6 +218,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'required' => FALSE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_navigation.icon', 'default' => 'NULL', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', @@ -226,6 +232,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'description' => ts('Permission for menu item'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_navigation.permission', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -238,6 +245,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'description' => ts('Permission Operator'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_navigation.permission_operator', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -248,6 +256,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Navigation parent ID'), 'description' => ts('Parent navigation item, used for grouping'), + 'where' => 'civicrm_navigation.parent_id', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -265,6 +274,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Active'), 'description' => ts('Is this navigation item active?'), + 'where' => 'civicrm_navigation.is_active', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -275,6 +285,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Use separator'), 'description' => ts('If separator needs to be added after this menu item'), + 'where' => 'civicrm_navigation.has_separator', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', @@ -285,6 +296,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Order'), 'description' => ts('Ordering of the navigation items in various blocks.'), + 'where' => 'civicrm_navigation.weight', 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', diff --git a/CRM/Core/DAO/Note.php b/CRM/Core/DAO/Note.php index 95b17c3bf8..84ecb5ba80 100644 --- a/CRM/Core/DAO/Note.php +++ b/CRM/Core/DAO/Note.php @@ -122,6 +122,7 @@ class CRM_Core_DAO_Note extends CRM_Core_DAO { 'title' => ts('Note ID'), 'description' => ts('Note ID'), 'required' => TRUE, + 'where' => 'civicrm_note.id', 'table_name' => 'civicrm_note', 'entity' => 'Note', 'bao' => 'CRM_Core_BAO_Note', @@ -135,6 +136,7 @@ class CRM_Core_DAO_Note extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_note.entity_table', 'table_name' => 'civicrm_note', 'entity' => 'Note', 'bao' => 'CRM_Core_BAO_Note', @@ -149,6 +151,7 @@ class CRM_Core_DAO_Note extends CRM_Core_DAO { 'title' => ts('Note Entity ID'), 'description' => ts('Foreign key to the referenced item.'), 'required' => TRUE, + 'where' => 'civicrm_note.entity_id', 'table_name' => 'civicrm_note', 'entity' => 'Note', 'bao' => 'CRM_Core_BAO_Note', @@ -179,6 +182,7 @@ class CRM_Core_DAO_Note extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Note Created By'), 'description' => ts('FK to Contact ID creator'), + 'where' => 'civicrm_note.contact_id', 'table_name' => 'civicrm_note', 'entity' => 'Note', 'bao' => 'CRM_Core_BAO_Note', @@ -190,6 +194,7 @@ class CRM_Core_DAO_Note extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Note Modified By'), 'description' => ts('When was this note last modified/edited'), + 'where' => 'civicrm_note.modified_date', 'table_name' => 'civicrm_note', 'entity' => 'Note', 'bao' => 'CRM_Core_BAO_Note', @@ -202,6 +207,7 @@ class CRM_Core_DAO_Note extends CRM_Core_DAO { 'description' => ts('subject of note description'), 'maxlength' => 255, 'size' => 60, + 'where' => 'civicrm_note.subject', 'table_name' => 'civicrm_note', 'entity' => 'Note', 'bao' => 'CRM_Core_BAO_Note', @@ -217,6 +223,7 @@ class CRM_Core_DAO_Note extends CRM_Core_DAO { 'description' => ts('Foreign Key to Note Privacy Level (which is an option value pair and hence an implicit FK)'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_note.privacy', 'table_name' => 'civicrm_note', 'entity' => 'Note', 'bao' => 'CRM_Core_BAO_Note', diff --git a/CRM/Core/DAO/OpenID.php b/CRM/Core/DAO/OpenID.php index f70c0eca3d..206cb5ba88 100644 --- a/CRM/Core/DAO/OpenID.php +++ b/CRM/Core/DAO/OpenID.php @@ -107,6 +107,7 @@ class CRM_Core_DAO_OpenID extends CRM_Core_DAO { 'title' => ts('Open ID identifier'), 'description' => ts('Unique OpenID ID'), 'required' => TRUE, + 'where' => 'civicrm_openid.id', 'table_name' => 'civicrm_openid', 'entity' => 'OpenID', 'bao' => 'CRM_Core_BAO_OpenID', @@ -117,6 +118,7 @@ class CRM_Core_DAO_OpenID extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('OpenID Contact'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_openid.contact_id', 'table_name' => 'civicrm_openid', 'entity' => 'OpenID', 'bao' => 'CRM_Core_BAO_OpenID', @@ -128,6 +130,7 @@ class CRM_Core_DAO_OpenID extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('OpenID Location Type'), 'description' => ts('Which Location does this email belong to.'), + 'where' => 'civicrm_openid.location_type_id', 'table_name' => 'civicrm_openid', 'entity' => 'OpenID', 'bao' => 'CRM_Core_BAO_OpenID', @@ -157,6 +160,7 @@ class CRM_Core_DAO_OpenID extends CRM_Core_DAO { 'title' => ts('Allowed to login?'), 'description' => ts('Whether or not this user is allowed to login'), 'required' => TRUE, + 'where' => 'civicrm_openid.allowed_to_login', 'default' => '0', 'table_name' => 'civicrm_openid', 'entity' => 'OpenID', @@ -168,6 +172,7 @@ class CRM_Core_DAO_OpenID extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is OpenID Primary?'), 'description' => ts('Is this the primary email for this contact and location.'), + 'where' => 'civicrm_openid.is_primary', 'default' => '0', 'table_name' => 'civicrm_openid', 'entity' => 'OpenID', diff --git a/CRM/Core/DAO/OptionGroup.php b/CRM/Core/DAO/OptionGroup.php index c65b63b9aa..fa42e8ebfc 100644 --- a/CRM/Core/DAO/OptionGroup.php +++ b/CRM/Core/DAO/OptionGroup.php @@ -106,6 +106,7 @@ class CRM_Core_DAO_OptionGroup extends CRM_Core_DAO { 'title' => ts('Option Group ID'), 'description' => ts('Option Group ID'), 'required' => TRUE, + 'where' => 'civicrm_option_group.id', 'table_name' => 'civicrm_option_group', 'entity' => 'OptionGroup', 'bao' => 'CRM_Core_BAO_OptionGroup', @@ -119,6 +120,7 @@ class CRM_Core_DAO_OptionGroup extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_option_group.name', 'table_name' => 'civicrm_option_group', 'entity' => 'OptionGroup', 'bao' => 'CRM_Core_BAO_OptionGroup', @@ -131,6 +133,7 @@ class CRM_Core_DAO_OptionGroup extends CRM_Core_DAO { 'description' => ts('Option Group title.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_option_group.title', 'table_name' => 'civicrm_option_group', 'entity' => 'OptionGroup', 'bao' => 'CRM_Core_BAO_OptionGroup', @@ -143,6 +146,7 @@ class CRM_Core_DAO_OptionGroup extends CRM_Core_DAO { 'description' => ts('Option group description.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_option_group.description', 'table_name' => 'civicrm_option_group', 'entity' => 'OptionGroup', 'bao' => 'CRM_Core_BAO_OptionGroup', @@ -155,6 +159,7 @@ class CRM_Core_DAO_OptionGroup extends CRM_Core_DAO { 'description' => ts('Option group description.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_option_group.data_type', 'table_name' => 'civicrm_option_group', 'entity' => 'OptionGroup', 'bao' => 'CRM_Core_BAO_OptionGroup', @@ -169,6 +174,7 @@ class CRM_Core_DAO_OptionGroup extends CRM_Core_DAO { 'title' => ts('Option Group Is Reserved?'), 'description' => ts('Is this a predefined system option group (i.e. it can not be deleted)?'), 'required' => TRUE, + 'where' => 'civicrm_option_group.is_reserved', 'default' => '1', 'table_name' => 'civicrm_option_group', 'entity' => 'OptionGroup', @@ -181,6 +187,7 @@ class CRM_Core_DAO_OptionGroup extends CRM_Core_DAO { 'title' => ts('Option Group Is Active?'), 'description' => ts('Is this option group active?'), 'required' => TRUE, + 'where' => 'civicrm_option_group.is_active', 'default' => '1', 'table_name' => 'civicrm_option_group', 'entity' => 'OptionGroup', @@ -193,6 +200,7 @@ class CRM_Core_DAO_OptionGroup extends CRM_Core_DAO { 'title' => ts('Option Group Is Locked'), 'description' => ts('A lock to remove the ability to add new options via the UI.'), 'required' => TRUE, + 'where' => 'civicrm_option_group.is_locked', 'default' => '0', 'table_name' => 'civicrm_option_group', 'entity' => 'OptionGroup', diff --git a/CRM/Core/DAO/OptionValue.php b/CRM/Core/DAO/OptionValue.php index e896d99355..2fb21aa4ea 100644 --- a/CRM/Core/DAO/OptionValue.php +++ b/CRM/Core/DAO/OptionValue.php @@ -191,6 +191,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'title' => ts('Option Value ID'), 'description' => ts('Option ID'), 'required' => TRUE, + 'where' => 'civicrm_option_value.id', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -202,6 +203,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'title' => ts('Option Group ID'), 'description' => ts('Group which this option belongs to.'), 'required' => TRUE, + 'where' => 'civicrm_option_value.option_group_id', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -224,6 +226,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 512, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_option_value.label', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -237,6 +240,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 512, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_option_value.value', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -251,8 +255,6 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_option_value.name', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', @@ -266,6 +268,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'description' => ts('Use to sort and/or set display properties for sub-set(s) of options within an option group. EXAMPLE: Use for college_interest field, to differentiate partners from non-partners.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_option_value.grouping', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -276,6 +279,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Filter'), 'description' => ts('Bitwise logic can be used to create subsets of options within an option_group for different uses.'), + 'where' => 'civicrm_option_value.filter', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -286,6 +290,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Option is Default?'), 'description' => ts('Is this the default option for the group?'), + 'where' => 'civicrm_option_value.is_default', 'default' => '0', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', @@ -298,6 +303,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'title' => ts('Order'), 'description' => ts('Controls display sort order.'), 'required' => TRUE, + 'where' => 'civicrm_option_value.weight', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -310,6 +316,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'description' => ts('Optional description.'), 'rows' => 8, 'cols' => 60, + 'where' => 'civicrm_option_value.description', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -323,6 +330,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Option is Header?'), 'description' => ts('Is this row simply a display header? Expected usage is to render these as OPTGROUP tags within a SELECT field list of options?'), + 'where' => 'civicrm_option_value.is_optgroup', 'default' => '0', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', @@ -334,6 +342,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Option Is Reserved?'), 'description' => ts('Is this a predefined system object?'), + 'where' => 'civicrm_option_value.is_reserved', 'default' => '0', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', @@ -345,6 +354,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Option Is Active'), 'description' => ts('Is this option active?'), + 'where' => 'civicrm_option_value.is_active', 'default' => '1', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', @@ -356,6 +366,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Option Component'), 'description' => ts('Component that this option value belongs/caters to.'), + 'where' => 'civicrm_option_value.component_id', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -375,6 +386,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Option Domain'), 'description' => ts('Which Domain is this option value for'), + 'where' => 'civicrm_option_value.domain_id', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -390,6 +402,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'name' => 'visibility_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Option Visibility'), + 'where' => 'civicrm_option_value.visibility_id', 'default' => 'NULL', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', @@ -407,6 +420,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'description' => ts('crm-i icon class'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_option_value.icon', 'default' => 'NULL', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', @@ -420,6 +434,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'description' => ts('Hex color value e.g. #ffffff'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_option_value.color', 'default' => 'NULL', 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', diff --git a/CRM/Core/DAO/Persistent.php b/CRM/Core/DAO/Persistent.php index c83bdf6505..3f56e7c693 100644 --- a/CRM/Core/DAO/Persistent.php +++ b/CRM/Core/DAO/Persistent.php @@ -85,6 +85,7 @@ class CRM_Core_DAO_Persistent extends CRM_Core_DAO { 'title' => ts('Persistent ID'), 'description' => ts('Persistent Record Id'), 'required' => TRUE, + 'where' => 'civicrm_persistent.id', 'table_name' => 'civicrm_persistent', 'entity' => 'Persistent', 'bao' => 'CRM_Core_BAO_Persistent', @@ -98,6 +99,7 @@ class CRM_Core_DAO_Persistent extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_persistent.context', 'table_name' => 'civicrm_persistent', 'entity' => 'Persistent', 'bao' => 'CRM_Core_BAO_Persistent', @@ -111,6 +113,7 @@ class CRM_Core_DAO_Persistent extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_persistent.name', 'table_name' => 'civicrm_persistent', 'entity' => 'Persistent', 'bao' => 'CRM_Core_BAO_Persistent', @@ -121,6 +124,7 @@ class CRM_Core_DAO_Persistent extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Data'), 'description' => ts('data associated with name'), + 'where' => 'civicrm_persistent.data', 'table_name' => 'civicrm_persistent', 'entity' => 'Persistent', 'bao' => 'CRM_Core_BAO_Persistent', @@ -132,6 +136,7 @@ class CRM_Core_DAO_Persistent extends CRM_Core_DAO { 'title' => ts('Is Configuration?'), 'description' => ts('Config Settings'), 'required' => TRUE, + 'where' => 'civicrm_persistent.is_config', 'default' => '0', 'table_name' => 'civicrm_persistent', 'entity' => 'Persistent', diff --git a/CRM/Core/DAO/Phone.php b/CRM/Core/DAO/Phone.php index 002ea1b93c..fce47cfc31 100644 --- a/CRM/Core/DAO/Phone.php +++ b/CRM/Core/DAO/Phone.php @@ -135,6 +135,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO { 'title' => ts('Phone ID'), 'description' => ts('Unique Phone ID'), 'required' => TRUE, + 'where' => 'civicrm_phone.id', 'table_name' => 'civicrm_phone', 'entity' => 'Phone', 'bao' => 'CRM_Core_BAO_Phone', @@ -145,6 +146,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Phone Contact'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_phone.contact_id', 'table_name' => 'civicrm_phone', 'entity' => 'Phone', 'bao' => 'CRM_Core_BAO_Phone', @@ -156,6 +158,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Phone Location Type'), 'description' => ts('Which Location does this phone belong to.'), + 'where' => 'civicrm_phone.location_type_id', 'table_name' => 'civicrm_phone', 'entity' => 'Phone', 'bao' => 'CRM_Core_BAO_Phone', @@ -174,6 +177,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Phone Primary?'), 'description' => ts('Is this the primary phone for this contact and location.'), + 'where' => 'civicrm_phone.is_primary', 'default' => '0', 'table_name' => 'civicrm_phone', 'entity' => 'Phone', @@ -185,6 +189,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Billing Phone'), 'description' => ts('Is this the billing?'), + 'where' => 'civicrm_phone.is_billing', 'default' => '0', 'table_name' => 'civicrm_phone', 'entity' => 'Phone', @@ -196,6 +201,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mobile Provider'), 'description' => ts('Which Mobile Provider does this phone belong to.'), + 'where' => 'civicrm_phone.mobile_provider_id', 'table_name' => 'civicrm_phone', 'entity' => 'Phone', 'bao' => 'CRM_Core_BAO_Phone', @@ -248,6 +254,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO { 'description' => ts('Phone number stripped of all whitespace, letters, and punctuation.'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_phone.phone_numeric', 'table_name' => 'civicrm_phone', 'entity' => 'Phone', 'bao' => 'CRM_Core_BAO_Phone', @@ -258,10 +265,8 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Phone Type'), 'description' => ts('Which type of phone does this number belongs.'), - 'export' => TRUE, 'where' => 'civicrm_phone.phone_type_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_phone', 'entity' => 'Phone', 'bao' => 'CRM_Core_BAO_Phone', diff --git a/CRM/Core/DAO/PreferencesDate.php b/CRM/Core/DAO/PreferencesDate.php index 02d3dd3554..45f75c9cc2 100644 --- a/CRM/Core/DAO/PreferencesDate.php +++ b/CRM/Core/DAO/PreferencesDate.php @@ -96,6 +96,7 @@ class CRM_Core_DAO_PreferencesDate extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Date Preference ID'), 'required' => TRUE, + 'where' => 'civicrm_preferences_date.id', 'table_name' => 'civicrm_preferences_date', 'entity' => 'PreferencesDate', 'bao' => 'CRM_Core_BAO_PreferencesDate', @@ -109,6 +110,7 @@ class CRM_Core_DAO_PreferencesDate extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_preferences_date.name', 'table_name' => 'civicrm_preferences_date', 'entity' => 'PreferencesDate', 'bao' => 'CRM_Core_BAO_PreferencesDate', @@ -121,6 +123,7 @@ class CRM_Core_DAO_PreferencesDate extends CRM_Core_DAO { 'description' => ts('Description of this date type.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_preferences_date.description', 'table_name' => 'civicrm_preferences_date', 'entity' => 'PreferencesDate', 'bao' => 'CRM_Core_BAO_PreferencesDate', @@ -132,6 +135,7 @@ class CRM_Core_DAO_PreferencesDate extends CRM_Core_DAO { 'title' => ts('Start'), 'description' => ts('The start offset relative to current year'), 'required' => TRUE, + 'where' => 'civicrm_preferences_date.start', 'table_name' => 'civicrm_preferences_date', 'entity' => 'PreferencesDate', 'bao' => 'CRM_Core_BAO_PreferencesDate', @@ -143,6 +147,7 @@ class CRM_Core_DAO_PreferencesDate extends CRM_Core_DAO { 'title' => ts('End Offset'), 'description' => ts('The end offset relative to current year, can be negative'), 'required' => TRUE, + 'where' => 'civicrm_preferences_date.end', 'table_name' => 'civicrm_preferences_date', 'entity' => 'PreferencesDate', 'bao' => 'CRM_Core_BAO_PreferencesDate', @@ -155,6 +160,7 @@ class CRM_Core_DAO_PreferencesDate extends CRM_Core_DAO { 'description' => ts('The date type'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_preferences_date.date_format', 'table_name' => 'civicrm_preferences_date', 'entity' => 'PreferencesDate', 'bao' => 'CRM_Core_BAO_PreferencesDate', @@ -167,6 +173,7 @@ class CRM_Core_DAO_PreferencesDate extends CRM_Core_DAO { 'description' => ts('time format'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_preferences_date.time_format', 'table_name' => 'civicrm_preferences_date', 'entity' => 'PreferencesDate', 'bao' => 'CRM_Core_BAO_PreferencesDate', diff --git a/CRM/Core/DAO/PrevNextCache.php b/CRM/Core/DAO/PrevNextCache.php index 3d878125a8..9af6dafa8c 100644 --- a/CRM/Core/DAO/PrevNextCache.php +++ b/CRM/Core/DAO/PrevNextCache.php @@ -94,6 +94,7 @@ class CRM_Core_DAO_PrevNextCache extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Prev Next Cache ID'), 'required' => TRUE, + 'where' => 'civicrm_prevnext_cache.id', 'table_name' => 'civicrm_prevnext_cache', 'entity' => 'PrevNextCache', 'bao' => 'CRM_Core_BAO_PrevNextCache', @@ -106,6 +107,7 @@ class CRM_Core_DAO_PrevNextCache extends CRM_Core_DAO { 'description' => ts('physical tablename for entity being joined to discount, e.g. civicrm_event'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_prevnext_cache.entity_table', 'table_name' => 'civicrm_prevnext_cache', 'entity' => 'PrevNextCache', 'bao' => 'CRM_Core_BAO_PrevNextCache', @@ -117,6 +119,7 @@ class CRM_Core_DAO_PrevNextCache extends CRM_Core_DAO { 'title' => ts('Prev Next Entity ID 1'), 'description' => ts('FK to entity table specified in entity_table column.'), 'required' => TRUE, + 'where' => 'civicrm_prevnext_cache.entity_id1', 'table_name' => 'civicrm_prevnext_cache', 'entity' => 'PrevNextCache', 'bao' => 'CRM_Core_BAO_PrevNextCache', @@ -128,6 +131,7 @@ class CRM_Core_DAO_PrevNextCache extends CRM_Core_DAO { 'title' => ts('Prev Next Entity ID 2'), 'description' => ts('FK to entity table specified in entity_table column.'), 'required' => FALSE, + 'where' => 'civicrm_prevnext_cache.entity_id2', 'table_name' => 'civicrm_prevnext_cache', 'entity' => 'PrevNextCache', 'bao' => 'CRM_Core_BAO_PrevNextCache', @@ -140,6 +144,7 @@ class CRM_Core_DAO_PrevNextCache extends CRM_Core_DAO { 'description' => ts('Unique path name for cache element of the searched item'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_prevnext_cache.cacheKey', 'table_name' => 'civicrm_prevnext_cache', 'entity' => 'PrevNextCache', 'bao' => 'CRM_Core_BAO_PrevNextCache', @@ -150,6 +155,7 @@ class CRM_Core_DAO_PrevNextCache extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Prev Next Data'), 'description' => ts('cached snapshot of the serialized data'), + 'where' => 'civicrm_prevnext_cache.data', 'table_name' => 'civicrm_prevnext_cache', 'entity' => 'PrevNextCache', 'bao' => 'CRM_Core_BAO_PrevNextCache', @@ -160,6 +166,7 @@ class CRM_Core_DAO_PrevNextCache extends CRM_Core_DAO { 'name' => 'is_selected', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Selected'), + 'where' => 'civicrm_prevnext_cache.is_selected', 'default' => '0', 'table_name' => 'civicrm_prevnext_cache', 'entity' => 'PrevNextCache', diff --git a/CRM/Core/DAO/PrintLabel.php b/CRM/Core/DAO/PrintLabel.php index 5d9e84f6c9..1f20a3825e 100644 --- a/CRM/Core/DAO/PrintLabel.php +++ b/CRM/Core/DAO/PrintLabel.php @@ -139,6 +139,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Print Label ID'), 'required' => TRUE, + 'where' => 'civicrm_print_label.id', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', 'bao' => 'CRM_Core_DAO_PrintLabel', @@ -151,6 +152,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'description' => ts('User title for for this label layout'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_print_label.title', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', 'bao' => 'CRM_Core_DAO_PrintLabel', @@ -163,6 +165,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'description' => ts('variable name/programmatic handle for this field.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_print_label.name', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', 'bao' => 'CRM_Core_DAO_PrintLabel', @@ -173,6 +176,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Description'), 'description' => ts('Description of this label layout'), + 'where' => 'civicrm_print_label.description', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', 'bao' => 'CRM_Core_DAO_PrintLabel', @@ -185,6 +189,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'description' => ts('This refers to name column of civicrm_option_value row in name_badge option group'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_print_label.label_format_name', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', 'bao' => 'CRM_Core_DAO_PrintLabel', @@ -202,6 +207,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Label Type'), 'description' => ts('Implicit FK to civicrm_option_value row in NEW label_type option group'), + 'where' => 'civicrm_print_label.label_type_id', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', 'bao' => 'CRM_Core_DAO_PrintLabel', @@ -219,6 +225,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Data'), 'description' => ts('contains json encode configurations options'), + 'where' => 'civicrm_print_label.data', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', 'bao' => 'CRM_Core_DAO_PrintLabel', @@ -230,6 +237,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Label is Default?'), 'description' => ts('Is this default?'), + 'where' => 'civicrm_print_label.is_default', 'default' => '1', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', @@ -241,6 +249,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Label Is Active?'), 'description' => ts('Is this option active?'), + 'where' => 'civicrm_print_label.is_active', 'default' => '1', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', @@ -252,6 +261,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Label Reserved?'), 'description' => ts('Is this reserved label?'), + 'where' => 'civicrm_print_label.is_reserved', 'default' => '1', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', @@ -263,6 +273,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Label Created By'), 'description' => ts('FK to civicrm_contact, who created this label layout'), + 'where' => 'civicrm_print_label.created_id', 'table_name' => 'civicrm_print_label', 'entity' => 'PrintLabel', 'bao' => 'CRM_Core_DAO_PrintLabel', diff --git a/CRM/Core/DAO/RecurringEntity.php b/CRM/Core/DAO/RecurringEntity.php index 0c08cbe365..9aed7cc925 100644 --- a/CRM/Core/DAO/RecurringEntity.php +++ b/CRM/Core/DAO/RecurringEntity.php @@ -82,6 +82,7 @@ class CRM_Core_DAO_RecurringEntity extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('ID'), 'required' => TRUE, + 'where' => 'civicrm_recurring_entity.id', 'table_name' => 'civicrm_recurring_entity', 'entity' => 'RecurringEntity', 'bao' => 'CRM_Core_BAO_RecurringEntity', @@ -93,6 +94,7 @@ class CRM_Core_DAO_RecurringEntity extends CRM_Core_DAO { 'title' => ts('Parent ID'), 'description' => ts('Recurring Entity Parent ID'), 'required' => TRUE, + 'where' => 'civicrm_recurring_entity.parent_id', 'table_name' => 'civicrm_recurring_entity', 'entity' => 'RecurringEntity', 'bao' => 'CRM_Core_BAO_RecurringEntity', @@ -103,6 +105,7 @@ class CRM_Core_DAO_RecurringEntity extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Entity ID'), 'description' => ts('Recurring Entity Child ID'), + 'where' => 'civicrm_recurring_entity.entity_id', 'table_name' => 'civicrm_recurring_entity', 'entity' => 'RecurringEntity', 'bao' => 'CRM_Core_BAO_RecurringEntity', @@ -116,6 +119,7 @@ class CRM_Core_DAO_RecurringEntity extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_recurring_entity.entity_table', 'table_name' => 'civicrm_recurring_entity', 'entity' => 'RecurringEntity', 'bao' => 'CRM_Core_BAO_RecurringEntity', @@ -127,6 +131,7 @@ class CRM_Core_DAO_RecurringEntity extends CRM_Core_DAO { 'title' => ts('Cascade Type'), 'description' => ts('1-this entity, 2-this and the following entities, 3-all the entities'), 'required' => TRUE, + 'where' => 'civicrm_recurring_entity.mode', 'default' => '1', 'table_name' => 'civicrm_recurring_entity', 'entity' => 'RecurringEntity', diff --git a/CRM/Core/DAO/Setting.php b/CRM/Core/DAO/Setting.php index 7ce962cc08..5a16f8c656 100644 --- a/CRM/Core/DAO/Setting.php +++ b/CRM/Core/DAO/Setting.php @@ -128,6 +128,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Setting ID'), 'required' => TRUE, + 'where' => 'civicrm_setting.id', 'table_name' => 'civicrm_setting', 'entity' => 'Setting', 'bao' => 'CRM_Core_BAO_Setting', @@ -140,6 +141,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO { 'description' => ts('Unique name for setting'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_setting.name', 'table_name' => 'civicrm_setting', 'entity' => 'Setting', 'bao' => 'CRM_Core_BAO_Setting', @@ -150,6 +152,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Value'), 'description' => ts('data associated with this group / name combo'), + 'where' => 'civicrm_setting.value', 'table_name' => 'civicrm_setting', 'entity' => 'Setting', 'bao' => 'CRM_Core_BAO_Setting', @@ -162,6 +165,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO { 'title' => ts('Setting Domain'), 'description' => ts('Which Domain is this menu item for'), 'required' => TRUE, + 'where' => 'civicrm_setting.domain_id', 'table_name' => 'civicrm_setting', 'entity' => 'Setting', 'bao' => 'CRM_Core_BAO_Setting', @@ -178,6 +182,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Setting Contact'), 'description' => ts('FK to Contact ID if the setting is localized to a contact'), + 'where' => 'civicrm_setting.contact_id', 'table_name' => 'civicrm_setting', 'entity' => 'Setting', 'bao' => 'CRM_Core_BAO_Setting', @@ -189,6 +194,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Domain Setting?'), 'description' => ts('Is this setting a contact specific or site wide setting?'), + 'where' => 'civicrm_setting.is_domain', 'table_name' => 'civicrm_setting', 'entity' => 'Setting', 'bao' => 'CRM_Core_BAO_Setting', @@ -199,6 +205,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Setting Component'), 'description' => ts('Component that this menu item belongs to'), + 'where' => 'civicrm_setting.component_id', 'table_name' => 'civicrm_setting', 'entity' => 'Setting', 'bao' => 'CRM_Core_BAO_Setting', @@ -218,6 +225,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Setting Created Date'), 'description' => ts('When was the setting created'), + 'where' => 'civicrm_setting.created_date', 'table_name' => 'civicrm_setting', 'entity' => 'Setting', 'bao' => 'CRM_Core_BAO_Setting', @@ -228,6 +236,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Setting Created By'), 'description' => ts('FK to civicrm_contact, who created this setting'), + 'where' => 'civicrm_setting.created_id', 'table_name' => 'civicrm_setting', 'entity' => 'Setting', 'bao' => 'CRM_Core_BAO_Setting', diff --git a/CRM/Core/DAO/StateProvince.php b/CRM/Core/DAO/StateProvince.php index 345f8eb4c0..cb0e4b98ed 100644 --- a/CRM/Core/DAO/StateProvince.php +++ b/CRM/Core/DAO/StateProvince.php @@ -93,6 +93,7 @@ class CRM_Core_DAO_StateProvince extends CRM_Core_DAO { 'title' => ts('State ID'), 'description' => ts('State/Province ID'), 'required' => TRUE, + 'where' => 'civicrm_state_province.id', 'table_name' => 'civicrm_state_province', 'entity' => 'StateProvince', 'bao' => 'CRM_Core_DAO_StateProvince', @@ -122,6 +123,7 @@ class CRM_Core_DAO_StateProvince extends CRM_Core_DAO { 'description' => ts('2-4 Character Abbreviation of State/Province'), 'maxlength' => 4, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_state_province.abbreviation', 'table_name' => 'civicrm_state_province', 'entity' => 'StateProvince', 'bao' => 'CRM_Core_DAO_StateProvince', @@ -133,6 +135,7 @@ class CRM_Core_DAO_StateProvince extends CRM_Core_DAO { 'title' => ts('Country'), 'description' => ts('ID of Country that State/Province belong'), 'required' => TRUE, + 'where' => 'civicrm_state_province.country_id', 'table_name' => 'civicrm_state_province', 'entity' => 'StateProvince', 'bao' => 'CRM_Core_DAO_StateProvince', diff --git a/CRM/Core/DAO/StatusPreference.php b/CRM/Core/DAO/StatusPreference.php index 69bdf13503..c2cd8d97d9 100644 --- a/CRM/Core/DAO/StatusPreference.php +++ b/CRM/Core/DAO/StatusPreference.php @@ -114,6 +114,7 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO { 'title' => ts('Status Preference ID'), 'description' => ts('Unique Status Preference ID'), 'required' => TRUE, + 'where' => 'civicrm_status_pref.id', 'table_name' => 'civicrm_status_pref', 'entity' => 'StatusPreference', 'bao' => 'CRM_Core_BAO_StatusPreference', @@ -125,6 +126,7 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO { 'title' => ts('Setting Domain'), 'description' => ts('Which Domain is this Status Preference for'), 'required' => TRUE, + 'where' => 'civicrm_status_pref.domain_id', 'table_name' => 'civicrm_status_pref', 'entity' => 'StatusPreference', 'bao' => 'CRM_Core_BAO_StatusPreference', @@ -146,8 +148,6 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_status_pref.name', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_status_pref', 'entity' => 'StatusPreference', @@ -161,8 +161,6 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO { 'description' => ts('expires ignore_severity. NULL never hushes.'), 'import' => TRUE, 'where' => 'civicrm_status_pref.hush_until', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_status_pref', @@ -177,8 +175,6 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO { 'description' => ts('Hush messages up to and including this severity.'), 'import' => TRUE, 'where' => 'civicrm_status_pref.ignore_severity', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '1', 'table_name' => 'civicrm_status_pref', @@ -196,6 +192,7 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO { 'description' => ts('These settings are per-check, and can\'t be compared across checks.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_status_pref.prefs', 'table_name' => 'civicrm_status_pref', 'entity' => 'StatusPreference', 'bao' => 'CRM_Core_BAO_StatusPreference', @@ -208,6 +205,7 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO { 'description' => ts('These values are per-check, and can\'t be compared across checks.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_status_pref.check_info', 'table_name' => 'civicrm_status_pref', 'entity' => 'StatusPreference', 'bao' => 'CRM_Core_BAO_StatusPreference', diff --git a/CRM/Core/DAO/SystemLog.php b/CRM/Core/DAO/SystemLog.php index 2090dd18dd..f3c7e8817f 100644 --- a/CRM/Core/DAO/SystemLog.php +++ b/CRM/Core/DAO/SystemLog.php @@ -99,6 +99,7 @@ class CRM_Core_DAO_SystemLog extends CRM_Core_DAO { 'title' => ts('System Log ID'), 'description' => ts('Primary key ID'), 'required' => TRUE, + 'where' => 'civicrm_system_log.id', 'table_name' => 'civicrm_system_log', 'entity' => 'SystemLog', 'bao' => 'CRM_Core_DAO_SystemLog', @@ -112,6 +113,7 @@ class CRM_Core_DAO_SystemLog extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_system_log.message', 'table_name' => 'civicrm_system_log', 'entity' => 'SystemLog', 'bao' => 'CRM_Core_DAO_SystemLog', @@ -122,6 +124,7 @@ class CRM_Core_DAO_SystemLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Detailed Log Data'), 'description' => ts('JSON encoded data'), + 'where' => 'civicrm_system_log.context', 'table_name' => 'civicrm_system_log', 'entity' => 'SystemLog', 'bao' => 'CRM_Core_DAO_SystemLog', @@ -134,6 +137,7 @@ class CRM_Core_DAO_SystemLog extends CRM_Core_DAO { 'description' => ts('error level per PSR3'), 'maxlength' => 9, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_system_log.level', 'default' => 'info', 'table_name' => 'civicrm_system_log', 'entity' => 'SystemLog', @@ -145,6 +149,7 @@ class CRM_Core_DAO_SystemLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TIMESTAMP, 'title' => ts('Log Timestamp'), 'description' => ts('Timestamp of when event occurred.'), + 'where' => 'civicrm_system_log.timestamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_system_log', 'entity' => 'SystemLog', @@ -156,6 +161,7 @@ class CRM_Core_DAO_SystemLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Log Contact ID'), 'description' => ts('Optional Contact ID that created the log. Not an FK as we keep this regardless'), + 'where' => 'civicrm_system_log.contact_id', 'table_name' => 'civicrm_system_log', 'entity' => 'SystemLog', 'bao' => 'CRM_Core_DAO_SystemLog', @@ -168,6 +174,7 @@ class CRM_Core_DAO_SystemLog extends CRM_Core_DAO { 'description' => ts('Optional Name of logging host'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_system_log.hostname', 'table_name' => 'civicrm_system_log', 'entity' => 'SystemLog', 'bao' => 'CRM_Core_DAO_SystemLog', diff --git a/CRM/Core/DAO/Tag.php b/CRM/Core/DAO/Tag.php index bb716b1746..0dce7bc38b 100644 --- a/CRM/Core/DAO/Tag.php +++ b/CRM/Core/DAO/Tag.php @@ -137,6 +137,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'title' => ts('Tag ID'), 'description' => ts('Tag ID'), 'required' => TRUE, + 'where' => 'civicrm_tag.id', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', 'bao' => 'CRM_Core_BAO_Tag', @@ -150,6 +151,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_tag.name', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', 'bao' => 'CRM_Core_BAO_Tag', @@ -162,6 +164,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'description' => ts('Optional verbose description of the tag.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_tag.description', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', 'bao' => 'CRM_Core_BAO_Tag', @@ -172,6 +175,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Parent Tag'), 'description' => ts('Optional parent id for this tag.'), + 'where' => 'civicrm_tag.parent_id', 'default' => 'NULL', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', @@ -184,6 +188,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Display Tag?'), 'description' => ts('Is this tag selectable / displayed'), + 'where' => 'civicrm_tag.is_selectable', 'default' => '1', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', @@ -194,6 +199,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'name' => 'is_reserved', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Reserved'), + 'where' => 'civicrm_tag.is_reserved', 'default' => '0', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', @@ -204,6 +210,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'name' => 'is_tagset', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Tagset'), + 'where' => 'civicrm_tag.is_tagset', 'default' => '0', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', @@ -216,6 +223,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'title' => ts('Used For'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_tag.used_for', 'default' => 'NULL', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', @@ -234,6 +242,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Tag Created By'), 'description' => ts('FK to civicrm_contact, who created this tag'), + 'where' => 'civicrm_tag.created_id', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', 'bao' => 'CRM_Core_BAO_Tag', @@ -247,6 +256,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'description' => ts('Hex color value e.g. #ffffff'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_tag.color', 'default' => 'NULL', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', @@ -258,6 +268,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Tag Created Date'), 'description' => ts('Date and time that tag was created.'), + 'where' => 'civicrm_tag.created_date', 'table_name' => 'civicrm_tag', 'entity' => 'Tag', 'bao' => 'CRM_Core_BAO_Tag', diff --git a/CRM/Core/DAO/Timezone.php b/CRM/Core/DAO/Timezone.php index 3b75fab089..91418a1c74 100644 --- a/CRM/Core/DAO/Timezone.php +++ b/CRM/Core/DAO/Timezone.php @@ -105,6 +105,7 @@ class CRM_Core_DAO_Timezone extends CRM_Core_DAO { 'title' => ts('Timezone ID'), 'description' => ts('Timezone Id'), 'required' => TRUE, + 'where' => 'civicrm_timezone.id', 'table_name' => 'civicrm_timezone', 'entity' => 'Timezone', 'bao' => 'CRM_Core_DAO_Timezone', @@ -117,6 +118,7 @@ class CRM_Core_DAO_Timezone extends CRM_Core_DAO { 'description' => ts('Timezone full name'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_timezone.name', 'table_name' => 'civicrm_timezone', 'entity' => 'Timezone', 'bao' => 'CRM_Core_DAO_Timezone', @@ -129,6 +131,7 @@ class CRM_Core_DAO_Timezone extends CRM_Core_DAO { 'description' => ts('ISO Code for timezone abbreviation'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_timezone.abbreviation', 'table_name' => 'civicrm_timezone', 'entity' => 'Timezone', 'bao' => 'CRM_Core_DAO_Timezone', @@ -141,6 +144,7 @@ class CRM_Core_DAO_Timezone extends CRM_Core_DAO { 'description' => ts('GMT name of the timezone'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_timezone.gmt', 'table_name' => 'civicrm_timezone', 'entity' => 'Timezone', 'bao' => 'CRM_Core_DAO_Timezone', @@ -150,6 +154,7 @@ class CRM_Core_DAO_Timezone extends CRM_Core_DAO { 'name' => 'offset', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('GMT Offset'), + 'where' => 'civicrm_timezone.offset', 'table_name' => 'civicrm_timezone', 'entity' => 'Timezone', 'bao' => 'CRM_Core_DAO_Timezone', @@ -161,6 +166,7 @@ class CRM_Core_DAO_Timezone extends CRM_Core_DAO { 'title' => ts('Country'), 'description' => ts('Country Id'), 'required' => TRUE, + 'where' => 'civicrm_timezone.country_id', 'table_name' => 'civicrm_timezone', 'entity' => 'Timezone', 'bao' => 'CRM_Core_DAO_Timezone', diff --git a/CRM/Core/DAO/UFField.php b/CRM/Core/DAO/UFField.php index 5cbd2726fa..5d6c9183e4 100644 --- a/CRM/Core/DAO/UFField.php +++ b/CRM/Core/DAO/UFField.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/UFField.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:c73a4661d33e4dde2240d6d8ac7fd2c4) + * (GenCodeChecksum:3acfd1d2bd5f1e54f8aee7f96328cb58) */ /** @@ -199,6 +199,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'title' => ts('Profile Field ID'), 'description' => ts('Unique table ID'), 'required' => TRUE, + 'where' => 'civicrm_uf_field.id', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -210,6 +211,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'title' => ts('Profile ID'), 'description' => ts('Which form does this field belong to.'), 'required' => TRUE, + 'where' => 'civicrm_uf_field.uf_group_id', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -232,6 +234,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_uf_field.field_name', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -245,6 +248,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Field Is Active'), 'description' => ts('Is this field currently shareable? If false, hide the field for all sharing contexts.'), + 'where' => 'civicrm_uf_field.is_active', 'default' => '1', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', @@ -256,6 +260,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Is View Only'), 'description' => ts('the field is view only and not editable in user forms.'), + 'where' => 'civicrm_uf_field.is_view', 'default' => '0', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', @@ -267,6 +272,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Field Is Required'), 'description' => ts('Is this field required when included in a user or registration form?'), + 'where' => 'civicrm_uf_field.is_required', 'default' => '0', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', @@ -279,6 +285,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'title' => ts('Order'), 'description' => ts('Controls field display order when user framework fields are displayed in registration and account editing forms.'), 'required' => TRUE, + 'where' => 'civicrm_uf_field.weight', 'default' => '1', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', @@ -290,6 +297,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Profile Field Post Help'), 'description' => ts('Description and/or help text to display after this field.'), + 'where' => 'civicrm_uf_field.help_post', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -300,6 +308,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Profile Field Pre Help'), 'description' => ts('Description and/or help text to display before this field.'), + 'where' => 'civicrm_uf_field.help_pre', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -312,6 +321,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'description' => ts('In what context(s) is this field visible.'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_uf_field.visibility', 'default' => 'User and User Admin Only', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', @@ -329,6 +339,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Field Is a Filter'), 'description' => ts('Is this field included as a column in the selector table?'), + 'where' => 'civicrm_uf_field.in_selector', 'default' => '0', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', @@ -340,6 +351,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Field Is Searchable'), 'description' => ts('Is this field included search form of profile?'), + 'where' => 'civicrm_uf_field.is_searchable', 'default' => '0', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', @@ -351,6 +363,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Profile Field Location Type'), 'description' => ts('Location type of this mapping, if required'), + 'where' => 'civicrm_uf_field.location_type_id', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -362,6 +375,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Profile Field Phone Type'), 'description' => ts('Phone Type Id, if required'), + 'where' => 'civicrm_uf_field.phone_type_id', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -376,6 +390,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Profile Field Website Type'), 'description' => ts('Website Type Id, if required'), + 'where' => 'civicrm_uf_field.website_type_id', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -393,6 +408,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_uf_field.label', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -405,6 +421,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'description' => ts('This field saves field type (ie individual,household.. field etc).'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_uf_field.field_type', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -415,6 +432,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Field Is Reserved'), 'description' => ts('Is this field reserved for use by some other CiviCRM functionality?'), + 'where' => 'civicrm_uf_field.is_reserved', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', 'bao' => 'CRM_Core_BAO_UFField', @@ -425,6 +443,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Field Supports Multiple'), 'description' => ts('Include in multi-record listing?'), + 'where' => 'civicrm_uf_field.is_multi_summary', 'default' => '0', 'table_name' => 'civicrm_uf_field', 'entity' => 'UFField', diff --git a/CRM/Core/DAO/UFGroup.php b/CRM/Core/DAO/UFGroup.php index c3d7c54335..290ed5b3b1 100644 --- a/CRM/Core/DAO/UFGroup.php +++ b/CRM/Core/DAO/UFGroup.php @@ -254,6 +254,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'title' => ts('Profile ID'), 'description' => ts('Unique table ID'), 'required' => TRUE, + 'where' => 'civicrm_uf_group.id', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -264,6 +265,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Is Active'), 'description' => ts('Is this form currently active? If false, hide all related fields for all sharing contexts.'), + 'where' => 'civicrm_uf_group.is_active', 'default' => '1', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -279,8 +281,6 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_uf_group.group_type', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -296,6 +296,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_uf_group.title', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -311,6 +312,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'description' => ts('Profile Form Public title'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_uf_group.frontend_title', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -326,6 +328,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'description' => ts('Optional verbose description of the profile.'), 'rows' => 2, 'cols' => 60, + 'where' => 'civicrm_uf_group.description', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -341,6 +344,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'description' => ts('Description and/or help text to display before fields in form.'), 'rows' => 4, 'cols' => 80, + 'where' => 'civicrm_uf_group.help_pre', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -356,6 +360,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'description' => ts('Description and/or help text to display after fields in form.'), 'rows' => 4, 'cols' => 80, + 'where' => 'civicrm_uf_group.help_post', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -369,6 +374,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Profile Search Limit Group'), 'description' => ts('Group id, foreign key from civicrm_group'), + 'where' => 'civicrm_uf_group.limit_listings_group_id', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -382,6 +388,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'description' => ts('Redirect to URL.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_uf_group.post_URL', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -392,6 +399,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Add Contact To Group'), 'description' => ts('foreign key to civicrm_group_id'), + 'where' => 'civicrm_uf_group.add_to_group_id', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -403,6 +411,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Show Captcha On Profile'), 'description' => ts('Should a CAPTCHA widget be included this Profile form.'), + 'where' => 'civicrm_uf_group.add_captcha', 'default' => '0', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -414,6 +423,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Map Profile'), 'description' => ts('Do we want to map results from this profile.'), + 'where' => 'civicrm_uf_group.is_map', 'default' => '0', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -425,6 +435,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Show Edit Link?'), 'description' => ts('Should edit link display in profile selector'), + 'where' => 'civicrm_uf_group.is_edit_link', 'default' => '0', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -436,6 +447,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Show Link to CMS User'), 'description' => ts('Should we display a link to the website profile in profile selector'), + 'where' => 'civicrm_uf_group.is_uf_link', 'default' => '0', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -447,6 +459,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Update on Duplicate'), 'description' => ts('Should we update the contact record if we find a duplicate'), + 'where' => 'civicrm_uf_group.is_update_dupe', 'default' => '0', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -460,6 +473,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'description' => ts('Redirect to URL when Cancle button clik .'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_uf_group.cancel_URL', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -470,6 +484,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Create CMS User?'), 'description' => ts('Should we create a cms user for this profile '), + 'where' => 'civicrm_uf_group.is_cms_user', 'default' => '0', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -480,6 +495,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'name' => 'notify', 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Notify on Profile Submit'), + 'where' => 'civicrm_uf_group.notify', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -490,6 +506,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Is Reserved'), 'description' => ts('Is this group reserved for use by some other CiviCRM functionality?'), + 'where' => 'civicrm_uf_group.is_reserved', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -502,6 +519,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'description' => ts('Name of the UF group for directly addressing it in the codebase'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_uf_group.name', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -512,6 +530,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Profile Created By'), 'description' => ts('FK to civicrm_contact, who created this UF group'), + 'where' => 'civicrm_uf_group.created_id', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -523,6 +542,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('UF Group Created Date'), 'description' => ts('Date and time this UF group was created.'), + 'where' => 'civicrm_uf_group.created_date', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -533,6 +553,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Include Proximity Search?'), 'description' => ts('Should we include proximity search feature in this profile search form?'), + 'where' => 'civicrm_uf_group.is_proximity_search', 'default' => '0', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -546,6 +567,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'description' => ts('Custom Text to display on the Cancel button when used in create or edit mode'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_uf_group.cancel_button_text', 'default' => 'NULL', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -562,6 +584,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'description' => ts('Custom Text to display on the submit button on profile edit/create screens'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_uf_group.submit_button_text', 'default' => 'NULL', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', @@ -576,6 +599,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Include Cancel Button'), 'description' => ts('Should a Cancel button be included in this Profile form.'), + 'where' => 'civicrm_uf_group.add_cancel_button', 'default' => '1', 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', diff --git a/CRM/Core/DAO/UFJoin.php b/CRM/Core/DAO/UFJoin.php index eaa94f4a9a..2f940a4d74 100644 --- a/CRM/Core/DAO/UFJoin.php +++ b/CRM/Core/DAO/UFJoin.php @@ -122,6 +122,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO { 'title' => ts('UF Join ID'), 'description' => ts('Unique table ID'), 'required' => TRUE, + 'where' => 'civicrm_uf_join.id', 'table_name' => 'civicrm_uf_join', 'entity' => 'UFJoin', 'bao' => 'CRM_Core_BAO_UFJoin', @@ -132,6 +133,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Profile Use is active'), 'description' => ts('Is this join currently active?'), + 'where' => 'civicrm_uf_join.is_active', 'default' => '1', 'table_name' => 'civicrm_uf_join', 'entity' => 'UFJoin', @@ -146,6 +148,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_uf_join.module', 'table_name' => 'civicrm_uf_join', 'entity' => 'UFJoin', 'bao' => 'CRM_Core_BAO_UFJoin', @@ -158,6 +161,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO { 'description' => ts('Name of table where item being referenced is stored. Modules which only need a single collection of uf_join instances may choose not to populate entity_table and entity_id.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_uf_join.entity_table', 'table_name' => 'civicrm_uf_join', 'entity' => 'UFJoin', 'bao' => 'CRM_Core_BAO_UFJoin', @@ -171,6 +175,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Profile Entity ID'), 'description' => ts('Foreign key to the referenced item.'), + 'where' => 'civicrm_uf_join.entity_id', 'table_name' => 'civicrm_uf_join', 'entity' => 'UFJoin', 'bao' => 'CRM_Core_BAO_UFJoin', @@ -182,6 +187,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO { 'title' => ts('Order'), 'description' => ts('Controls display order when multiple user framework groups are setup for concurrent display.'), 'required' => TRUE, + 'where' => 'civicrm_uf_join.weight', 'default' => '1', 'table_name' => 'civicrm_uf_join', 'entity' => 'UFJoin', @@ -194,6 +200,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO { 'title' => ts('Profile ID'), 'description' => ts('Which form does this field belong to.'), 'required' => TRUE, + 'where' => 'civicrm_uf_join.uf_group_id', 'table_name' => 'civicrm_uf_join', 'entity' => 'UFJoin', 'bao' => 'CRM_Core_BAO_UFJoin', @@ -213,6 +220,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Profile Use Data'), 'description' => ts('Json serialized array of data used by the ufjoin.module'), + 'where' => 'civicrm_uf_join.module_data', 'table_name' => 'civicrm_uf_join', 'entity' => 'UFJoin', 'bao' => 'CRM_Core_BAO_UFJoin', diff --git a/CRM/Core/DAO/UFMatch.php b/CRM/Core/DAO/UFMatch.php index 6b54207610..0e072cef5d 100644 --- a/CRM/Core/DAO/UFMatch.php +++ b/CRM/Core/DAO/UFMatch.php @@ -108,6 +108,7 @@ class CRM_Core_DAO_UFMatch extends CRM_Core_DAO { 'title' => ts('UF Match ID'), 'description' => ts('System generated ID.'), 'required' => TRUE, + 'where' => 'civicrm_uf_match.id', 'table_name' => 'civicrm_uf_match', 'entity' => 'UFMatch', 'bao' => 'CRM_Core_BAO_UFMatch', @@ -119,6 +120,7 @@ class CRM_Core_DAO_UFMatch extends CRM_Core_DAO { 'title' => ts('UF Match Domain ID'), 'description' => ts('Which Domain is this match entry for'), 'required' => TRUE, + 'where' => 'civicrm_uf_match.domain_id', 'table_name' => 'civicrm_uf_match', 'entity' => 'UFMatch', 'bao' => 'CRM_Core_BAO_UFMatch', @@ -136,6 +138,7 @@ class CRM_Core_DAO_UFMatch extends CRM_Core_DAO { 'title' => ts('CMS ID'), 'description' => ts('UF ID'), 'required' => TRUE, + 'where' => 'civicrm_uf_match.uf_id', 'table_name' => 'civicrm_uf_match', 'entity' => 'UFMatch', 'bao' => 'CRM_Core_BAO_UFMatch', @@ -148,6 +151,7 @@ class CRM_Core_DAO_UFMatch extends CRM_Core_DAO { 'description' => ts('UF Name'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_uf_match.uf_name', 'table_name' => 'civicrm_uf_match', 'entity' => 'UFMatch', 'bao' => 'CRM_Core_BAO_UFMatch', @@ -158,6 +162,7 @@ class CRM_Core_DAO_UFMatch extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('CiviCRM Contact ID'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_uf_match.contact_id', 'table_name' => 'civicrm_uf_match', 'entity' => 'UFMatch', 'bao' => 'CRM_Core_BAO_UFMatch', @@ -171,6 +176,7 @@ class CRM_Core_DAO_UFMatch extends CRM_Core_DAO { 'description' => ts('UI language preferred by the given user/contact'), 'maxlength' => 5, 'size' => CRM_Utils_Type::SIX, + 'where' => 'civicrm_uf_match.language', 'table_name' => 'civicrm_uf_match', 'entity' => 'UFMatch', 'bao' => 'CRM_Core_BAO_UFMatch', diff --git a/CRM/Core/DAO/Website.php b/CRM/Core/DAO/Website.php index 350f6d26ed..6976248baa 100644 --- a/CRM/Core/DAO/Website.php +++ b/CRM/Core/DAO/Website.php @@ -93,6 +93,7 @@ class CRM_Core_DAO_Website extends CRM_Core_DAO { 'title' => ts('Website ID'), 'description' => ts('Unique Website ID'), 'required' => TRUE, + 'where' => 'civicrm_website.id', 'table_name' => 'civicrm_website', 'entity' => 'Website', 'bao' => 'CRM_Core_BAO_Website', @@ -103,6 +104,7 @@ class CRM_Core_DAO_Website extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contact'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_website.contact_id', 'table_name' => 'civicrm_website', 'entity' => 'Website', 'bao' => 'CRM_Core_BAO_Website', @@ -134,6 +136,7 @@ class CRM_Core_DAO_Website extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Website Type'), 'description' => ts('Which Website type does this website belong to.'), + 'where' => 'civicrm_website.website_type_id', 'table_name' => 'civicrm_website', 'entity' => 'Website', 'bao' => 'CRM_Core_BAO_Website', diff --git a/CRM/Core/DAO/WordReplacement.php b/CRM/Core/DAO/WordReplacement.php index 3084dae9bf..dfde25755f 100644 --- a/CRM/Core/DAO/WordReplacement.php +++ b/CRM/Core/DAO/WordReplacement.php @@ -105,6 +105,7 @@ class CRM_Core_DAO_WordReplacement extends CRM_Core_DAO { 'title' => ts('Word Replacement ID'), 'description' => ts('Word replacement ID'), 'required' => TRUE, + 'where' => 'civicrm_word_replacement.id', 'table_name' => 'civicrm_word_replacement', 'entity' => 'WordReplacement', 'bao' => 'CRM_Core_BAO_WordReplacement', @@ -117,6 +118,7 @@ class CRM_Core_DAO_WordReplacement extends CRM_Core_DAO { 'description' => ts('Word which need to be replaced'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_word_replacement.find_word', 'table_name' => 'civicrm_word_replacement', 'entity' => 'WordReplacement', 'bao' => 'CRM_Core_BAO_WordReplacement', @@ -129,6 +131,7 @@ class CRM_Core_DAO_WordReplacement extends CRM_Core_DAO { 'description' => ts('Word which will replace the word in find'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_word_replacement.replace_word', 'table_name' => 'civicrm_word_replacement', 'entity' => 'WordReplacement', 'bao' => 'CRM_Core_BAO_WordReplacement', @@ -139,6 +142,7 @@ class CRM_Core_DAO_WordReplacement extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Word Replacement is Active'), 'description' => ts('Is this entry active?'), + 'where' => 'civicrm_word_replacement.is_active', 'default' => '1', 'table_name' => 'civicrm_word_replacement', 'entity' => 'WordReplacement', @@ -151,6 +155,7 @@ class CRM_Core_DAO_WordReplacement extends CRM_Core_DAO { 'title' => ts('Word Replacement Match Type'), 'maxlength' => 16, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_word_replacement.match_type', 'default' => 'wildcardMatch', 'table_name' => 'civicrm_word_replacement', 'entity' => 'WordReplacement', @@ -168,6 +173,7 @@ class CRM_Core_DAO_WordReplacement extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Word Replacement Domain ID'), 'description' => ts('FK to Domain ID. This is for Domain specific word replacement'), + 'where' => 'civicrm_word_replacement.domain_id', 'table_name' => 'civicrm_word_replacement', 'entity' => 'WordReplacement', 'bao' => 'CRM_Core_BAO_WordReplacement', diff --git a/CRM/Core/DAO/Worldregion.php b/CRM/Core/DAO/Worldregion.php index 8e297e7e2a..fc5b2eb269 100644 --- a/CRM/Core/DAO/Worldregion.php +++ b/CRM/Core/DAO/Worldregion.php @@ -64,6 +64,7 @@ class CRM_Core_DAO_Worldregion extends CRM_Core_DAO { 'title' => ts('World Region ID'), 'description' => ts('Country Id'), 'required' => TRUE, + 'where' => 'civicrm_worldregion.id', 'table_name' => 'civicrm_worldregion', 'entity' => 'Worldregion', 'bao' => 'CRM_Core_DAO_Worldregion', @@ -76,10 +77,8 @@ class CRM_Core_DAO_Worldregion extends CRM_Core_DAO { 'description' => ts('Region name to be associated with countries'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, - 'export' => TRUE, 'where' => 'civicrm_worldregion.name', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_worldregion', 'entity' => 'Worldregion', 'bao' => 'CRM_Core_DAO_Worldregion', diff --git a/CRM/Cxn/DAO/Cxn.php b/CRM/Cxn/DAO/Cxn.php index 96b240eead..7713ee953f 100644 --- a/CRM/Cxn/DAO/Cxn.php +++ b/CRM/Cxn/DAO/Cxn.php @@ -127,6 +127,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'title' => ts('Connection ID'), 'description' => ts('Connection ID'), 'required' => TRUE, + 'where' => 'civicrm_cxn.id', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', 'bao' => 'CRM_Cxn_BAO_Cxn', @@ -139,6 +140,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'description' => ts('Application GUID'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_cxn.app_guid', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', 'bao' => 'CRM_Cxn_BAO_Cxn', @@ -149,6 +151,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Application Metadata (JSON)'), 'description' => ts('Application Metadata (JSON)'), + 'where' => 'civicrm_cxn.app_meta', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', 'bao' => 'CRM_Cxn_BAO_Cxn', @@ -161,6 +164,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'description' => ts('Connection GUID'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_cxn.cxn_guid', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', 'bao' => 'CRM_Cxn_BAO_Cxn', @@ -171,6 +175,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Secret'), 'description' => ts('Shared secret'), + 'where' => 'civicrm_cxn.secret', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', 'bao' => 'CRM_Cxn_BAO_Cxn', @@ -181,6 +186,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Perm'), 'description' => ts('Permissions approved for the service (JSON)'), + 'where' => 'civicrm_cxn.perm', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', 'bao' => 'CRM_Cxn_BAO_Cxn', @@ -191,6 +197,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Options'), 'description' => ts('Options for the service (JSON)'), + 'where' => 'civicrm_cxn.options', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', 'bao' => 'CRM_Cxn_BAO_Cxn', @@ -202,6 +209,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Active'), 'description' => ts('Is connection currently enabled?'), + 'where' => 'civicrm_cxn.is_active', 'default' => '1', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', @@ -214,6 +222,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'title' => ts('Created Date'), 'description' => ts('When was the connection was created.'), 'required' => FALSE, + 'where' => 'civicrm_cxn.created_date', 'default' => 'NULL', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', @@ -226,6 +235,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'title' => ts('Modified Date'), 'description' => ts('When the connection was created or modified.'), 'required' => FALSE, + 'where' => 'civicrm_cxn.modified_date', 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', @@ -238,6 +248,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'title' => ts('Fetched Date'), 'description' => ts('The last time the application metadata was fetched.'), 'required' => FALSE, + 'where' => 'civicrm_cxn.fetched_date', 'default' => 'NULL', 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', diff --git a/CRM/Dedupe/DAO/Exception.php b/CRM/Dedupe/DAO/Exception.php index 3692a9d0ac..cfc6bc3b9a 100644 --- a/CRM/Dedupe/DAO/Exception.php +++ b/CRM/Dedupe/DAO/Exception.php @@ -87,6 +87,7 @@ class CRM_Dedupe_DAO_Exception extends CRM_Core_DAO { 'title' => ts('Dedupe Exception ID'), 'description' => ts('Unique dedupe exception id'), 'required' => TRUE, + 'where' => 'civicrm_dedupe_exception.id', 'table_name' => 'civicrm_dedupe_exception', 'entity' => 'Exception', 'bao' => 'CRM_Dedupe_DAO_Exception', @@ -98,6 +99,7 @@ class CRM_Dedupe_DAO_Exception extends CRM_Core_DAO { 'title' => ts('First Dupe Contact ID'), 'description' => ts('FK to Contact ID'), 'required' => TRUE, + 'where' => 'civicrm_dedupe_exception.contact_id1', 'table_name' => 'civicrm_dedupe_exception', 'entity' => 'Exception', 'bao' => 'CRM_Dedupe_DAO_Exception', @@ -110,6 +112,7 @@ class CRM_Dedupe_DAO_Exception extends CRM_Core_DAO { 'title' => ts('Second Dupe Contact ID'), 'description' => ts('FK to Contact ID'), 'required' => TRUE, + 'where' => 'civicrm_dedupe_exception.contact_id2', 'table_name' => 'civicrm_dedupe_exception', 'entity' => 'Exception', 'bao' => 'CRM_Dedupe_DAO_Exception', diff --git a/CRM/Dedupe/DAO/Rule.php b/CRM/Dedupe/DAO/Rule.php index b9e916d952..806185c260 100644 --- a/CRM/Dedupe/DAO/Rule.php +++ b/CRM/Dedupe/DAO/Rule.php @@ -107,6 +107,7 @@ class CRM_Dedupe_DAO_Rule extends CRM_Core_DAO { 'title' => ts('Dedupe Rule ID'), 'description' => ts('Unique dedupe rule id'), 'required' => TRUE, + 'where' => 'civicrm_dedupe_rule.id', 'table_name' => 'civicrm_dedupe_rule', 'entity' => 'Rule', 'bao' => 'CRM_Dedupe_BAO_Rule', @@ -118,6 +119,7 @@ class CRM_Dedupe_DAO_Rule extends CRM_Core_DAO { 'title' => ts('Dedupe Rule Group'), 'description' => ts('The id of the rule group this rule belongs to'), 'required' => TRUE, + 'where' => 'civicrm_dedupe_rule.dedupe_rule_group_id', 'table_name' => 'civicrm_dedupe_rule', 'entity' => 'Rule', 'bao' => 'CRM_Dedupe_BAO_Rule', @@ -132,6 +134,7 @@ class CRM_Dedupe_DAO_Rule extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_dedupe_rule.rule_table', 'table_name' => 'civicrm_dedupe_rule', 'entity' => 'Rule', 'bao' => 'CRM_Dedupe_BAO_Rule', @@ -145,6 +148,7 @@ class CRM_Dedupe_DAO_Rule extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_dedupe_rule.rule_field', 'table_name' => 'civicrm_dedupe_rule', 'entity' => 'Rule', 'bao' => 'CRM_Dedupe_BAO_Rule', @@ -155,6 +159,7 @@ class CRM_Dedupe_DAO_Rule extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Rule Length'), 'description' => ts('The length of the matching substring'), + 'where' => 'civicrm_dedupe_rule.rule_length', 'table_name' => 'civicrm_dedupe_rule', 'entity' => 'Rule', 'bao' => 'CRM_Dedupe_BAO_Rule', @@ -169,6 +174,7 @@ class CRM_Dedupe_DAO_Rule extends CRM_Core_DAO { 'title' => ts('Order'), 'description' => ts('The weight of the rule'), 'required' => TRUE, + 'where' => 'civicrm_dedupe_rule.rule_weight', 'table_name' => 'civicrm_dedupe_rule', 'entity' => 'Rule', 'bao' => 'CRM_Dedupe_BAO_Rule', diff --git a/CRM/Dedupe/DAO/RuleGroup.php b/CRM/Dedupe/DAO/RuleGroup.php index d4b0fe9ba5..505c8044dc 100644 --- a/CRM/Dedupe/DAO/RuleGroup.php +++ b/CRM/Dedupe/DAO/RuleGroup.php @@ -99,6 +99,7 @@ class CRM_Dedupe_DAO_RuleGroup extends CRM_Core_DAO { 'title' => ts('Rule Group ID'), 'description' => ts('Unique dedupe rule group id'), 'required' => TRUE, + 'where' => 'civicrm_dedupe_rule_group.id', 'table_name' => 'civicrm_dedupe_rule_group', 'entity' => 'RuleGroup', 'bao' => 'CRM_Dedupe_BAO_RuleGroup', @@ -111,6 +112,7 @@ class CRM_Dedupe_DAO_RuleGroup extends CRM_Core_DAO { 'description' => ts('The type of contacts this group applies to'), 'maxlength' => 12, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_dedupe_rule_group.contact_type', 'table_name' => 'civicrm_dedupe_rule_group', 'entity' => 'RuleGroup', 'bao' => 'CRM_Dedupe_BAO_RuleGroup', @@ -131,6 +133,7 @@ class CRM_Dedupe_DAO_RuleGroup extends CRM_Core_DAO { 'title' => ts('Threshold'), 'description' => ts('The weight threshold the sum of the rule weights has to cross to consider two contacts the same'), 'required' => TRUE, + 'where' => 'civicrm_dedupe_rule_group.threshold', 'table_name' => 'civicrm_dedupe_rule_group', 'entity' => 'RuleGroup', 'bao' => 'CRM_Dedupe_BAO_RuleGroup', @@ -147,6 +150,7 @@ class CRM_Dedupe_DAO_RuleGroup extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 12, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_dedupe_rule_group.used', 'table_name' => 'civicrm_dedupe_rule_group', 'entity' => 'RuleGroup', 'bao' => 'CRM_Dedupe_BAO_RuleGroup', @@ -165,6 +169,7 @@ class CRM_Dedupe_DAO_RuleGroup extends CRM_Core_DAO { 'description' => ts('Name of the rule group'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_dedupe_rule_group.name', 'table_name' => 'civicrm_dedupe_rule_group', 'entity' => 'RuleGroup', 'bao' => 'CRM_Dedupe_BAO_RuleGroup', @@ -177,6 +182,7 @@ class CRM_Dedupe_DAO_RuleGroup extends CRM_Core_DAO { 'description' => ts('Label of the rule group'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_dedupe_rule_group.title', 'table_name' => 'civicrm_dedupe_rule_group', 'entity' => 'RuleGroup', 'bao' => 'CRM_Dedupe_BAO_RuleGroup', @@ -190,6 +196,7 @@ class CRM_Dedupe_DAO_RuleGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Reserved?'), 'description' => ts('Is this a reserved rule - a rule group that has been optimized and cannot be changed by the admin'), + 'where' => 'civicrm_dedupe_rule_group.is_reserved', 'table_name' => 'civicrm_dedupe_rule_group', 'entity' => 'RuleGroup', 'bao' => 'CRM_Dedupe_BAO_RuleGroup', diff --git a/CRM/Event/Cart/DAO/Cart.php b/CRM/Event/Cart/DAO/Cart.php index e953400f05..893b1ba406 100644 --- a/CRM/Event/Cart/DAO/Cart.php +++ b/CRM/Event/Cart/DAO/Cart.php @@ -63,7 +63,7 @@ class CRM_Event_Cart_DAO_Cart extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'user_id', 'civicrm_contact', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); } @@ -84,6 +84,7 @@ class CRM_Event_Cart_DAO_Cart extends CRM_Core_DAO { 'title' => ts('Cart ID'), 'description' => ts('Cart Id'), 'required' => TRUE, + 'where' => 'civicrm_event_carts.id', 'table_name' => 'civicrm_event_carts', 'entity' => 'Cart', 'bao' => 'CRM_Event_Cart_BAO_Cart', @@ -94,6 +95,7 @@ class CRM_Event_Cart_DAO_Cart extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Created By'), 'description' => ts('FK to civicrm_contact who created this cart'), + 'where' => 'civicrm_event_carts.user_id', 'table_name' => 'civicrm_event_carts', 'entity' => 'Cart', 'bao' => 'CRM_Event_Cart_BAO_Cart', @@ -104,6 +106,7 @@ class CRM_Event_Cart_DAO_Cart extends CRM_Core_DAO { 'name' => 'completed', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Complete?'), + 'where' => 'civicrm_event_carts.completed', 'default' => '0', 'table_name' => 'civicrm_event_carts', 'entity' => 'Cart', diff --git a/CRM/Event/Cart/DAO/EventInCart.php b/CRM/Event/Cart/DAO/EventInCart.php index f0c31b4d31..41654c3d24 100644 --- a/CRM/Event/Cart/DAO/EventInCart.php +++ b/CRM/Event/Cart/DAO/EventInCart.php @@ -65,7 +65,7 @@ class CRM_Event_Cart_DAO_EventInCart extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_id', 'civicrm_event', 'id'); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_cart_id', 'civicrm_event_carts', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); @@ -87,6 +87,7 @@ class CRM_Event_Cart_DAO_EventInCart extends CRM_Core_DAO { 'title' => ts('Event In Cart'), 'description' => ts('Event In Cart Id'), 'required' => TRUE, + 'where' => 'civicrm_events_in_carts.id', 'table_name' => 'civicrm_events_in_carts', 'entity' => 'EventInCart', 'bao' => 'CRM_Event_Cart_BAO_EventInCart', @@ -97,6 +98,7 @@ class CRM_Event_Cart_DAO_EventInCart extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Event'), 'description' => ts('FK to Event ID'), + 'where' => 'civicrm_events_in_carts.event_id', 'table_name' => 'civicrm_events_in_carts', 'entity' => 'EventInCart', 'bao' => 'CRM_Event_Cart_BAO_EventInCart', @@ -108,6 +110,7 @@ class CRM_Event_Cart_DAO_EventInCart extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Event In Cart'), 'description' => ts('FK to Event Cart ID'), + 'where' => 'civicrm_events_in_carts.event_cart_id', 'table_name' => 'civicrm_events_in_carts', 'entity' => 'EventInCart', 'bao' => 'CRM_Event_Cart_BAO_EventInCart', diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php index 3febfd099d..f5f563ec18 100644 --- a/CRM/Event/DAO/Event.php +++ b/CRM/Event/DAO/Event.php @@ -549,6 +549,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'title' => ts('Event ID'), 'description' => ts('Event'), 'required' => TRUE, + 'where' => 'civicrm_event.id', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -564,7 +565,6 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_event.title', 'headerPattern' => '/(event.)?title$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -581,6 +581,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Brief summary of event. Text and html allowed. Displayed on Event Registration form and can be used on other CMS pages which need an event summary.'), 'rows' => 4, 'cols' => 60, + 'where' => 'civicrm_event.summary', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -596,6 +597,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Full description of event. Text and html allowed. Displayed on built-in Event Information screens.'), 'rows' => 8, 'cols' => 60, + 'where' => 'civicrm_event.description', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -609,6 +611,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Event Type'), 'description' => ts('Event Type ID.Implicit FK to civicrm_option_value where option_group = event_type.'), + 'where' => 'civicrm_event.event_type_id', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -627,6 +630,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Participant Listing'), 'description' => ts('Should we expose the participant list? Implicit FK to civicrm_option_value where option_group = participant_listing.'), + 'where' => 'civicrm_event.participant_listing_id', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -645,6 +649,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Event Public'), 'description' => ts('Public events will be included in the iCal feeds. Access to private event information may be limited using ACLs.'), + 'where' => 'civicrm_event.is_public', 'default' => '1', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -662,7 +667,6 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_event.start_date', 'headerPattern' => '/^start|(s(tart\s)?date)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -681,7 +685,6 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_event.end_date', 'headerPattern' => '/^end|(e(nd\s)?date)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -697,6 +700,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Online Registration'), 'description' => ts('If true, include registration link on Event Info page.'), + 'where' => 'civicrm_event.is_online_registration', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -713,6 +717,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Text for link to Event Registration form which is displayed on Event Information screen when is_online_registration is true.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_event.registration_link_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -726,6 +731,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Registration Start Date'), 'description' => ts('Date and time that online registration starts.'), + 'where' => 'civicrm_event.registration_start_date', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -740,6 +746,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Registration End Date'), 'description' => ts('Date and time that online registration ends.'), + 'where' => 'civicrm_event.registration_end_date', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -754,6 +761,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Max Participants'), 'description' => ts('Maximum number of registered participants to allow. After max is reached, a custom Event Full message is displayed. If NULL, allow unlimited number of participants.'), + 'where' => 'civicrm_event.max_participants', 'default' => 'NULL', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -770,6 +778,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Message to display on Event Information page and INSTEAD OF Event Registration form if maximum participants are signed up. Can include email address/info about getting on a waiting list, etc. Text and html allowed.'), 'rows' => 4, 'cols' => 60, + 'where' => 'civicrm_event.event_full_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -783,6 +792,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is this a PAID event?'), 'description' => ts('If true, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.'), + 'where' => 'civicrm_event.is_monetary', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -797,6 +807,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('Financial type assigned to paid event registrations for this event. Required if is_monetary is true.'), + 'where' => 'civicrm_event.financial_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -818,6 +829,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Payment Processors configured for this Event (if is_monetary is true)'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_event.payment_processor', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -836,6 +848,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Map Enabled'), 'description' => ts('Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?'), + 'where' => 'civicrm_event.is_map', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -850,6 +863,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Active'), 'description' => ts('Is this Event enabled or disabled/cancelled?'), + 'where' => 'civicrm_event.is_active', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -868,7 +882,6 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_event.fee_label', 'headerPattern' => '/^fee|(f(ee\s)?label)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -883,6 +896,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('show location'), 'description' => ts('If true, show event location.'), + 'where' => 'civicrm_event.is_show_location', 'default' => '1', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -897,6 +911,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Location Block ID'), 'description' => ts('FK to Location Block ID'), + 'where' => 'civicrm_event.loc_block_id', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -910,8 +925,6 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Participant role ID. Implicit FK to civicrm_option_value where option_group = participant_role.'), 'import' => TRUE, 'where' => 'civicrm_event.default_role_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '1', 'table_name' => 'civicrm_event', @@ -933,6 +946,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.'), 'rows' => 6, 'cols' => 50, + 'where' => 'civicrm_event.intro_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -948,6 +962,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.'), 'rows' => 6, 'cols' => 50, + 'where' => 'civicrm_event.footer_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -963,6 +978,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Title for Confirmation page.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_event.confirm_title', 'default' => 'NULL', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -979,6 +995,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.'), 'rows' => 6, 'cols' => 50, + 'where' => 'civicrm_event.confirm_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -994,6 +1011,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.'), 'rows' => 6, 'cols' => 50, + 'where' => 'civicrm_event.confirm_footer_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1007,6 +1025,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is confirm email'), 'description' => ts('If true, confirmation is automatically emailed to contact on successful registration.'), + 'where' => 'civicrm_event.is_email_confirm', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1023,6 +1042,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('text to include above standard event info on confirmation email. emails are text-only, so do not allow html for now'), 'rows' => 4, 'cols' => 50, + 'where' => 'civicrm_event.confirm_email_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1038,6 +1058,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('FROM email name used for confirmation emails.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_event.confirm_from_name', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1053,6 +1074,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('FROM email address used for confirmation emails.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_event.confirm_from_email', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1068,6 +1090,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('comma-separated list of email addresses to cc each time a confirmation is sent'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_event.cc_confirm', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1083,6 +1106,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('comma-separated list of email addresses to bcc each time a confirmation is sent'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_event.bcc_confirm', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1096,6 +1120,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Default Fee ID'), 'description' => ts('FK to civicrm_option_value.'), + 'where' => 'civicrm_event.default_fee_id', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1106,6 +1131,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Default Discount Fee ID'), 'description' => ts('FK to civicrm_option_value.'), + 'where' => 'civicrm_event.default_discount_fee_id', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1118,6 +1144,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Title for ThankYou page.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_event.thankyou_title', 'default' => 'NULL', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1134,6 +1161,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('ThankYou Text.'), 'rows' => 6, 'cols' => 50, + 'where' => 'civicrm_event.thankyou_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1149,6 +1177,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Footer message.'), 'rows' => 6, 'cols' => 50, + 'where' => 'civicrm_event.thankyou_footer_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1162,6 +1191,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Pay Later Allowed'), 'description' => ts('if true - allows the user to send payment directly to the org later'), + 'where' => 'civicrm_event.is_pay_later', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1176,6 +1206,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Pay Later Text'), 'description' => ts('The text displayed to the user in the main form'), + 'where' => 'civicrm_event.pay_later_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1189,6 +1220,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Pay Later Receipt Text'), 'description' => ts('The receipt sent to the user instead of the normal receipt text'), + 'where' => 'civicrm_event.pay_later_receipt', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1202,6 +1234,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Partial Payments Enabled'), 'description' => ts('is partial payment enabled for this event'), + 'where' => 'civicrm_event.is_partial_payment', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1218,6 +1251,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Initial amount label for partial payment'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_event.initial_amount_label', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1231,6 +1265,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Initial Amount Help Text'), 'description' => ts('Initial amount help text for partial payment'), + 'where' => 'civicrm_event.initial_amount_help_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1248,6 +1283,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_event.min_initial_amount', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1261,6 +1297,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Allow Multiple Registrations'), 'description' => ts('if true - allows the user to register multiple participants for event'), + 'where' => 'civicrm_event.is_multiple_registrations', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1275,6 +1312,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Maximum number of additional participants per registration'), 'description' => ts('Maximum number of additional participants that can be registered on a single booking'), + 'where' => 'civicrm_event.max_additional_participants', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1286,6 +1324,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Does Event allow multiple registrations from same email address?'), 'description' => ts('if true - allows the user to register multiple registrations from same email address.'), + 'where' => 'civicrm_event.allow_same_participant_emails', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1300,6 +1339,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Waitlist Enabled'), 'description' => ts('Whether the event has waitlist support.'), + 'where' => 'civicrm_event.has_waitlist', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1313,6 +1353,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Requires Approval'), 'description' => ts('Whether participants require approval before they can finish registering.'), + 'where' => 'civicrm_event.requires_approval', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1326,6 +1367,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Expiration Time'), 'description' => ts('Expire pending but unconfirmed registrations after this many hours.'), + 'where' => 'civicrm_event.expiration_time', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1339,6 +1381,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Allow Self-service Cancellation or Transfer'), 'description' => ts('Allow self service cancellation or transfer for event?'), + 'where' => 'civicrm_event.allow_selfcancelxfer', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1353,6 +1396,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Self-service Cancellation or Transfer Time'), 'description' => ts('Number of hours prior to event start date to allow self-service cancellation or transfer.'), + 'where' => 'civicrm_event.selfcancelxfer_time', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1369,6 +1413,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Text to display when the event is full, but participants can signup for a waitlist.'), 'rows' => 4, 'cols' => 60, + 'where' => 'civicrm_event.waitlist_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1384,6 +1429,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'description' => ts('Text to display when the approval is required to complete registration for an event.'), 'rows' => 4, 'cols' => 60, + 'where' => 'civicrm_event.approval_req_text', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1398,6 +1444,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'title' => ts('Is an Event Template'), 'description' => ts('whether the event has template'), 'required' => TRUE, + 'where' => 'civicrm_event.is_template', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1417,7 +1464,6 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_event.template_title', 'headerPattern' => '/(template.)?title$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1432,6 +1478,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Created By Contact ID'), 'description' => ts('FK to civicrm_contact, who created this event'), + 'where' => 'civicrm_event.created_id', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1443,6 +1490,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Event Created Date'), 'description' => ts('Date and time that event was created.'), + 'where' => 'civicrm_event.created_date', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1479,6 +1527,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Campaign'), 'description' => ts('The campaign for which this event has been created.'), + 'where' => 'civicrm_event.campaign_id', 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1498,6 +1547,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is shared through social media'), 'description' => ts('Can people share the event through social media?'), + 'where' => 'civicrm_event.is_share', 'default' => '1', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1512,6 +1562,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is the booking confirmation screen enabled?'), 'description' => ts('If false, the event booking confirmation screen gets skipped'), + 'where' => 'civicrm_event.is_confirm_enabled', 'default' => '1', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1526,6 +1577,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Parent Event ID'), 'description' => ts('Implicit FK to civicrm_event: parent event'), + 'where' => 'civicrm_event.parent_event_id', 'default' => 'NULL', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1540,6 +1592,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Subevent Slot Label ID'), 'description' => ts('Subevent slot label. Implicit FK to civicrm_option_value where option_group = conference_slot.'), + 'where' => 'civicrm_event.slot_label_id', 'default' => 'NULL', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1554,6 +1607,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Dedupe Rule'), 'description' => ts('Rule to use when matching registrations for this event'), + 'where' => 'civicrm_event.dedupe_rule_group_id', 'default' => 'NULL', 'table_name' => 'civicrm_event', 'entity' => 'Event', @@ -1575,6 +1629,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is billing block required'), 'description' => ts('if true than billing block is required this event'), + 'where' => 'civicrm_event.is_billing_required', 'default' => '0', 'table_name' => 'civicrm_event', 'entity' => 'Event', diff --git a/CRM/Event/DAO/Participant.php b/CRM/Event/DAO/Participant.php index 93be1828db..fc7aaccb38 100644 --- a/CRM/Event/DAO/Participant.php +++ b/CRM/Event/DAO/Participant.php @@ -205,7 +205,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.id', 'headerPattern' => '/(^(participant(.)?)?id$)/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', @@ -221,7 +220,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.contact_id', 'headerPattern' => '/contact(.?id)?/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', @@ -238,7 +236,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.event_id', 'headerPattern' => '/event id$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', @@ -255,7 +252,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.status_id', 'headerPattern' => '/(participant.)?(status)$/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '1', 'table_name' => 'civicrm_participant', @@ -282,7 +278,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.role_id', 'headerPattern' => '/(participant.)?(role)$/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_participant', @@ -306,7 +301,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.register_date', 'headerPattern' => '/^(r(egister\s)?date)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', @@ -327,7 +321,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.source', 'headerPattern' => '/(participant.)?(source)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', @@ -347,7 +340,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.fee_level', 'headerPattern' => '/^(f(ee\s)?level)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', @@ -361,8 +353,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'title' => ts('Test'), 'import' => TRUE, 'where' => 'civicrm_participant.is_test', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_participant', @@ -377,7 +367,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.is_pay_later', 'headerPattern' => '/(is.)?(pay(.)?later)$/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_participant', @@ -411,8 +400,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'description' => ts('FK to Participant ID'), 'import' => TRUE, 'where' => 'civicrm_participant.registered_by_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_participant', @@ -426,6 +413,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Discount ID'), 'description' => ts('FK to Discount ID'), + 'where' => 'civicrm_participant.discount_id', 'default' => 'NULL', 'table_name' => 'civicrm_participant', 'entity' => 'Participant', @@ -467,8 +455,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'description' => ts('The campaign for which this participant has been registered.'), 'import' => TRUE, 'where' => 'civicrm_participant.campaign_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', @@ -486,6 +472,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Discount Amount'), 'description' => ts('Discount Amount'), + 'where' => 'civicrm_participant.discount_amount', 'table_name' => 'civicrm_participant', 'entity' => 'Participant', 'bao' => 'CRM_Event_BAO_Participant', @@ -496,6 +483,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Event Cart ID'), 'description' => ts('FK to civicrm_event_carts'), + 'where' => 'civicrm_participant.cart_id', 'table_name' => 'civicrm_participant', 'entity' => 'Participant', 'bao' => 'CRM_Event_BAO_Participant', @@ -507,6 +495,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Must Wait on List'), 'description' => ts('On Waiting List'), + 'where' => 'civicrm_participant.must_wait', 'table_name' => 'civicrm_participant', 'entity' => 'Participant', 'bao' => 'CRM_Event_BAO_Participant', @@ -520,7 +509,6 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.transferred_to_contact_id', 'headerPattern' => '/transfer(.?id)?/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_participant', diff --git a/CRM/Event/DAO/ParticipantPayment.php b/CRM/Event/DAO/ParticipantPayment.php index 91838cbf53..39843364b0 100644 --- a/CRM/Event/DAO/ParticipantPayment.php +++ b/CRM/Event/DAO/ParticipantPayment.php @@ -87,6 +87,7 @@ class CRM_Event_DAO_ParticipantPayment extends CRM_Core_DAO { 'title' => ts('Payment ID'), 'description' => ts('Participant Payment Id'), 'required' => TRUE, + 'where' => 'civicrm_participant_payment.id', 'table_name' => 'civicrm_participant_payment', 'entity' => 'ParticipantPayment', 'bao' => 'CRM_Event_BAO_ParticipantPayment', @@ -98,6 +99,7 @@ class CRM_Event_DAO_ParticipantPayment extends CRM_Core_DAO { 'title' => ts('Participant ID'), 'description' => ts('Participant Id (FK)'), 'required' => TRUE, + 'where' => 'civicrm_participant_payment.participant_id', 'table_name' => 'civicrm_participant_payment', 'entity' => 'ParticipantPayment', 'bao' => 'CRM_Event_BAO_ParticipantPayment', @@ -110,6 +112,7 @@ class CRM_Event_DAO_ParticipantPayment extends CRM_Core_DAO { 'title' => ts('Contribution'), 'description' => ts('FK to contribution table.'), 'required' => TRUE, + 'where' => 'civicrm_participant_payment.contribution_id', 'table_name' => 'civicrm_participant_payment', 'entity' => 'ParticipantPayment', 'bao' => 'CRM_Event_BAO_ParticipantPayment', diff --git a/CRM/Event/DAO/ParticipantStatusType.php b/CRM/Event/DAO/ParticipantStatusType.php index 00c8d1def9..e04f88ced3 100644 --- a/CRM/Event/DAO/ParticipantStatusType.php +++ b/CRM/Event/DAO/ParticipantStatusType.php @@ -113,6 +113,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO { 'title' => ts('Participant Status Type ID'), 'description' => ts('unique participant status type id'), 'required' => TRUE, + 'where' => 'civicrm_participant_status_type.id', 'table_name' => 'civicrm_participant_status_type', 'entity' => 'ParticipantStatusType', 'bao' => 'CRM_Event_BAO_ParticipantStatusType', @@ -127,8 +128,6 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO { 'size' => CRM_Utils_Type::BIG, 'import' => TRUE, 'where' => 'civicrm_participant_status_type.name', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_participant_status_type', 'entity' => 'ParticipantStatusType', @@ -142,6 +141,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO { 'description' => ts('localized label for display of this status type'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_participant_status_type.label', 'table_name' => 'civicrm_participant_status_type', 'entity' => 'ParticipantStatusType', 'bao' => 'CRM_Event_BAO_ParticipantStatusType', @@ -154,6 +154,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO { 'description' => ts('the general group of status type this one belongs to'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_participant_status_type.class', 'table_name' => 'civicrm_participant_status_type', 'entity' => 'ParticipantStatusType', 'bao' => 'CRM_Event_BAO_ParticipantStatusType', @@ -170,6 +171,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Participant Status Is Reserved?>'), 'description' => ts('whether this is a status type required by the system'), + 'where' => 'civicrm_participant_status_type.is_reserved', 'table_name' => 'civicrm_participant_status_type', 'entity' => 'ParticipantStatusType', 'bao' => 'CRM_Event_BAO_ParticipantStatusType', @@ -180,6 +182,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Participant Status is Active'), 'description' => ts('whether this status type is active'), + 'where' => 'civicrm_participant_status_type.is_active', 'default' => '1', 'table_name' => 'civicrm_participant_status_type', 'entity' => 'ParticipantStatusType', @@ -191,6 +194,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Participant Status Counts?'), 'description' => ts('whether this status type is counted against event size limit'), + 'where' => 'civicrm_participant_status_type.is_counted', 'table_name' => 'civicrm_participant_status_type', 'entity' => 'ParticipantStatusType', 'bao' => 'CRM_Event_BAO_ParticipantStatusType', @@ -202,6 +206,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO { 'title' => ts('Order'), 'description' => ts('controls sort order'), 'required' => TRUE, + 'where' => 'civicrm_participant_status_type.weight', 'table_name' => 'civicrm_participant_status_type', 'entity' => 'ParticipantStatusType', 'bao' => 'CRM_Event_BAO_ParticipantStatusType', @@ -212,6 +217,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Participant Status Visibility'), 'description' => ts('whether the status type is visible to the public, an implicit foreign key to option_value.value related to the `visibility` option_group'), + 'where' => 'civicrm_participant_status_type.visibility_id', 'table_name' => 'civicrm_participant_status_type', 'entity' => 'ParticipantStatusType', 'bao' => 'CRM_Event_BAO_ParticipantStatusType', diff --git a/CRM/Financial/DAO/Currency.php b/CRM/Financial/DAO/Currency.php index 672e3ed366..f20e3c2037 100644 --- a/CRM/Financial/DAO/Currency.php +++ b/CRM/Financial/DAO/Currency.php @@ -85,6 +85,7 @@ class CRM_Financial_DAO_Currency extends CRM_Core_DAO { 'title' => ts('Currency ID'), 'description' => ts('Currency Id'), 'required' => TRUE, + 'where' => 'civicrm_currency.id', 'table_name' => 'civicrm_currency', 'entity' => 'Currency', 'bao' => 'CRM_Financial_DAO_Currency', @@ -99,8 +100,6 @@ class CRM_Financial_DAO_Currency extends CRM_Core_DAO { 'size' => CRM_Utils_Type::BIG, 'import' => TRUE, 'where' => 'civicrm_currency.name', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_currency', 'entity' => 'Currency', @@ -117,6 +116,7 @@ class CRM_Financial_DAO_Currency extends CRM_Core_DAO { 'description' => ts('Currency Symbol'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_currency.symbol', 'table_name' => 'civicrm_currency', 'entity' => 'Currency', 'bao' => 'CRM_Financial_DAO_Currency', @@ -134,8 +134,6 @@ class CRM_Financial_DAO_Currency extends CRM_Core_DAO { 'size' => CRM_Utils_Type::FOUR, 'import' => TRUE, 'where' => 'civicrm_currency.numeric_code', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_currency', 'entity' => 'Currency', @@ -149,6 +147,7 @@ class CRM_Financial_DAO_Currency extends CRM_Core_DAO { 'description' => ts('Full currency name'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_currency.full_name', 'table_name' => 'civicrm_currency', 'entity' => 'Currency', 'bao' => 'CRM_Financial_DAO_Currency', diff --git a/CRM/Financial/DAO/EntityFinancialAccount.php b/CRM/Financial/DAO/EntityFinancialAccount.php index 687db0a729..529a8d68a4 100644 --- a/CRM/Financial/DAO/EntityFinancialAccount.php +++ b/CRM/Financial/DAO/EntityFinancialAccount.php @@ -101,6 +101,7 @@ class CRM_Financial_DAO_EntityFinancialAccount extends CRM_Core_DAO { 'title' => ts('Entity Financial Account ID'), 'description' => ts('ID'), 'required' => TRUE, + 'where' => 'civicrm_entity_financial_account.id', 'table_name' => 'civicrm_entity_financial_account', 'entity' => 'EntityFinancialAccount', 'bao' => 'CRM_Financial_DAO_EntityFinancialAccount', @@ -116,8 +117,6 @@ class CRM_Financial_DAO_EntityFinancialAccount extends CRM_Core_DAO { 'size' => CRM_Utils_Type::BIG, 'import' => TRUE, 'where' => 'civicrm_entity_financial_account.entity_table', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_entity_financial_account', 'entity' => 'EntityFinancialAccount', @@ -130,6 +129,7 @@ class CRM_Financial_DAO_EntityFinancialAccount extends CRM_Core_DAO { 'title' => ts('Entity ID'), 'description' => ts('Links to an id in the entity_table, such as vid in civicrm_financial_type'), 'required' => TRUE, + 'where' => 'civicrm_entity_financial_account.entity_id', 'table_name' => 'civicrm_entity_financial_account', 'entity' => 'EntityFinancialAccount', 'bao' => 'CRM_Financial_DAO_EntityFinancialAccount', @@ -141,6 +141,7 @@ class CRM_Financial_DAO_EntityFinancialAccount extends CRM_Core_DAO { 'title' => ts('Account Relationship'), 'description' => ts('FK to a new civicrm_option_value (account_relationship)'), 'required' => TRUE, + 'where' => 'civicrm_entity_financial_account.account_relationship', 'table_name' => 'civicrm_entity_financial_account', 'entity' => 'EntityFinancialAccount', 'bao' => 'CRM_Financial_DAO_EntityFinancialAccount', @@ -159,6 +160,7 @@ class CRM_Financial_DAO_EntityFinancialAccount extends CRM_Core_DAO { 'title' => ts('Financial Account'), 'description' => ts('FK to the financial_account_id'), 'required' => TRUE, + 'where' => 'civicrm_entity_financial_account.financial_account_id', 'table_name' => 'civicrm_entity_financial_account', 'entity' => 'EntityFinancialAccount', 'bao' => 'CRM_Financial_DAO_EntityFinancialAccount', diff --git a/CRM/Financial/DAO/EntityFinancialTrxn.php b/CRM/Financial/DAO/EntityFinancialTrxn.php index dd5940494d..ba7d38c471 100644 --- a/CRM/Financial/DAO/EntityFinancialTrxn.php +++ b/CRM/Financial/DAO/EntityFinancialTrxn.php @@ -97,6 +97,7 @@ class CRM_Financial_DAO_EntityFinancialTrxn extends CRM_Core_DAO { 'title' => ts('Entity Financial Transaction ID'), 'description' => ts('ID'), 'required' => TRUE, + 'where' => 'civicrm_entity_financial_trxn.id', 'table_name' => 'civicrm_entity_financial_trxn', 'entity' => 'EntityFinancialTrxn', 'bao' => 'CRM_Financial_DAO_EntityFinancialTrxn', @@ -112,8 +113,6 @@ class CRM_Financial_DAO_EntityFinancialTrxn extends CRM_Core_DAO { 'size' => CRM_Utils_Type::BIG, 'import' => TRUE, 'where' => 'civicrm_entity_financial_trxn.entity_table', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_entity_financial_trxn', 'entity' => 'EntityFinancialTrxn', @@ -125,6 +124,7 @@ class CRM_Financial_DAO_EntityFinancialTrxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Entity ID'), 'required' => TRUE, + 'where' => 'civicrm_entity_financial_trxn.entity_id', 'table_name' => 'civicrm_entity_financial_trxn', 'entity' => 'EntityFinancialTrxn', 'bao' => 'CRM_Financial_DAO_EntityFinancialTrxn', @@ -134,6 +134,7 @@ class CRM_Financial_DAO_EntityFinancialTrxn extends CRM_Core_DAO { 'name' => 'financial_trxn_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Transaction Id'), + 'where' => 'civicrm_entity_financial_trxn.financial_trxn_id', 'table_name' => 'civicrm_entity_financial_trxn', 'entity' => 'EntityFinancialTrxn', 'bao' => 'CRM_Financial_DAO_EntityFinancialTrxn', diff --git a/CRM/Financial/DAO/FinancialAccount.php b/CRM/Financial/DAO/FinancialAccount.php index c6aaa00971..99c784aa70 100644 --- a/CRM/Financial/DAO/FinancialAccount.php +++ b/CRM/Financial/DAO/FinancialAccount.php @@ -171,6 +171,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'title' => ts('Financial Account ID'), 'description' => ts('ID'), 'required' => TRUE, + 'where' => 'civicrm_financial_account.id', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -184,6 +185,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_financial_account.name', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -194,6 +196,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contact ID'), 'description' => ts('FK to Contact ID that is responsible for the funds in this account'), + 'where' => 'civicrm_financial_account.contact_id', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -206,6 +209,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'title' => ts('Financial Account Type'), 'description' => ts('pseudo FK into civicrm_option_value.'), 'required' => TRUE, + 'where' => 'civicrm_financial_account.financial_account_type_id', 'default' => '3', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', @@ -226,10 +230,8 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'description' => ts('Optional value for mapping monies owed and received to accounting system codes.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, - 'export' => TRUE, 'where' => 'civicrm_financial_account.accounting_code', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -242,10 +244,8 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'description' => ts('Optional value for mapping account types to accounting system account categories (QuickBooks Account Type Codes for example).'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, - 'export' => TRUE, 'where' => 'civicrm_financial_account.account_type_code', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -258,6 +258,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'description' => ts('Financial Type Description.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_financial_account.description', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -268,6 +269,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Account Parent'), 'description' => ts('Parent ID in account hierarchy'), + 'where' => 'civicrm_financial_account.parent_id', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -279,6 +281,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Header Financial Account?'), 'description' => ts('Is this a header account which does not allow transactions to be posted against it directly, but only to its sub-accounts?'), + 'where' => 'civicrm_financial_account.is_header_account', 'default' => '0', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', @@ -290,6 +293,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Deductible Financial Account?'), 'description' => ts('Is this account tax-deductible?'), + 'where' => 'civicrm_financial_account.is_deductible', 'default' => '1', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', @@ -301,6 +305,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Tax Financial Account?'), 'description' => ts('Is this account for taxes?'), + 'where' => 'civicrm_financial_account.is_tax', 'default' => '0', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', @@ -316,6 +321,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 10, 8 ], + 'where' => 'civicrm_financial_account.tax_rate', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -326,6 +332,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Reserved Financial Account?'), 'description' => ts('Is this a predefined system object?'), + 'where' => 'civicrm_financial_account.is_reserved', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -336,6 +343,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Financial Account is Active'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_financial_account.is_active', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', @@ -346,6 +354,7 @@ class CRM_Financial_DAO_FinancialAccount extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Default Financial Account'), 'description' => ts('Is this account the default one (or default tax one) for its financial_account_type?'), + 'where' => 'civicrm_financial_account.is_default', 'table_name' => 'civicrm_financial_account', 'entity' => 'FinancialAccount', 'bao' => 'CRM_Financial_BAO_FinancialAccount', diff --git a/CRM/Financial/DAO/FinancialItem.php b/CRM/Financial/DAO/FinancialItem.php index d25859144d..dcbc5b4d4f 100644 --- a/CRM/Financial/DAO/FinancialItem.php +++ b/CRM/Financial/DAO/FinancialItem.php @@ -141,6 +141,7 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Item ID'), 'required' => TRUE, + 'where' => 'civicrm_financial_item.id', 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', 'bao' => 'CRM_Financial_BAO_FinancialItem', @@ -152,6 +153,7 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'title' => ts('Financial Item Created Date'), 'description' => ts('Date and time the item was created'), 'required' => TRUE, + 'where' => 'civicrm_financial_item.created_date', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', @@ -164,6 +166,7 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'title' => ts('Financial Item Transaction Date'), 'description' => ts('Date and time of the source transaction'), 'required' => TRUE, + 'where' => 'civicrm_financial_item.transaction_date', 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', 'bao' => 'CRM_Financial_BAO_FinancialItem', @@ -175,10 +178,8 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'title' => ts('Financial Item Contact ID'), 'description' => ts('FK to Contact ID of contact the item is from'), 'required' => TRUE, - 'export' => TRUE, 'where' => 'civicrm_financial_item.contact_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', 'bao' => 'CRM_Financial_BAO_FinancialItem', @@ -192,6 +193,7 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'description' => ts('Human readable description of this item, to ease display without lookup of source item.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_financial_item.description', 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', 'bao' => 'CRM_Financial_BAO_FinancialItem', @@ -207,6 +209,9 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_financial_item.amount', + 'headerPattern' => '/unit?.?amoun/i', + 'dataPattern' => '/^\d+(\.\d{2})?$/', 'default' => '0', 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', @@ -220,10 +225,8 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'description' => ts('Currency for the amount'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, - 'export' => TRUE, 'where' => 'civicrm_financial_item.currency', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', 'bao' => 'CRM_Financial_BAO_FinancialItem', @@ -243,6 +246,7 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Account ID'), 'description' => ts('FK to civicrm_financial_account'), + 'where' => 'civicrm_financial_item.financial_account_id', 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', 'bao' => 'CRM_Financial_BAO_FinancialItem', @@ -262,10 +266,8 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Item Status ID'), 'description' => ts('Payment status: test, paid, part_paid, unpaid (if empty assume unpaid)'), - 'export' => TRUE, 'where' => 'civicrm_financial_item.status_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', 'bao' => 'CRM_Financial_BAO_FinancialItem', @@ -285,6 +287,7 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'description' => ts('The table providing the source of this item such as civicrm_line_item'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_financial_item.entity_table', 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', 'bao' => 'CRM_Financial_BAO_FinancialItem', @@ -295,6 +298,7 @@ class CRM_Financial_DAO_FinancialItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Entity ID'), 'description' => ts('The specific source item that is responsible for the creation of this financial_item'), + 'where' => 'civicrm_financial_item.entity_id', 'table_name' => 'civicrm_financial_item', 'entity' => 'FinancialItem', 'bao' => 'CRM_Financial_BAO_FinancialItem', diff --git a/CRM/Financial/DAO/FinancialTrxn.php b/CRM/Financial/DAO/FinancialTrxn.php index f89106a691..1d262b411d 100644 --- a/CRM/Financial/DAO/FinancialTrxn.php +++ b/CRM/Financial/DAO/FinancialTrxn.php @@ -183,6 +183,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Transaction ID'), 'required' => TRUE, + 'where' => 'civicrm_financial_trxn.id', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -193,6 +194,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Transaction From Account'), 'description' => ts('FK to financial_account table.'), + 'where' => 'civicrm_financial_trxn.from_financial_account_id', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -212,6 +214,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Transaction To Account'), 'description' => ts('FK to financial_financial_account table.'), + 'where' => 'civicrm_financial_trxn.to_financial_account_id', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -231,6 +234,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Financial Transaction Date'), 'description' => ts('date transaction occurred'), + 'where' => 'civicrm_financial_trxn.trxn_date', 'default' => 'NULL', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', @@ -251,6 +255,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_financial_trxn.total_amount', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -265,6 +270,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_financial_trxn.fee_amount', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -279,6 +285,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_financial_trxn.net_amount', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -318,8 +325,6 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'description' => ts('Is this entry either a payment or a reversal of a payment?'), 'import' => TRUE, 'where' => 'civicrm_financial_trxn.is_payment', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_financial_trxn', @@ -334,6 +339,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'description' => ts('Transaction id supplied by external processor. This may not be unique.'), 'maxlength' => 255, 'size' => 10, + 'where' => 'civicrm_financial_trxn.trxn_id', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -349,6 +355,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'description' => ts('processor result code'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_financial_trxn.trxn_result_code', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -362,7 +369,6 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_financial_trxn.status_id', 'headerPattern' => '/status/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', @@ -378,6 +384,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Processor'), 'description' => ts('Payment Processor for this financial transaction'), + 'where' => 'civicrm_financial_trxn.payment_processor_id', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -389,6 +396,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Method'), 'description' => ts('FK to payment_instrument option group values'), + 'where' => 'civicrm_financial_trxn.payment_instrument_id', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -406,6 +414,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Card Type ID'), 'description' => ts('FK to accept_creditcard option group values'), + 'where' => 'civicrm_financial_trxn.card_type_id', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -425,6 +434,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'description' => ts('Check number'), 'maxlength' => 255, 'size' => 6, + 'where' => 'civicrm_financial_trxn.check_number', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -440,6 +450,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'description' => ts('Last 4 digits of credit card'), 'maxlength' => 4, 'size' => 4, + 'where' => 'civicrm_financial_trxn.pan_truncation', 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', diff --git a/CRM/Financial/DAO/FinancialType.php b/CRM/Financial/DAO/FinancialType.php index 611c7b6506..90a916f075 100644 --- a/CRM/Financial/DAO/FinancialType.php +++ b/CRM/Financial/DAO/FinancialType.php @@ -92,6 +92,7 @@ class CRM_Financial_DAO_FinancialType extends CRM_Core_DAO { 'title' => ts('Financial Type ID'), 'description' => ts('ID of original financial_type so you can search this table by the financial_type.id and then select the relevant version based on the timestamp'), 'required' => TRUE, + 'where' => 'civicrm_financial_type.id', 'table_name' => 'civicrm_financial_type', 'entity' => 'FinancialType', 'bao' => 'CRM_Financial_BAO_FinancialType', @@ -126,6 +127,7 @@ class CRM_Financial_DAO_FinancialType extends CRM_Core_DAO { 'description' => ts('Financial Type Description.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_financial_type.description', 'table_name' => 'civicrm_financial_type', 'entity' => 'FinancialType', 'bao' => 'CRM_Financial_BAO_FinancialType', @@ -140,6 +142,7 @@ class CRM_Financial_DAO_FinancialType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Tax Deductible?'), 'description' => ts('Is this financial type tax-deductible? If true, contributions of this type may be fully OR partially deductible - non-deductible amount is stored in the Contribution record.'), + 'where' => 'civicrm_financial_type.is_deductible', 'default' => '1', 'table_name' => 'civicrm_financial_type', 'entity' => 'FinancialType', @@ -155,6 +158,7 @@ class CRM_Financial_DAO_FinancialType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Financial Type is Reserved?'), 'description' => ts('Is this a predefined system object?'), + 'where' => 'civicrm_financial_type.is_reserved', 'table_name' => 'civicrm_financial_type', 'entity' => 'FinancialType', 'bao' => 'CRM_Financial_BAO_FinancialType', @@ -169,6 +173,7 @@ class CRM_Financial_DAO_FinancialType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Financial Type Is Active?'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_financial_type.is_active', 'table_name' => 'civicrm_financial_type', 'entity' => 'FinancialType', 'bao' => 'CRM_Financial_BAO_FinancialType', diff --git a/CRM/Financial/DAO/PaymentProcessor.php b/CRM/Financial/DAO/PaymentProcessor.php index eccbc23fc1..f3aed47352 100644 --- a/CRM/Financial/DAO/PaymentProcessor.php +++ b/CRM/Financial/DAO/PaymentProcessor.php @@ -207,6 +207,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Payment Processor ID'), 'description' => ts('Payment Processor ID'), 'required' => TRUE, + 'where' => 'civicrm_payment_processor.id', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -218,6 +219,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Payment Processor Domain'), 'description' => ts('Which Domain is this match entry for'), 'required' => TRUE, + 'where' => 'civicrm_payment_processor.domain_id', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -236,6 +238,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'description' => ts('Payment Processor Name.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_payment_processor.name', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -251,6 +254,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'description' => ts('Payment Processor Descriptive Name.'), 'maxlength' => 127, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.title', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -266,6 +270,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'description' => ts('Payment Processor Description.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.description', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -275,6 +280,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'name' => 'payment_processor_type_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Processor Type ID'), + 'where' => 'civicrm_payment_processor.payment_processor_type_id', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -291,6 +297,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Processor is Active?'), 'description' => ts('Is this processor active?'), + 'where' => 'civicrm_payment_processor.is_active', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -301,6 +308,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Processor Is Default?'), 'description' => ts('Is this processor the default?'), + 'where' => 'civicrm_payment_processor.is_default', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -311,6 +319,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Test Processor?'), 'description' => ts('Is this processor for a test site?'), + 'where' => 'civicrm_payment_processor.is_test', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -322,6 +331,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('User Name'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.user_name', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -336,6 +346,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Password'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.password', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -350,6 +361,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Signature'), 'rows' => 4, 'cols' => 40, + 'where' => 'civicrm_payment_processor.signature', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -364,6 +376,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Site URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.url_site', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -378,6 +391,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('API URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.url_api', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -392,6 +406,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Recurring Payments URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.url_recur', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -406,6 +421,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Button URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.url_button', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -420,6 +436,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Subject'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.subject', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -434,6 +451,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Suffix for PHP class name implementation'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor.class_name', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -445,6 +463,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Processor Billing Mode'), 'description' => ts('Billing Mode (deprecated)'), 'required' => TRUE, + 'where' => 'civicrm_payment_processor.billing_mode', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -455,6 +474,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Processor Supports Recurring?'), 'description' => ts('Can process recurring contributions'), + 'where' => 'civicrm_payment_processor.is_recur', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', @@ -465,6 +485,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Type'), 'description' => ts('Payment Type: Credit or Debit (deprecated)'), + 'where' => 'civicrm_payment_processor.payment_type', 'default' => '1', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', @@ -476,6 +497,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Method'), 'description' => ts('Payment Instrument ID'), + 'where' => 'civicrm_payment_processor.payment_instrument_id', 'default' => '1', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', @@ -491,6 +513,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Accepted Credit Cards'), 'description' => ts('array of accepted credit card types'), + 'where' => 'civicrm_payment_processor.accepted_credit_cards', 'default' => 'NULL', 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', diff --git a/CRM/Financial/DAO/PaymentProcessorType.php b/CRM/Financial/DAO/PaymentProcessorType.php index e5de98746e..5bad18359d 100644 --- a/CRM/Financial/DAO/PaymentProcessorType.php +++ b/CRM/Financial/DAO/PaymentProcessorType.php @@ -185,6 +185,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Payment Processor Type ID'), 'description' => ts('Payment Processor Type ID'), 'required' => TRUE, + 'where' => 'civicrm_payment_processor_type.id', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -197,6 +198,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'description' => ts('Payment Processor Name.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_payment_processor_type.name', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -209,6 +211,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'description' => ts('Payment Processor Name.'), 'maxlength' => 127, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.title', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -221,6 +224,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'description' => ts('Payment Processor Description.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.description', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -231,6 +235,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Processor Type Is Active?'), 'description' => ts('Is this processor active?'), + 'where' => 'civicrm_payment_processor_type.is_active', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -241,6 +246,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Processor Type is Default?'), 'description' => ts('Is this processor the default?'), + 'where' => 'civicrm_payment_processor_type.is_default', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -252,6 +258,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Label for User Name if used'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.user_name_label', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -263,6 +270,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Label for password'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.password_label', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -274,6 +282,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Label for Signature'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.signature_label', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -285,6 +294,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Label for Subject'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.subject_label', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -296,6 +306,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Suffix for PHP class name implementation'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.class_name', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -307,6 +318,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Default Live Site URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.url_site_default', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -318,6 +330,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Default API Site URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.url_api_default', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -329,6 +342,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Default Live Recurring Payments URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.url_recur_default', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -340,6 +354,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Default Live Button URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.url_button_default', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -351,6 +366,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Default Test Site URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.url_site_test_default', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -362,6 +378,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Default Test API URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.url_api_test_default', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -373,6 +390,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Default Test Recurring Payment URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.url_recur_test_default', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -384,6 +402,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Default Test Button URL'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_processor_type.url_button_test_default', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -395,6 +414,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'title' => ts('Billing Mode'), 'description' => ts('Billing Mode (deprecated)'), 'required' => TRUE, + 'where' => 'civicrm_payment_processor_type.billing_mode', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -411,6 +431,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Processor Type Supports Recurring?'), 'description' => ts('Can process recurring contributions'), + 'where' => 'civicrm_payment_processor_type.is_recur', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', 'bao' => 'CRM_Financial_BAO_PaymentProcessorType', @@ -421,6 +442,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Processor Type Payment Type'), 'description' => ts('Payment Type: Credit or Debit (deprecated)'), + 'where' => 'civicrm_payment_processor_type.payment_type', 'default' => '1', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', @@ -432,6 +454,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Method'), 'description' => ts('Payment Instrument ID'), + 'where' => 'civicrm_payment_processor_type.payment_instrument_id', 'default' => '1', 'table_name' => 'civicrm_payment_processor_type', 'entity' => 'PaymentProcessorType', diff --git a/CRM/Financial/DAO/PaymentToken.php b/CRM/Financial/DAO/PaymentToken.php index 923f2fb4fb..88206dd264 100644 --- a/CRM/Financial/DAO/PaymentToken.php +++ b/CRM/Financial/DAO/PaymentToken.php @@ -156,6 +156,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'title' => ts('Payment Token ID'), 'description' => ts('Payment Token ID'), 'required' => TRUE, + 'where' => 'civicrm_payment_token.id', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -167,6 +168,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'title' => ts('Contact ID'), 'description' => ts('FK to Contact ID for the owner of the token'), 'required' => TRUE, + 'where' => 'civicrm_payment_token.contact_id', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -178,6 +180,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Payment Processor ID'), 'required' => TRUE, + 'where' => 'civicrm_payment_token.payment_processor_id', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -192,6 +195,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_token.token', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -202,6 +206,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TIMESTAMP, 'title' => ts('Created Date'), 'description' => ts('Date created'), + 'where' => 'civicrm_payment_token.created_date', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', @@ -213,6 +218,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Created ID'), 'description' => ts('Contact ID of token creator'), + 'where' => 'civicrm_payment_token.created_id', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -224,6 +230,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Expiry Date'), 'description' => ts('Date this token expires'), + 'where' => 'civicrm_payment_token.expiry_date', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -236,6 +243,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'description' => ts('Email at the time of token creation. Useful for fraud forensics'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_token.email', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -248,6 +256,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'description' => ts('Billing first name at the time of token creation. Useful for fraud forensics'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_token.billing_first_name', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -260,6 +269,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'description' => ts('Billing middle name at the time of token creation. Useful for fraud forensics'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_token.billing_middle_name', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -272,6 +282,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'description' => ts('Billing last name at the time of token creation. Useful for fraud forensics'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_token.billing_last_name', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -284,6 +295,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'description' => ts('Holds the part of the card number or account details that may be retained or displayed'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_token.masked_account_number', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', @@ -296,6 +308,7 @@ class CRM_Financial_DAO_PaymentToken extends CRM_Core_DAO { 'description' => ts('IP used when creating the token. Useful for fraud forensics'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_payment_token.ip_address', 'table_name' => 'civicrm_payment_token', 'entity' => 'PaymentToken', 'bao' => 'CRM_Financial_DAO_PaymentToken', diff --git a/CRM/Friend/DAO/Friend.php b/CRM/Friend/DAO/Friend.php index 568c648d33..2d568215f0 100644 --- a/CRM/Friend/DAO/Friend.php +++ b/CRM/Friend/DAO/Friend.php @@ -131,6 +131,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'title' => ts('Friend ID'), 'description' => ts('Friend ID'), 'required' => TRUE, + 'where' => 'civicrm_tell_friend.id', 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', 'bao' => 'CRM_Friend_BAO_Friend', @@ -144,6 +145,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_tell_friend.entity_table', 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', 'bao' => 'CRM_Friend_BAO_Friend', @@ -155,6 +157,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'title' => ts('Entity ID'), 'description' => ts('Foreign key to the referenced item.'), 'required' => TRUE, + 'where' => 'civicrm_tell_friend.entity_id', 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', 'bao' => 'CRM_Friend_BAO_Friend', @@ -166,6 +169,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'title' => ts('Title'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_tell_friend.title', 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', 'bao' => 'CRM_Friend_BAO_Friend', @@ -179,6 +183,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Intro'), 'description' => ts('Introductory message to contributor or participant displayed on the Tell a Friend form.'), + 'where' => 'civicrm_tell_friend.intro', 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', 'bao' => 'CRM_Friend_BAO_Friend', @@ -192,6 +197,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Suggested Message'), 'description' => ts('Suggested message to friends, provided as default on the Tell A Friend form.'), + 'where' => 'civicrm_tell_friend.suggested_message', 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', 'bao' => 'CRM_Friend_BAO_Friend', @@ -209,8 +215,6 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_tell_friend.general_link', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', @@ -227,6 +231,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'description' => ts('Text for Tell a Friend thank you page header and HTML title.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_tell_friend.thankyou_title', 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', 'bao' => 'CRM_Friend_BAO_Friend', @@ -240,6 +245,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Thank You Text'), 'description' => ts('Thank you message displayed on success page.'), + 'where' => 'civicrm_tell_friend.thankyou_text', 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', 'bao' => 'CRM_Friend_BAO_Friend', @@ -252,6 +258,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO { 'name' => 'is_active', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Enabled?'), + 'where' => 'civicrm_tell_friend.is_active', 'table_name' => 'civicrm_tell_friend', 'entity' => 'Friend', 'bao' => 'CRM_Friend_BAO_Friend', diff --git a/CRM/Grant/DAO/Grant.php b/CRM/Grant/DAO/Grant.php index f3b0a3f414..ce4dfe0d4c 100644 --- a/CRM/Grant/DAO/Grant.php +++ b/CRM/Grant/DAO/Grant.php @@ -173,8 +173,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_grant.id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', @@ -187,10 +185,8 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'title' => ts('Contact ID'), 'description' => ts('Contact ID of contact record given grant belongs to.'), 'required' => TRUE, - 'export' => TRUE, 'where' => 'civicrm_grant.contact_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', 'bao' => 'CRM_Grant_BAO_Grant', @@ -207,8 +203,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'description' => ts('Date on which grant application was received by donor.'), 'import' => TRUE, 'where' => 'civicrm_grant.application_received_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', @@ -226,8 +220,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'description' => ts('Date on which grant decision was made.'), 'import' => TRUE, 'where' => 'civicrm_grant.decision_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', @@ -245,8 +237,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'description' => ts('Date on which grant money transfer was made.'), 'import' => TRUE, 'where' => 'civicrm_grant.money_transfer_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', @@ -264,8 +254,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'description' => ts('Date on which grant report is due.'), 'import' => TRUE, 'where' => 'civicrm_grant.grant_due_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', @@ -283,8 +271,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'description' => ts('Yes/No field stating whether grant report was received by donor.'), 'import' => TRUE, 'where' => 'civicrm_grant.grant_report_received', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', @@ -300,10 +286,8 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'title' => ts('Grant Type'), 'description' => ts('Type of grant. Implicit FK to civicrm_option_value in grant_type option_group.'), 'required' => TRUE, - 'export' => TRUE, 'where' => 'civicrm_grant.grant_type_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', 'bao' => 'CRM_Grant_BAO_Grant', @@ -328,7 +312,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { ], 'import' => TRUE, 'where' => 'civicrm_grant.amount_total', - 'headerPattern' => '', 'dataPattern' => '/^\d+(\.\d{2})?$/', 'export' => TRUE, 'table_name' => 'civicrm_grant', @@ -348,6 +331,8 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_grant.amount_requested', + 'dataPattern' => '/^\d+(\.\d{2})?$/', 'table_name' => 'civicrm_grant', 'entity' => 'Grant', 'bao' => 'CRM_Grant_BAO_Grant', @@ -367,7 +352,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { ], 'import' => TRUE, 'where' => 'civicrm_grant.amount_granted', - 'headerPattern' => '', 'dataPattern' => '/^\d+(\.\d{2})?$/', 'export' => TRUE, 'table_name' => 'civicrm_grant', @@ -386,6 +370,7 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_grant.currency', 'table_name' => 'civicrm_grant', 'entity' => 'Grant', 'bao' => 'CRM_Grant_BAO_Grant', @@ -409,8 +394,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'cols' => 60, 'import' => TRUE, 'where' => 'civicrm_grant.rationale', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', @@ -428,8 +411,6 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_grant.status_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', @@ -448,6 +429,7 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('FK to Financial Type.'), + 'where' => 'civicrm_grant.financial_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_grant', 'entity' => 'Grant', diff --git a/CRM/Mailing/DAO/BouncePattern.php b/CRM/Mailing/DAO/BouncePattern.php index 447451c0dc..efdaf7d04e 100644 --- a/CRM/Mailing/DAO/BouncePattern.php +++ b/CRM/Mailing/DAO/BouncePattern.php @@ -83,6 +83,7 @@ class CRM_Mailing_DAO_BouncePattern extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Bounce Pattern ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_bounce_pattern.id', 'table_name' => 'civicrm_mailing_bounce_pattern', 'entity' => 'BouncePattern', 'bao' => 'CRM_Mailing_BAO_BouncePattern', @@ -94,6 +95,7 @@ class CRM_Mailing_DAO_BouncePattern extends CRM_Core_DAO { 'title' => ts('Bounce Type'), 'description' => ts('Type of bounce'), 'required' => TRUE, + 'where' => 'civicrm_mailing_bounce_pattern.bounce_type_id', 'table_name' => 'civicrm_mailing_bounce_pattern', 'entity' => 'BouncePattern', 'bao' => 'CRM_Mailing_BAO_BouncePattern', @@ -107,6 +109,7 @@ class CRM_Mailing_DAO_BouncePattern extends CRM_Core_DAO { 'description' => ts('A regexp to match a message to a bounce type'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing_bounce_pattern.pattern', 'table_name' => 'civicrm_mailing_bounce_pattern', 'entity' => 'BouncePattern', 'bao' => 'CRM_Mailing_BAO_BouncePattern', diff --git a/CRM/Mailing/DAO/BounceType.php b/CRM/Mailing/DAO/BounceType.php index 134ed3302e..6819e18c51 100644 --- a/CRM/Mailing/DAO/BounceType.php +++ b/CRM/Mailing/DAO/BounceType.php @@ -75,6 +75,7 @@ class CRM_Mailing_DAO_BounceType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Bounce Type ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_bounce_type.id', 'table_name' => 'civicrm_mailing_bounce_type', 'entity' => 'BounceType', 'bao' => 'CRM_Mailing_DAO_BounceType', @@ -88,6 +89,7 @@ class CRM_Mailing_DAO_BounceType extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 24, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_mailing_bounce_type.name', 'table_name' => 'civicrm_mailing_bounce_type', 'entity' => 'BounceType', 'bao' => 'CRM_Mailing_DAO_BounceType', @@ -100,6 +102,7 @@ class CRM_Mailing_DAO_BounceType extends CRM_Core_DAO { 'description' => ts('A description of this bounce type'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing_bounce_type.description', 'table_name' => 'civicrm_mailing_bounce_type', 'entity' => 'BounceType', 'bao' => 'CRM_Mailing_DAO_BounceType', @@ -111,6 +114,7 @@ class CRM_Mailing_DAO_BounceType extends CRM_Core_DAO { 'title' => ts('Hold Threshold'), 'description' => ts('Number of bounces of this type required before the email address is put on bounce hold'), 'required' => TRUE, + 'where' => 'civicrm_mailing_bounce_type.hold_threshold', 'table_name' => 'civicrm_mailing_bounce_type', 'entity' => 'BounceType', 'bao' => 'CRM_Mailing_DAO_BounceType', diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php index e57dc5ced8..4296e1ea7d 100644 --- a/CRM/Mailing/DAO/Mailing.php +++ b/CRM/Mailing/DAO/Mailing.php @@ -371,6 +371,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing.id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -381,6 +382,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Domain'), 'description' => ts('Which site is this mailing for'), + 'where' => 'civicrm_mailing.domain_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -397,6 +399,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Header'), 'description' => ts('FK to the header component.'), + 'where' => 'civicrm_mailing.header_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -408,6 +411,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Footer'), 'description' => ts('FK to the footer component.'), + 'where' => 'civicrm_mailing.footer_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -419,6 +423,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Reply'), 'description' => ts('FK to the auto-responder component.'), + 'where' => 'civicrm_mailing.reply_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -430,6 +435,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Unsubscribe'), 'description' => ts('FK to the unsubscribe component.'), + 'where' => 'civicrm_mailing.unsubscribe_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -440,6 +446,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'name' => 'resubscribe_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Resubscribe'), + 'where' => 'civicrm_mailing.resubscribe_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -450,6 +457,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Opt Out'), 'description' => ts('FK to the opt-out component.'), + 'where' => 'civicrm_mailing.optout_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -463,6 +471,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('Mailing Name.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing.name', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -478,6 +487,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('differentiate between standalone mailings, A/B tests, and A/B final-winner'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_mailing.mailing_type', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -496,6 +506,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('From Header of mailing'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing.from_name', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -511,6 +522,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('From Email of mailing'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing.from_email', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -526,6 +538,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('Reply-To Email of mailing'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing.replyto_email', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -542,6 +555,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_mailing.template_type', 'default' => 'traditional', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -556,6 +570,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Template Options (JSON)'), 'description' => ts('Advanced options used by the email templating system. (JSON encoded)'), + 'where' => 'civicrm_mailing.template_options', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -568,6 +583,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('Subject of mailing'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing.subject', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -581,6 +597,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Body Text'), 'description' => ts('Body of the mailing in text format.'), + 'where' => 'civicrm_mailing.body_text', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -591,6 +608,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Body Html'), 'description' => ts('Body of the mailing in html format.'), + 'where' => 'civicrm_mailing.body_html', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -601,6 +619,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Url Tracking'), 'description' => ts('Should we track URL click-throughs for this mailing?'), + 'where' => 'civicrm_mailing.url_tracking', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -614,6 +633,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Forward Replies'), 'description' => ts('Should we forward replies back to the author?'), + 'where' => 'civicrm_mailing.forward_replies', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -627,6 +647,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Auto Responder'), 'description' => ts('Should we enable the auto-responder?'), + 'where' => 'civicrm_mailing.auto_responder', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -640,6 +661,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Track Mailing?'), 'description' => ts('Should we track when recipients open/read this mailing?'), + 'where' => 'civicrm_mailing.open_tracking', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -650,6 +672,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Mailing Completed'), 'description' => ts('Has at least one job associated with this mailing finished?'), + 'where' => 'civicrm_mailing.is_completed', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -663,6 +686,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Message Template'), 'description' => ts('FK to the message template.'), + 'where' => 'civicrm_mailing.msg_template_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -674,6 +698,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Override Verp'), 'description' => ts('Should we overrite VERP address in Reply-To'), + 'where' => 'civicrm_mailing.override_verp', 'default' => '0', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -688,6 +713,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Creator'), 'description' => ts('FK to Contact ID who first created this mailing'), + 'where' => 'civicrm_mailing.created_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -700,6 +726,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'title' => ts('Mailing Created Date'), 'description' => ts('Date and time this mailing was created.'), 'required' => FALSE, + 'where' => 'civicrm_mailing.created_date', 'default' => 'NULL', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -716,10 +743,8 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'title' => ts('Modified Date'), 'description' => ts('When the mailing (or closely related entity) was created or modified or deleted.'), 'required' => FALSE, - 'export' => TRUE, 'where' => 'civicrm_mailing.modified_date', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -731,6 +756,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Scheduled By'), 'description' => ts('FK to Contact ID who scheduled this mailing'), + 'where' => 'civicrm_mailing.scheduled_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -743,6 +769,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'title' => ts('Mailing Scheduled Date'), 'description' => ts('Date and time this mailing was scheduled.'), 'required' => FALSE, + 'where' => 'civicrm_mailing.scheduled_date', 'default' => 'NULL', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -758,6 +785,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Approved By'), 'description' => ts('FK to Contact ID who approved this mailing'), + 'where' => 'civicrm_mailing.approver_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -770,6 +798,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'title' => ts('Mailing Approved Date'), 'description' => ts('Date and time this mailing was approved.'), 'required' => FALSE, + 'where' => 'civicrm_mailing.approval_date', 'default' => 'NULL', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -785,6 +814,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Approval Status'), 'description' => ts('The status of this mailing. Values: none, approved, rejected'), + 'where' => 'civicrm_mailing.approval_status_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -802,6 +832,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_LONGTEXT, 'title' => ts('Approval Note'), 'description' => ts('Note behind the decision.'), + 'where' => 'civicrm_mailing.approval_note', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -815,6 +846,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Mailing Archived?'), 'description' => ts('Is this mailing archived?'), + 'where' => 'civicrm_mailing.is_archived', 'default' => '0', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -831,6 +863,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('In what context(s) is the mailing contents visible (online viewing)'), 'maxlength' => 40, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_mailing.visibility', 'default' => 'Public Pages', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -848,6 +881,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Campaign'), 'description' => ts('The campaign for which this mailing has been initiated.'), + 'where' => 'civicrm_mailing.campaign_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -867,6 +901,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('No Duplicate emails?'), 'description' => ts('Remove duplicate emails?'), + 'where' => 'civicrm_mailing.dedupe_email', 'default' => '0', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -880,6 +915,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'name' => 'sms_provider_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing SMS Provider'), + 'where' => 'civicrm_mailing.sms_provider_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -896,6 +932,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('Key for validating requests related to this mailing.'), 'maxlength' => 16, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_mailing.hash', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -906,6 +943,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Location Type'), 'description' => ts('With email_selection_method, determines which email address to use'), + 'where' => 'civicrm_mailing.location_type_id', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -924,6 +962,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('With location_type_id, determine how to choose the email address to use.'), 'maxlength' => 20, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_mailing.email_selection_method', 'default' => 'automatic', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', @@ -940,6 +979,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('Language of the content of the mailing. Useful for tokens.'), 'maxlength' => 5, 'size' => CRM_Utils_Type::SIX, + 'where' => 'civicrm_mailing.language', 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', diff --git a/CRM/Mailing/DAO/MailingAB.php b/CRM/Mailing/DAO/MailingAB.php index 9d4ac8bff0..3e42d261d0 100644 --- a/CRM/Mailing/DAO/MailingAB.php +++ b/CRM/Mailing/DAO/MailingAB.php @@ -154,6 +154,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('MailingAB ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_abtest.id', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -166,6 +167,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'description' => ts('Name of the A/B test'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing_abtest.name', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -178,6 +180,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'description' => ts('Status'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_mailing_abtest.status', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -191,6 +194,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing ID (A)'), 'description' => ts('The first experimental mailing ("A" condition)'), + 'where' => 'civicrm_mailing_abtest.mailing_id_a', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -201,6 +205,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing ID (B)'), 'description' => ts('The second experimental mailing ("B" condition)'), + 'where' => 'civicrm_mailing_abtest.mailing_id_b', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -211,6 +216,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing ID (C)'), 'description' => ts('The final, general mailing (derived from A or B)'), + 'where' => 'civicrm_mailing_abtest.mailing_id_c', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -221,6 +227,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Domain ID'), 'description' => ts('Which site is this mailing for'), + 'where' => 'civicrm_mailing_abtest.domain_id', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -232,6 +239,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'title' => ts('Testing Criteria'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_mailing_abtest.testing_criteria', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -246,6 +254,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'title' => ts('Winner Criteria'), 'maxlength' => 32, 'size' => CRM_Utils_Type::MEDIUM, + 'where' => 'civicrm_mailing_abtest.winner_criteria', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -261,6 +270,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'description' => ts('What specific url to track'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing_abtest.specific_url', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -271,6 +281,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Declaration Time'), 'description' => ts('In how much time to declare winner'), + 'where' => 'civicrm_mailing_abtest.declare_winning_time', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -280,6 +291,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'name' => 'group_percentage', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Group Percentage'), + 'where' => 'civicrm_mailing_abtest.group_percentage', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -290,6 +302,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('AB Test Created By'), 'description' => ts('FK to Contact ID'), + 'where' => 'civicrm_mailing_abtest.created_id', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', 'bao' => 'CRM_Mailing_BAO_MailingAB', @@ -302,6 +315,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO { 'title' => ts('AB Test Created Date'), 'description' => ts('When was this item created'), 'required' => FALSE, + 'where' => 'civicrm_mailing_abtest.created_date', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_abtest', 'entity' => 'MailingAB', diff --git a/CRM/Mailing/DAO/MailingComponent.php b/CRM/Mailing/DAO/MailingComponent.php index 6f2ba81e31..f4e6b01ac4 100644 --- a/CRM/Mailing/DAO/MailingComponent.php +++ b/CRM/Mailing/DAO/MailingComponent.php @@ -101,6 +101,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Component ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_component.id', 'table_name' => 'civicrm_mailing_component', 'entity' => 'MailingComponent', 'bao' => 'CRM_Mailing_BAO_MailingComponent', @@ -113,6 +114,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO { 'description' => ts('The name of this component'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_mailing_component.name', 'table_name' => 'civicrm_mailing_component', 'entity' => 'MailingComponent', 'bao' => 'CRM_Mailing_BAO_MailingComponent', @@ -125,6 +127,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO { 'description' => ts('Type of Component.'), 'maxlength' => 12, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_mailing_component.component_type', 'table_name' => 'civicrm_mailing_component', 'entity' => 'MailingComponent', 'bao' => 'CRM_Mailing_BAO_MailingComponent', @@ -142,6 +145,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO { 'title' => ts('Subject'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing_component.subject', 'table_name' => 'civicrm_mailing_component', 'entity' => 'MailingComponent', 'bao' => 'CRM_Mailing_BAO_MailingComponent', @@ -154,6 +158,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO { 'description' => ts('Body of the component in html format.'), 'rows' => 8, 'cols' => 80, + 'where' => 'civicrm_mailing_component.body_html', 'table_name' => 'civicrm_mailing_component', 'entity' => 'MailingComponent', 'bao' => 'CRM_Mailing_BAO_MailingComponent', @@ -169,6 +174,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO { 'description' => ts('Body of the component in text format.'), 'rows' => 8, 'cols' => 80, + 'where' => 'civicrm_mailing_component.body_text', 'table_name' => 'civicrm_mailing_component', 'entity' => 'MailingComponent', 'bao' => 'CRM_Mailing_BAO_MailingComponent', @@ -182,6 +188,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Mailing Component is Default?'), 'description' => ts('Is this the default component for this component_type?'), + 'where' => 'civicrm_mailing_component.is_default', 'default' => '0', 'table_name' => 'civicrm_mailing_component', 'entity' => 'MailingComponent', @@ -193,6 +200,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Mailing Component Is Active?'), 'description' => ts('Is this property active?'), + 'where' => 'civicrm_mailing_component.is_active', 'table_name' => 'civicrm_mailing_component', 'entity' => 'MailingComponent', 'bao' => 'CRM_Mailing_BAO_MailingComponent', diff --git a/CRM/Mailing/DAO/MailingGroup.php b/CRM/Mailing/DAO/MailingGroup.php index 46f6a40333..dc3dec5d07 100644 --- a/CRM/Mailing/DAO/MailingGroup.php +++ b/CRM/Mailing/DAO/MailingGroup.php @@ -112,6 +112,7 @@ class CRM_Mailing_DAO_MailingGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Group ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_group.id', 'table_name' => 'civicrm_mailing_group', 'entity' => 'MailingGroup', 'bao' => 'CRM_Mailing_DAO_MailingGroup', @@ -123,6 +124,7 @@ class CRM_Mailing_DAO_MailingGroup extends CRM_Core_DAO { 'title' => ts('Mailing'), 'description' => ts('The ID of a previous mailing to include/exclude recipients.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_group.mailing_id', 'table_name' => 'civicrm_mailing_group', 'entity' => 'MailingGroup', 'bao' => 'CRM_Mailing_DAO_MailingGroup', @@ -136,6 +138,7 @@ class CRM_Mailing_DAO_MailingGroup extends CRM_Core_DAO { 'description' => ts('Are the members of the group included or excluded?.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_mailing_group.group_type', 'table_name' => 'civicrm_mailing_group', 'entity' => 'MailingGroup', 'bao' => 'CRM_Mailing_DAO_MailingGroup', @@ -155,6 +158,7 @@ class CRM_Mailing_DAO_MailingGroup extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_mailing_group.entity_table', 'table_name' => 'civicrm_mailing_group', 'entity' => 'MailingGroup', 'bao' => 'CRM_Mailing_DAO_MailingGroup', @@ -169,6 +173,7 @@ class CRM_Mailing_DAO_MailingGroup extends CRM_Core_DAO { 'title' => ts('Mailing Group Entity'), 'description' => ts('Foreign key to the referenced item.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_group.entity_id', 'table_name' => 'civicrm_mailing_group', 'entity' => 'MailingGroup', 'bao' => 'CRM_Mailing_DAO_MailingGroup', @@ -179,6 +184,7 @@ class CRM_Mailing_DAO_MailingGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Group Search'), 'description' => ts('The filtering search. custom search id or -1 for civicrm api search'), + 'where' => 'civicrm_mailing_group.search_id', 'table_name' => 'civicrm_mailing_group', 'entity' => 'MailingGroup', 'bao' => 'CRM_Mailing_DAO_MailingGroup', @@ -189,6 +195,7 @@ class CRM_Mailing_DAO_MailingGroup extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Mailing Group Search Arguments'), 'description' => ts('The arguments to be sent to the search function'), + 'where' => 'civicrm_mailing_group.search_args', 'table_name' => 'civicrm_mailing_group', 'entity' => 'MailingGroup', 'bao' => 'CRM_Mailing_DAO_MailingGroup', diff --git a/CRM/Mailing/DAO/MailingJob.php b/CRM/Mailing/DAO/MailingJob.php index a88d4abcf6..cbbce73c40 100644 --- a/CRM/Mailing/DAO/MailingJob.php +++ b/CRM/Mailing/DAO/MailingJob.php @@ -140,6 +140,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Job ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_job.id', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', @@ -151,6 +152,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'title' => ts('Mailing'), 'description' => ts('The ID of the mailing this Job will send.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_job.mailing_id', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', @@ -163,6 +165,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'title' => ts('Mailing Scheduled Date'), 'description' => ts('date on which this job was scheduled.'), 'required' => FALSE, + 'where' => 'civicrm_mailing_job.scheduled_date', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', @@ -175,6 +178,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'title' => ts('Mailing Job Start Date'), 'description' => ts('date on which this job was started.'), 'required' => FALSE, + 'where' => 'civicrm_mailing_job.start_date', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', @@ -187,6 +191,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'title' => ts('Mailing Job End Date'), 'description' => ts('date on which this job ended.'), 'required' => FALSE, + 'where' => 'civicrm_mailing_job.end_date', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', @@ -200,6 +205,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'description' => ts('The state of this job'), 'maxlength' => 12, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_mailing_job.status', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', @@ -216,6 +222,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Mailing Job Is Test?'), 'description' => ts('Is this job for a test mail?'), + 'where' => 'civicrm_mailing_job.is_test', 'default' => '0', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', @@ -229,6 +236,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'description' => ts('Type of mailling job: null | child '), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing_job.job_type', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', @@ -239,6 +247,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Job Parent'), 'description' => ts('Parent job id'), + 'where' => 'civicrm_mailing_job.parent_id', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', @@ -251,6 +260,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Job Offset'), 'description' => ts('Offset of the child job'), + 'where' => 'civicrm_mailing_job.job_offset', 'default' => '0', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', @@ -262,6 +272,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Job Limit'), 'description' => ts('Queue size limit for each child job'), + 'where' => 'civicrm_mailing_job.job_limit', 'default' => '0', 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', diff --git a/CRM/Mailing/DAO/Recipients.php b/CRM/Mailing/DAO/Recipients.php index 3b10af904a..4f13756861 100644 --- a/CRM/Mailing/DAO/Recipients.php +++ b/CRM/Mailing/DAO/Recipients.php @@ -100,6 +100,7 @@ class CRM_Mailing_DAO_Recipients extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Recipients ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_recipients.id', 'table_name' => 'civicrm_mailing_recipients', 'entity' => 'Recipients', 'bao' => 'CRM_Mailing_BAO_Recipients', @@ -111,6 +112,7 @@ class CRM_Mailing_DAO_Recipients extends CRM_Core_DAO { 'title' => ts('Mailing'), 'description' => ts('The ID of the mailing this Job will send.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_recipients.mailing_id', 'table_name' => 'civicrm_mailing_recipients', 'entity' => 'Recipients', 'bao' => 'CRM_Mailing_BAO_Recipients', @@ -123,6 +125,7 @@ class CRM_Mailing_DAO_Recipients extends CRM_Core_DAO { 'title' => ts('Mailing Recipient'), 'description' => ts('FK to Contact'), 'required' => TRUE, + 'where' => 'civicrm_mailing_recipients.contact_id', 'table_name' => 'civicrm_mailing_recipients', 'entity' => 'Recipients', 'bao' => 'CRM_Mailing_BAO_Recipients', @@ -134,6 +137,7 @@ class CRM_Mailing_DAO_Recipients extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Recipient Email'), 'description' => ts('FK to Email'), + 'where' => 'civicrm_mailing_recipients.email_id', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_recipients', 'entity' => 'Recipients', @@ -146,6 +150,7 @@ class CRM_Mailing_DAO_Recipients extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Recipient Phone'), 'description' => ts('FK to Phone'), + 'where' => 'civicrm_mailing_recipients.phone_id', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_recipients', 'entity' => 'Recipients', diff --git a/CRM/Mailing/DAO/Spool.php b/CRM/Mailing/DAO/Spool.php index bdc28b428d..ffde488e26 100644 --- a/CRM/Mailing/DAO/Spool.php +++ b/CRM/Mailing/DAO/Spool.php @@ -111,6 +111,7 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Spool ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_spool.id', 'table_name' => 'civicrm_mailing_spool', 'entity' => 'Spool', 'bao' => 'CRM_Mailing_BAO_Spool', @@ -122,6 +123,7 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO { 'title' => ts('Mailing Job'), 'description' => ts('The ID of the Job .'), 'required' => TRUE, + 'where' => 'civicrm_mailing_spool.job_id', 'table_name' => 'civicrm_mailing_spool', 'entity' => 'Spool', 'bao' => 'CRM_Mailing_BAO_Spool', @@ -133,6 +135,7 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Recipient Email'), 'description' => ts('The email of the receipients this mail is to be sent.'), + 'where' => 'civicrm_mailing_spool.recipient_email', 'table_name' => 'civicrm_mailing_spool', 'entity' => 'Spool', 'bao' => 'CRM_Mailing_BAO_Spool', @@ -143,6 +146,7 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Headers'), 'description' => ts('The header information of this mailing .'), + 'where' => 'civicrm_mailing_spool.headers', 'table_name' => 'civicrm_mailing_spool', 'entity' => 'Spool', 'bao' => 'CRM_Mailing_BAO_Spool', @@ -153,6 +157,7 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Body'), 'description' => ts('The body of this mailing.'), + 'where' => 'civicrm_mailing_spool.body', 'table_name' => 'civicrm_mailing_spool', 'entity' => 'Spool', 'bao' => 'CRM_Mailing_BAO_Spool', @@ -164,6 +169,7 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO { 'title' => ts('Added'), 'description' => ts('date on which this job was added.'), 'required' => FALSE, + 'where' => 'civicrm_mailing_spool.added_at', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_spool', 'entity' => 'Spool', @@ -176,6 +182,7 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO { 'title' => ts('Removed'), 'description' => ts('date on which this job was removed.'), 'required' => FALSE, + 'where' => 'civicrm_mailing_spool.removed_at', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_spool', 'entity' => 'Spool', diff --git a/CRM/Mailing/DAO/TrackableURL.php b/CRM/Mailing/DAO/TrackableURL.php index 840f42c6b3..f87f00a386 100644 --- a/CRM/Mailing/DAO/TrackableURL.php +++ b/CRM/Mailing/DAO/TrackableURL.php @@ -83,6 +83,7 @@ class CRM_Mailing_DAO_TrackableURL extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Trackable URL ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_trackable_url.id', 'table_name' => 'civicrm_mailing_trackable_url', 'entity' => 'TrackableURL', 'bao' => 'CRM_Mailing_BAO_TrackableURL', @@ -94,6 +95,7 @@ class CRM_Mailing_DAO_TrackableURL extends CRM_Core_DAO { 'title' => ts('Url'), 'description' => ts('The URL to be tracked.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_trackable_url.url', 'table_name' => 'civicrm_mailing_trackable_url', 'entity' => 'TrackableURL', 'bao' => 'CRM_Mailing_BAO_TrackableURL', @@ -105,6 +107,7 @@ class CRM_Mailing_DAO_TrackableURL extends CRM_Core_DAO { 'title' => ts('Mailing'), 'description' => ts('FK to the mailing'), 'required' => TRUE, + 'where' => 'civicrm_mailing_trackable_url.mailing_id', 'table_name' => 'civicrm_mailing_trackable_url', 'entity' => 'TrackableURL', 'bao' => 'CRM_Mailing_BAO_TrackableURL', diff --git a/CRM/Mailing/Event/DAO/Bounce.php b/CRM/Mailing/Event/DAO/Bounce.php index ba53bf7c06..d60eb55715 100644 --- a/CRM/Mailing/Event/DAO/Bounce.php +++ b/CRM/Mailing/Event/DAO/Bounce.php @@ -77,7 +77,7 @@ class CRM_Mailing_Event_DAO_Bounce extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_queue_id', 'civicrm_mailing_event_queue', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); } @@ -97,6 +97,7 @@ class CRM_Mailing_Event_DAO_Bounce extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Bounce ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_bounce.id', 'table_name' => 'civicrm_mailing_event_bounce', 'entity' => 'Bounce', 'bao' => 'CRM_Mailing_Event_BAO_Bounce', @@ -108,6 +109,7 @@ class CRM_Mailing_Event_DAO_Bounce extends CRM_Core_DAO { 'title' => ts('Event Queue'), 'description' => ts('FK to EventQueue'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_bounce.event_queue_id', 'table_name' => 'civicrm_mailing_event_bounce', 'entity' => 'Bounce', 'bao' => 'CRM_Mailing_Event_BAO_Bounce', @@ -119,6 +121,7 @@ class CRM_Mailing_Event_DAO_Bounce extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Bounce Type'), 'description' => ts('What type of bounce was it?'), + 'where' => 'civicrm_mailing_event_bounce.bounce_type_id', 'table_name' => 'civicrm_mailing_event_bounce', 'entity' => 'Bounce', 'bao' => 'CRM_Mailing_Event_BAO_Bounce', @@ -139,6 +142,7 @@ class CRM_Mailing_Event_DAO_Bounce extends CRM_Core_DAO { 'description' => ts('The reason the email bounced.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing_event_bounce.bounce_reason', 'table_name' => 'civicrm_mailing_event_bounce', 'entity' => 'Bounce', 'bao' => 'CRM_Mailing_Event_BAO_Bounce', @@ -150,6 +154,7 @@ class CRM_Mailing_Event_DAO_Bounce extends CRM_Core_DAO { 'title' => ts('Timestamp'), 'description' => ts('When this bounce event occurred.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_bounce.time_stamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_event_bounce', 'entity' => 'Bounce', diff --git a/CRM/Mailing/Event/DAO/Confirm.php b/CRM/Mailing/Event/DAO/Confirm.php index b66ca4a6fb..61373315e4 100644 --- a/CRM/Mailing/Event/DAO/Confirm.php +++ b/CRM/Mailing/Event/DAO/Confirm.php @@ -63,7 +63,7 @@ class CRM_Mailing_Event_DAO_Confirm extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_subscribe_id', 'civicrm_mailing_event_subscribe', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); } @@ -83,6 +83,7 @@ class CRM_Mailing_Event_DAO_Confirm extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Confirmation ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_confirm.id', 'table_name' => 'civicrm_mailing_event_confirm', 'entity' => 'Confirm', 'bao' => 'CRM_Mailing_Event_BAO_Confirm', @@ -94,6 +95,7 @@ class CRM_Mailing_Event_DAO_Confirm extends CRM_Core_DAO { 'title' => ts('Mailing Subscribe ID'), 'description' => ts('FK to civicrm_mailing_event_subscribe'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_confirm.event_subscribe_id', 'table_name' => 'civicrm_mailing_event_confirm', 'entity' => 'Confirm', 'bao' => 'CRM_Mailing_Event_BAO_Confirm', @@ -106,6 +108,7 @@ class CRM_Mailing_Event_DAO_Confirm extends CRM_Core_DAO { 'title' => ts('Confirm Timestamp'), 'description' => ts('When this confirmation event occurred.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_confirm.time_stamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_event_confirm', 'entity' => 'Confirm', diff --git a/CRM/Mailing/Event/DAO/Delivered.php b/CRM/Mailing/Event/DAO/Delivered.php index ddde617bab..fed90da898 100644 --- a/CRM/Mailing/Event/DAO/Delivered.php +++ b/CRM/Mailing/Event/DAO/Delivered.php @@ -63,7 +63,7 @@ class CRM_Mailing_Event_DAO_Delivered extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_queue_id', 'civicrm_mailing_event_queue', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); } @@ -83,6 +83,7 @@ class CRM_Mailing_Event_DAO_Delivered extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Delivered ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_delivered.id', 'table_name' => 'civicrm_mailing_event_delivered', 'entity' => 'Delivered', 'bao' => 'CRM_Mailing_Event_BAO_Delivered', @@ -94,6 +95,7 @@ class CRM_Mailing_Event_DAO_Delivered extends CRM_Core_DAO { 'title' => ts('Event Queue'), 'description' => ts('FK to EventQueue'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_delivered.event_queue_id', 'table_name' => 'civicrm_mailing_event_delivered', 'entity' => 'Delivered', 'bao' => 'CRM_Mailing_Event_BAO_Delivered', @@ -106,6 +108,7 @@ class CRM_Mailing_Event_DAO_Delivered extends CRM_Core_DAO { 'title' => ts('Timestamp'), 'description' => ts('When this delivery event occurred.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_delivered.time_stamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_event_delivered', 'entity' => 'Delivered', diff --git a/CRM/Mailing/Event/DAO/Forward.php b/CRM/Mailing/Event/DAO/Forward.php index c9d1588dd4..7f9e189d48 100644 --- a/CRM/Mailing/Event/DAO/Forward.php +++ b/CRM/Mailing/Event/DAO/Forward.php @@ -70,7 +70,7 @@ class CRM_Mailing_Event_DAO_Forward extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_queue_id', 'civicrm_mailing_event_queue', 'id'); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'dest_queue_id', 'civicrm_mailing_event_queue', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); @@ -91,6 +91,7 @@ class CRM_Mailing_Event_DAO_Forward extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Forward ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_forward.id', 'table_name' => 'civicrm_mailing_event_forward', 'entity' => 'Forward', 'bao' => 'CRM_Mailing_Event_BAO_Forward', @@ -102,6 +103,7 @@ class CRM_Mailing_Event_DAO_Forward extends CRM_Core_DAO { 'title' => ts('Mailing Event Queue'), 'description' => ts('FK to EventQueue'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_forward.event_queue_id', 'table_name' => 'civicrm_mailing_event_forward', 'entity' => 'Forward', 'bao' => 'CRM_Mailing_Event_BAO_Forward', @@ -113,6 +115,7 @@ class CRM_Mailing_Event_DAO_Forward extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Destination Queue'), 'description' => ts('FK to EventQueue for destination'), + 'where' => 'civicrm_mailing_event_forward.dest_queue_id', 'table_name' => 'civicrm_mailing_event_forward', 'entity' => 'Forward', 'bao' => 'CRM_Mailing_Event_BAO_Forward', @@ -125,6 +128,7 @@ class CRM_Mailing_Event_DAO_Forward extends CRM_Core_DAO { 'title' => ts('Timestamp'), 'description' => ts('When this forward event occurred.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_forward.time_stamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_event_forward', 'entity' => 'Forward', diff --git a/CRM/Mailing/Event/DAO/Opened.php b/CRM/Mailing/Event/DAO/Opened.php index e3337cba28..6147a770ab 100644 --- a/CRM/Mailing/Event/DAO/Opened.php +++ b/CRM/Mailing/Event/DAO/Opened.php @@ -63,7 +63,7 @@ class CRM_Mailing_Event_DAO_Opened extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_queue_id', 'civicrm_mailing_event_queue', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); } @@ -83,6 +83,7 @@ class CRM_Mailing_Event_DAO_Opened extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Opened ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_opened.id', 'table_name' => 'civicrm_mailing_event_opened', 'entity' => 'Opened', 'bao' => 'CRM_Mailing_Event_BAO_Opened', @@ -94,6 +95,7 @@ class CRM_Mailing_Event_DAO_Opened extends CRM_Core_DAO { 'title' => ts('Event Queue'), 'description' => ts('FK to EventQueue'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_opened.event_queue_id', 'table_name' => 'civicrm_mailing_event_opened', 'entity' => 'Opened', 'bao' => 'CRM_Mailing_Event_BAO_Opened', @@ -106,6 +108,7 @@ class CRM_Mailing_Event_DAO_Opened extends CRM_Core_DAO { 'title' => ts('Timestamp'), 'description' => ts('When this open event occurred.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_opened.time_stamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_event_opened', 'entity' => 'Opened', diff --git a/CRM/Mailing/Event/DAO/Queue.php b/CRM/Mailing/Event/DAO/Queue.php index b1e3447500..c229b074ec 100644 --- a/CRM/Mailing/Event/DAO/Queue.php +++ b/CRM/Mailing/Event/DAO/Queue.php @@ -84,7 +84,7 @@ class CRM_Mailing_Event_DAO_Queue extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'job_id', 'civicrm_mailing_job', 'id'); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'email_id', 'civicrm_email', 'id'); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'contact_id', 'civicrm_contact', 'id'); @@ -107,6 +107,7 @@ class CRM_Mailing_Event_DAO_Queue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Event Queue ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_queue.id', 'table_name' => 'civicrm_mailing_event_queue', 'entity' => 'Queue', 'bao' => 'CRM_Mailing_Event_BAO_Queue', @@ -118,6 +119,7 @@ class CRM_Mailing_Event_DAO_Queue extends CRM_Core_DAO { 'title' => ts('Job ID'), 'description' => ts('FK to Job'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_queue.job_id', 'table_name' => 'civicrm_mailing_event_queue', 'entity' => 'Queue', 'bao' => 'CRM_Mailing_Event_BAO_Queue', @@ -129,6 +131,7 @@ class CRM_Mailing_Event_DAO_Queue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Email ID'), 'description' => ts('FK to Email'), + 'where' => 'civicrm_mailing_event_queue.email_id', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_event_queue', 'entity' => 'Queue', @@ -142,6 +145,7 @@ class CRM_Mailing_Event_DAO_Queue extends CRM_Core_DAO { 'title' => ts('Contact ID'), 'description' => ts('FK to Contact'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_queue.contact_id', 'table_name' => 'civicrm_mailing_event_queue', 'entity' => 'Queue', 'bao' => 'CRM_Mailing_Event_BAO_Queue', @@ -156,6 +160,7 @@ class CRM_Mailing_Event_DAO_Queue extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing_event_queue.hash', 'table_name' => 'civicrm_mailing_event_queue', 'entity' => 'Queue', 'bao' => 'CRM_Mailing_Event_BAO_Queue', @@ -166,6 +171,7 @@ class CRM_Mailing_Event_DAO_Queue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Phone ID'), 'description' => ts('FK to Phone'), + 'where' => 'civicrm_mailing_event_queue.phone_id', 'default' => 'NULL', 'table_name' => 'civicrm_mailing_event_queue', 'entity' => 'Queue', diff --git a/CRM/Mailing/Event/DAO/Reply.php b/CRM/Mailing/Event/DAO/Reply.php index d7f71831b5..8ca919a823 100644 --- a/CRM/Mailing/Event/DAO/Reply.php +++ b/CRM/Mailing/Event/DAO/Reply.php @@ -63,7 +63,7 @@ class CRM_Mailing_Event_DAO_Reply extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_queue_id', 'civicrm_mailing_event_queue', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); } @@ -83,6 +83,7 @@ class CRM_Mailing_Event_DAO_Reply extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Reply ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_reply.id', 'table_name' => 'civicrm_mailing_event_reply', 'entity' => 'Reply', 'bao' => 'CRM_Mailing_Event_BAO_Reply', @@ -94,6 +95,7 @@ class CRM_Mailing_Event_DAO_Reply extends CRM_Core_DAO { 'title' => ts('Event Queue'), 'description' => ts('FK to EventQueue'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_reply.event_queue_id', 'table_name' => 'civicrm_mailing_event_reply', 'entity' => 'Reply', 'bao' => 'CRM_Mailing_Event_BAO_Reply', @@ -106,6 +108,7 @@ class CRM_Mailing_Event_DAO_Reply extends CRM_Core_DAO { 'title' => ts('Reply Timestamp'), 'description' => ts('When this reply event occurred.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_reply.time_stamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_event_reply', 'entity' => 'Reply', diff --git a/CRM/Mailing/Event/DAO/Subscribe.php b/CRM/Mailing/Event/DAO/Subscribe.php index 888c2ecc19..ad711c9d26 100644 --- a/CRM/Mailing/Event/DAO/Subscribe.php +++ b/CRM/Mailing/Event/DAO/Subscribe.php @@ -77,7 +77,7 @@ class CRM_Mailing_Event_DAO_Subscribe extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'group_id', 'civicrm_group', 'id'); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'contact_id', 'civicrm_contact', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); @@ -98,6 +98,7 @@ class CRM_Mailing_Event_DAO_Subscribe extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Mailing Subscribe ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_subscribe.id', 'table_name' => 'civicrm_mailing_event_subscribe', 'entity' => 'Subscribe', 'bao' => 'CRM_Mailing_Event_BAO_Subscribe', @@ -109,6 +110,7 @@ class CRM_Mailing_Event_DAO_Subscribe extends CRM_Core_DAO { 'title' => ts('Mailing Subscribe Group'), 'description' => ts('FK to Group'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_subscribe.group_id', 'table_name' => 'civicrm_mailing_event_subscribe', 'entity' => 'Subscribe', 'bao' => 'CRM_Mailing_Event_BAO_Subscribe', @@ -129,6 +131,7 @@ class CRM_Mailing_Event_DAO_Subscribe extends CRM_Core_DAO { 'title' => ts('Mailing Subscribe Contact'), 'description' => ts('FK to Contact'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_subscribe.contact_id', 'table_name' => 'civicrm_mailing_event_subscribe', 'entity' => 'Subscribe', 'bao' => 'CRM_Mailing_Event_BAO_Subscribe', @@ -143,6 +146,7 @@ class CRM_Mailing_Event_DAO_Subscribe extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_mailing_event_subscribe.hash', 'table_name' => 'civicrm_mailing_event_subscribe', 'entity' => 'Subscribe', 'bao' => 'CRM_Mailing_Event_BAO_Subscribe', @@ -154,6 +158,7 @@ class CRM_Mailing_Event_DAO_Subscribe extends CRM_Core_DAO { 'title' => ts('Mailing Subscribe Timestamp'), 'description' => ts('When this subscription event occurred.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_subscribe.time_stamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_event_subscribe', 'entity' => 'Subscribe', diff --git a/CRM/Mailing/Event/DAO/TrackableURLOpen.php b/CRM/Mailing/Event/DAO/TrackableURLOpen.php index 60e2eafef2..39c7646d10 100644 --- a/CRM/Mailing/Event/DAO/TrackableURLOpen.php +++ b/CRM/Mailing/Event/DAO/TrackableURLOpen.php @@ -70,7 +70,7 @@ class CRM_Mailing_Event_DAO_TrackableURLOpen extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_queue_id', 'civicrm_mailing_event_queue', 'id'); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'trackable_url_id', 'civicrm_mailing_trackable_url', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); @@ -91,6 +91,7 @@ class CRM_Mailing_Event_DAO_TrackableURLOpen extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Trackable URL Open ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_trackable_url_open.id', 'table_name' => 'civicrm_mailing_event_trackable_url_open', 'entity' => 'TrackableURLOpen', 'bao' => 'CRM_Mailing_Event_BAO_TrackableURLOpen', @@ -102,6 +103,7 @@ class CRM_Mailing_Event_DAO_TrackableURLOpen extends CRM_Core_DAO { 'title' => ts('Event Queue'), 'description' => ts('FK to EventQueue'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_trackable_url_open.event_queue_id', 'table_name' => 'civicrm_mailing_event_trackable_url_open', 'entity' => 'TrackableURLOpen', 'bao' => 'CRM_Mailing_Event_BAO_TrackableURLOpen', @@ -114,6 +116,7 @@ class CRM_Mailing_Event_DAO_TrackableURLOpen extends CRM_Core_DAO { 'title' => ts('Trackable Url'), 'description' => ts('FK to TrackableURL'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_trackable_url_open.trackable_url_id', 'table_name' => 'civicrm_mailing_event_trackable_url_open', 'entity' => 'TrackableURLOpen', 'bao' => 'CRM_Mailing_Event_BAO_TrackableURLOpen', @@ -126,6 +129,7 @@ class CRM_Mailing_Event_DAO_TrackableURLOpen extends CRM_Core_DAO { 'title' => ts('Timestamp'), 'description' => ts('When this trackable URL open occurred.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_trackable_url_open.time_stamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_event_trackable_url_open', 'entity' => 'TrackableURLOpen', diff --git a/CRM/Mailing/Event/DAO/Unsubscribe.php b/CRM/Mailing/Event/DAO/Unsubscribe.php index 8459b8a50b..7cd8658511 100644 --- a/CRM/Mailing/Event/DAO/Unsubscribe.php +++ b/CRM/Mailing/Event/DAO/Unsubscribe.php @@ -70,7 +70,7 @@ class CRM_Mailing_Event_DAO_Unsubscribe extends CRM_Core_DAO { */ public static function getReferenceColumns() { if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__); + Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'event_queue_id', 'civicrm_mailing_event_queue', 'id'); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); } @@ -90,6 +90,7 @@ class CRM_Mailing_Event_DAO_Unsubscribe extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Unsubscribe ID'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_unsubscribe.id', 'table_name' => 'civicrm_mailing_event_unsubscribe', 'entity' => 'Unsubscribe', 'bao' => 'CRM_Mailing_Event_BAO_Unsubscribe', @@ -101,6 +102,7 @@ class CRM_Mailing_Event_DAO_Unsubscribe extends CRM_Core_DAO { 'title' => ts('Mailing Event Queue'), 'description' => ts('FK to EventQueue'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_unsubscribe.event_queue_id', 'table_name' => 'civicrm_mailing_event_unsubscribe', 'entity' => 'Unsubscribe', 'bao' => 'CRM_Mailing_Event_BAO_Unsubscribe', @@ -113,6 +115,7 @@ class CRM_Mailing_Event_DAO_Unsubscribe extends CRM_Core_DAO { 'title' => ts('Unsubscribe is for Organization?'), 'description' => ts('Unsubscribe at org- or group-level'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_unsubscribe.org_unsubscribe', 'table_name' => 'civicrm_mailing_event_unsubscribe', 'entity' => 'Unsubscribe', 'bao' => 'CRM_Mailing_Event_BAO_Unsubscribe', @@ -124,6 +127,7 @@ class CRM_Mailing_Event_DAO_Unsubscribe extends CRM_Core_DAO { 'title' => ts('Unsubscribe Timestamp'), 'description' => ts('When this delivery event occurred.'), 'required' => TRUE, + 'where' => 'civicrm_mailing_event_unsubscribe.time_stamp', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_mailing_event_unsubscribe', 'entity' => 'Unsubscribe', diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php index 5dbba6f274..43b1b5aa60 100644 --- a/CRM/Member/DAO/Membership.php +++ b/CRM/Member/DAO/Membership.php @@ -179,7 +179,6 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_membership.id', 'headerPattern' => '/^(m(embership\s)?id)$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_membership', 'entity' => 'Membership', @@ -215,7 +214,6 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_membership.membership_type_id', 'headerPattern' => '/^(m(embership\s)?type)$/i', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_membership', 'entity' => 'Membership', @@ -297,7 +295,6 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_membership.source', 'headerPattern' => '/^(member(ship?))?source$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_membership', 'entity' => 'Membership', @@ -316,7 +313,6 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_membership.status_id', 'headerPattern' => '/(member(ship|).)?(status)$/i', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_membership', 'entity' => 'Membership', @@ -340,7 +336,6 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_membership.is_override', 'headerPattern' => '/override$/i', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_membership', 'entity' => 'Membership', @@ -357,8 +352,6 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'description' => ts('Then end date of membership status override if \'Override until selected date\' override type is selected.'), 'import' => TRUE, 'where' => 'civicrm_membership.status_override_end_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => 'NULL', 'table_name' => 'civicrm_membership', @@ -374,10 +367,8 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Primary Member ID'), 'description' => ts('Optional FK to Parent Membership.'), - 'export' => TRUE, 'where' => 'civicrm_membership.owner_membership_id', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_membership', 'entity' => 'Membership', 'bao' => 'CRM_Member_BAO_Membership', @@ -389,6 +380,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Max Related'), 'description' => ts('Maximum number of related memberships (membership_type override).'), + 'where' => 'civicrm_membership.max_related', 'table_name' => 'civicrm_membership', 'entity' => 'Membership', 'bao' => 'CRM_Member_BAO_Membership', @@ -404,7 +396,6 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_membership.is_test', 'headerPattern' => '/(is.)?test(.member(ship)?)?/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_membership', @@ -422,7 +413,6 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_membership.is_pay_later', 'headerPattern' => '/(is.)?(pay(.)?later)$/i', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_membership', @@ -438,6 +428,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Membership Recurring Contribution'), 'description' => ts('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.'), + 'where' => 'civicrm_membership.contribution_recur_id', 'table_name' => 'civicrm_membership', 'entity' => 'Membership', 'bao' => 'CRM_Member_BAO_Membership', @@ -451,8 +442,6 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'description' => ts('The campaign for which this membership is attached.'), 'import' => TRUE, 'where' => 'civicrm_membership.campaign_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_membership', 'entity' => 'Membership', diff --git a/CRM/Member/DAO/MembershipBlock.php b/CRM/Member/DAO/MembershipBlock.php index 0b533176c3..275fce3e7a 100644 --- a/CRM/Member/DAO/MembershipBlock.php +++ b/CRM/Member/DAO/MembershipBlock.php @@ -157,6 +157,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'title' => ts('Membership Block ID'), 'description' => ts('Membership Id'), 'required' => TRUE, + 'where' => 'civicrm_membership_block.id', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', 'bao' => 'CRM_Member_BAO_MembershipBlock', @@ -169,6 +170,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'description' => ts('Name for Membership Status'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_membership_block.entity_table', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', 'bao' => 'CRM_Member_BAO_MembershipBlock', @@ -180,6 +182,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'title' => ts('Membership Block Entity ID'), 'description' => ts('FK to civicrm_contribution_page.id'), 'required' => TRUE, + 'where' => 'civicrm_membership_block.entity_id', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', 'bao' => 'CRM_Member_BAO_MembershipBlock', @@ -193,6 +196,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'description' => ts('Membership types to be exposed by this block'), 'maxlength' => 1024, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_membership_block.membership_types', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', 'bao' => 'CRM_Member_BAO_MembershipBlock', @@ -204,6 +208,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Membership Block Default Type'), 'description' => ts('Optional foreign key to membership_type'), + 'where' => 'civicrm_membership_block.membership_type_default', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', 'bao' => 'CRM_Member_BAO_MembershipBlock', @@ -215,6 +220,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Membership Block Display Minimum Fee'), 'description' => ts('Display minimum membership fee'), + 'where' => 'civicrm_membership_block.display_min_fee', 'default' => '1', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', @@ -226,6 +232,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Membership Block Is Separate Payment'), 'description' => ts('Should membership transactions be processed separately'), + 'where' => 'civicrm_membership_block.is_separate_payment', 'default' => '1', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', @@ -239,6 +246,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'description' => ts('Title to display at top of block'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_membership_block.new_title', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', 'bao' => 'CRM_Member_BAO_MembershipBlock', @@ -249,6 +257,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Membership Block New Text'), 'description' => ts('Text to display below title'), + 'where' => 'civicrm_membership_block.new_text', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', 'bao' => 'CRM_Member_BAO_MembershipBlock', @@ -261,6 +270,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'description' => ts('Title for renewal'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_membership_block.renewal_title', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', 'bao' => 'CRM_Member_BAO_MembershipBlock', @@ -271,6 +281,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Membership Block Renewal Text'), 'description' => ts('Text to display for member renewal'), + 'where' => 'civicrm_membership_block.renewal_text', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', 'bao' => 'CRM_Member_BAO_MembershipBlock', @@ -281,6 +292,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Required'), 'description' => ts('Is membership sign up optional'), + 'where' => 'civicrm_membership_block.is_required', 'default' => '0', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', @@ -292,6 +304,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Active'), 'description' => ts('Is this membership_block enabled'), + 'where' => 'civicrm_membership_block.is_active', 'default' => '1', 'table_name' => 'civicrm_membership_block', 'entity' => 'MembershipBlock', diff --git a/CRM/Member/DAO/MembershipLog.php b/CRM/Member/DAO/MembershipLog.php index 306cd20647..30b1e0bf47 100644 --- a/CRM/Member/DAO/MembershipLog.php +++ b/CRM/Member/DAO/MembershipLog.php @@ -128,6 +128,7 @@ class CRM_Member_DAO_MembershipLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Membership Log ID'), 'required' => TRUE, + 'where' => 'civicrm_membership_log.id', 'table_name' => 'civicrm_membership_log', 'entity' => 'MembershipLog', 'bao' => 'CRM_Member_BAO_MembershipLog', @@ -139,6 +140,7 @@ class CRM_Member_DAO_MembershipLog extends CRM_Core_DAO { 'title' => ts('Membership ID'), 'description' => ts('FK to Membership table'), 'required' => TRUE, + 'where' => 'civicrm_membership_log.membership_id', 'table_name' => 'civicrm_membership_log', 'entity' => 'MembershipLog', 'bao' => 'CRM_Member_BAO_MembershipLog', @@ -151,6 +153,7 @@ class CRM_Member_DAO_MembershipLog extends CRM_Core_DAO { 'title' => ts('Membership Status'), 'description' => ts('New status assigned to membership by this action. FK to Membership Status'), 'required' => TRUE, + 'where' => 'civicrm_membership_log.status_id', 'table_name' => 'civicrm_membership_log', 'entity' => 'MembershipLog', 'bao' => 'CRM_Member_BAO_MembershipLog', @@ -162,6 +165,8 @@ class CRM_Member_DAO_MembershipLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Membership Log Start Date'), 'description' => ts('New membership period start date'), + 'where' => 'civicrm_membership_log.start_date', + 'dataPattern' => '/\d{4}-?\d{2}-?\d{2}/', 'table_name' => 'civicrm_membership_log', 'entity' => 'MembershipLog', 'bao' => 'CRM_Member_BAO_MembershipLog', @@ -172,6 +177,8 @@ class CRM_Member_DAO_MembershipLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Membership Log End Date'), 'description' => ts('New membership period expiration date.'), + 'where' => 'civicrm_membership_log.end_date', + 'dataPattern' => '/\d{4}-?\d{2}-?\d{2}/', 'table_name' => 'civicrm_membership_log', 'entity' => 'MembershipLog', 'bao' => 'CRM_Member_BAO_MembershipLog', @@ -182,6 +189,7 @@ class CRM_Member_DAO_MembershipLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Membership Log modified By'), 'description' => ts('FK to Contact ID of person under whose credentials this data modification was made.'), + 'where' => 'civicrm_membership_log.modified_id', 'table_name' => 'civicrm_membership_log', 'entity' => 'MembershipLog', 'bao' => 'CRM_Member_BAO_MembershipLog', @@ -193,6 +201,8 @@ class CRM_Member_DAO_MembershipLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE, 'title' => ts('Membership Change Date'), 'description' => ts('Date this membership modification action was logged.'), + 'where' => 'civicrm_membership_log.modified_date', + 'dataPattern' => '/\d{4}-?\d{2}-?\d{2}/', 'table_name' => 'civicrm_membership_log', 'entity' => 'MembershipLog', 'bao' => 'CRM_Member_BAO_MembershipLog', @@ -203,6 +213,7 @@ class CRM_Member_DAO_MembershipLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Membership Type ID'), 'description' => ts('FK to Membership Type.'), + 'where' => 'civicrm_membership_log.membership_type_id', 'table_name' => 'civicrm_membership_log', 'entity' => 'MembershipLog', 'bao' => 'CRM_Member_BAO_MembershipLog', @@ -214,6 +225,7 @@ class CRM_Member_DAO_MembershipLog extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Maximum Related Memberships'), 'description' => ts('Maximum number of related memberships.'), + 'where' => 'civicrm_membership_log.max_related', 'table_name' => 'civicrm_membership_log', 'entity' => 'MembershipLog', 'bao' => 'CRM_Member_BAO_MembershipLog', diff --git a/CRM/Member/DAO/MembershipPayment.php b/CRM/Member/DAO/MembershipPayment.php index e1b4c7abe9..82a01b13e6 100644 --- a/CRM/Member/DAO/MembershipPayment.php +++ b/CRM/Member/DAO/MembershipPayment.php @@ -84,6 +84,7 @@ class CRM_Member_DAO_MembershipPayment extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Membership Payment ID'), 'required' => TRUE, + 'where' => 'civicrm_membership_payment.id', 'table_name' => 'civicrm_membership_payment', 'entity' => 'MembershipPayment', 'bao' => 'CRM_Member_BAO_MembershipPayment', @@ -95,6 +96,7 @@ class CRM_Member_DAO_MembershipPayment extends CRM_Core_DAO { 'title' => ts('Membership'), 'description' => ts('FK to Membership table'), 'required' => TRUE, + 'where' => 'civicrm_membership_payment.membership_id', 'table_name' => 'civicrm_membership_payment', 'entity' => 'MembershipPayment', 'bao' => 'CRM_Member_BAO_MembershipPayment', @@ -106,6 +108,7 @@ class CRM_Member_DAO_MembershipPayment extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contribution'), 'description' => ts('FK to contribution table.'), + 'where' => 'civicrm_membership_payment.contribution_id', 'table_name' => 'civicrm_membership_payment', 'entity' => 'MembershipPayment', 'bao' => 'CRM_Member_BAO_MembershipPayment', diff --git a/CRM/Member/DAO/MembershipStatus.php b/CRM/Member/DAO/MembershipStatus.php index 03d9b33b30..701759ffc0 100644 --- a/CRM/Member/DAO/MembershipStatus.php +++ b/CRM/Member/DAO/MembershipStatus.php @@ -153,6 +153,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'title' => ts('Membership Status ID'), 'description' => ts('Membership Id'), 'required' => TRUE, + 'where' => 'civicrm_membership_status.id', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -167,8 +168,6 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_membership_status.name', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', @@ -182,6 +181,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'description' => ts('Label for Membership Status'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_membership_status.label', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -197,6 +197,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'description' => ts('Event when this status starts.'), 'maxlength' => 12, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_membership_status.start_event', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -215,6 +216,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'description' => ts('Unit used for adjusting from start_event.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_membership_status.start_event_adjust_unit', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -231,6 +233,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Start Event Adjust Interval'), 'description' => ts('Status range begins this many units from start_event.'), + 'where' => 'civicrm_membership_status.start_event_adjust_interval', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -243,6 +246,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'description' => ts('Event after which this status ends.'), 'maxlength' => 12, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_membership_status.end_event', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -261,6 +265,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'description' => ts('Unit used for adjusting from the ending event.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_membership_status.end_event_adjust_unit', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -277,6 +282,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('End Event Adjust Interval'), 'description' => ts('Status range ends this many units from end_event.'), + 'where' => 'civicrm_membership_status.end_event_adjust_interval', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -287,6 +293,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Current Membership?'), 'description' => ts('Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).'), + 'where' => 'civicrm_membership_status.is_current_member', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -297,6 +304,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Administrator Only?'), 'description' => ts('Is this status for admin/manual assignment only.'), + 'where' => 'civicrm_membership_status.is_admin', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -309,6 +317,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'name' => 'weight', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Order'), + 'where' => 'civicrm_membership_status.weight', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -319,6 +328,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Default Status?'), 'description' => ts('Assign this status to a membership record if no other status match is found.'), + 'where' => 'civicrm_membership_status.is_default', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', 'bao' => 'CRM_Member_BAO_MembershipStatus', @@ -332,6 +342,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Active'), 'description' => ts('Is this membership_status enabled.'), + 'where' => 'civicrm_membership_status.is_active', 'default' => '1', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', @@ -346,6 +357,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Reserved'), 'description' => ts('Is this membership_status reserved.'), + 'where' => 'civicrm_membership_status.is_reserved', 'default' => '0', 'table_name' => 'civicrm_membership_status', 'entity' => 'MembershipStatus', diff --git a/CRM/Member/DAO/MembershipType.php b/CRM/Member/DAO/MembershipType.php index e2f99222f0..c777c9a2e3 100644 --- a/CRM/Member/DAO/MembershipType.php +++ b/CRM/Member/DAO/MembershipType.php @@ -208,6 +208,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'title' => ts('Membership Type ID'), 'description' => ts('Membership Id'), 'required' => TRUE, + 'where' => 'civicrm_membership_type.id', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -219,6 +220,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'title' => ts('Membership Type Domain'), 'description' => ts('Which Domain is this match entry for'), 'required' => TRUE, + 'where' => 'civicrm_membership_type.domain_id', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -239,8 +241,6 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'size' => CRM_Utils_Type::HUGE, 'import' => TRUE, 'where' => 'civicrm_membership_type.name', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', @@ -258,6 +258,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'description' => ts('Description of Membership Type'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_membership_type.description', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -273,6 +274,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'title' => ts('Membership Type Organization'), 'description' => ts('Owner organization for this membership type. FK to Contact ID'), 'required' => TRUE, + 'where' => 'civicrm_membership_type.member_of_contact_id', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -285,6 +287,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'title' => ts('Membership Financial Type'), 'description' => ts('If membership is paid by a contribution - what financial type should be used. FK to civicrm_financial_type.id'), 'required' => TRUE, + 'where' => 'civicrm_membership_type.financial_type_id', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -305,6 +308,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 18, 9 ], + 'where' => 'civicrm_membership_type.minimum_fee', 'default' => '0', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', @@ -322,6 +326,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'description' => ts('Unit in which membership period is expressed.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_membership_type.duration_unit', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -338,6 +343,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Membership Type Duration Interval'), 'description' => ts('Number of duration units in membership period (e.g. 1 year, 12 months).'), + 'where' => 'civicrm_membership_type.duration_interval', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -353,6 +359,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'description' => ts('Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_membership_type.period_type', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -369,6 +376,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Fixed Period Start Day'), 'description' => ts('For fixed period memberships, month and day (mmdd) on which subscription/membership will start. Period start is back-dated unless after rollover day.'), + 'where' => 'civicrm_membership_type.fixed_period_start_day', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -379,6 +387,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Fixed Period Rollover Day'), 'description' => ts('For fixed period memberships, signups after this day (mmdd) rollover to next period.'), + 'where' => 'civicrm_membership_type.fixed_period_rollover_day', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -391,6 +400,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'description' => ts('FK to Relationship Type ID'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_membership_type.relationship_type_id', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -402,6 +412,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'title' => ts('Relationship Direction'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_membership_type.relationship_direction', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -412,6 +423,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Max Related Members for Type'), 'description' => ts('Maximum number of related memberships.'), + 'where' => 'civicrm_membership_type.max_related', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -427,6 +439,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'title' => ts('Visible'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_membership_type.visibility', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -442,6 +455,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'name' => 'weight', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Order'), + 'where' => 'civicrm_membership_type.weight', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -457,6 +471,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'description' => ts('Receipt Text for membership signup'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_membership_type.receipt_text_signup', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -472,6 +487,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'description' => ts('Receipt Text for membership renewal'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_membership_type.receipt_text_renewal', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', 'bao' => 'CRM_Member_BAO_MembershipType', @@ -485,6 +501,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Auto Renew'), 'description' => ts('0 = No auto-renew option; 1 = Give option, but not required; 2 = Auto-renew required;'), + 'where' => 'civicrm_membership_type.auto_renew', 'default' => '0', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', @@ -502,6 +519,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Active'), 'description' => ts('Is this membership_type enabled'), + 'where' => 'civicrm_membership_type.is_active', 'default' => '1', 'table_name' => 'civicrm_membership_type', 'entity' => 'MembershipType', diff --git a/CRM/PCP/DAO/PCP.php b/CRM/PCP/DAO/PCP.php index 20238b03d5..b33921cf73 100644 --- a/CRM/PCP/DAO/PCP.php +++ b/CRM/PCP/DAO/PCP.php @@ -163,6 +163,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'title' => ts('Personal Campaign Page ID'), 'description' => ts('Personal Campaign Page ID'), 'required' => TRUE, + 'where' => 'civicrm_pcp.id', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -174,6 +175,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'title' => ts('Contact ID'), 'description' => ts('FK to Contact ID'), 'required' => TRUE, + 'where' => 'civicrm_pcp.contact_id', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -188,6 +190,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Personal Campaign Page Status'), 'required' => TRUE, + 'where' => 'civicrm_pcp.status_id', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -206,6 +209,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'title' => ts('Personal Campaign Page Title'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_pcp.title', 'default' => 'NULL', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', @@ -219,6 +223,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'name' => 'intro_text', 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Intro Text'), + 'where' => 'civicrm_pcp.intro_text', 'default' => 'NULL', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', @@ -232,6 +237,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'name' => 'page_text', 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Page Text'), + 'where' => 'civicrm_pcp.page_text', 'default' => 'NULL', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', @@ -247,6 +253,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'title' => ts('Donate Link Text'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_pcp.donate_link_text', 'default' => 'NULL', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', @@ -262,6 +269,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'title' => ts('Contribution Page'), 'description' => ts('The Contribution or Event Page which triggered this pcp'), 'required' => TRUE, + 'where' => 'civicrm_pcp.page_id', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -274,6 +282,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'description' => ts('The type of PCP this is: contribute or event'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_pcp.page_type', 'default' => 'contribute', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', @@ -289,6 +298,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'title' => ts('PCP Block'), 'description' => ts('The pcp block that this pcp page was created from'), 'required' => TRUE, + 'where' => 'civicrm_pcp.pcp_block_id', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -298,6 +308,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'name' => 'is_thermometer', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Use Thermometer?'), + 'where' => 'civicrm_pcp.is_thermometer', 'default' => '0', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', @@ -311,6 +322,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'name' => 'is_honor_roll', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Show Honor Roll?'), + 'where' => 'civicrm_pcp.is_honor_roll', 'default' => '0', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', @@ -329,6 +341,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_pcp.goal_amount', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -344,6 +357,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'description' => ts('3 character string, value from config setting or input via user.'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_pcp.currency', 'default' => 'NULL', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', @@ -364,6 +378,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Enabled?'), 'description' => ts('Is Personal Campaign Page enabled/active?'), + 'where' => 'civicrm_pcp.is_active', 'default' => '0', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', @@ -378,6 +393,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Notify Owner?'), 'description' => ts('Notify owner via email when someone donates to page?'), + 'where' => 'civicrm_pcp.is_notify', 'default' => '0', 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', diff --git a/CRM/PCP/DAO/PCPBlock.php b/CRM/PCP/DAO/PCPBlock.php index 89b76af0be..2d93ff55c8 100644 --- a/CRM/PCP/DAO/PCPBlock.php +++ b/CRM/PCP/DAO/PCPBlock.php @@ -156,6 +156,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'title' => ts('PCP Block ID'), 'description' => ts('PCP block Id'), 'required' => TRUE, + 'where' => 'civicrm_pcp_block.id', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', @@ -167,6 +168,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'title' => ts('Entity Table'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_pcp_block.entity_table', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', @@ -178,6 +180,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'title' => ts('Entity'), 'description' => ts('FK to civicrm_contribution_page.id OR civicrm_event.id'), 'required' => TRUE, + 'where' => 'civicrm_pcp_block.entity_id', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', @@ -191,6 +194,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_pcp_block.target_entity_type', 'default' => 'contribute', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', @@ -203,6 +207,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'title' => ts('Target Entity ID'), 'description' => ts('The entity that this pcp targets'), 'required' => TRUE, + 'where' => 'civicrm_pcp_block.target_entity_id', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', @@ -213,6 +218,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Supporter Profile'), 'description' => ts('FK to civicrm_uf_group.id. Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?'), + 'where' => 'civicrm_pcp_block.supporter_profile_id', 'default' => 'NULL', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', @@ -225,6 +231,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Owner Notification'), 'description' => ts('FK to civicrm_option_group with name = PCP owner notifications'), + 'where' => 'civicrm_pcp_block.owner_notify_id', 'default' => '0', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', @@ -243,6 +250,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Approval Required?'), 'description' => ts('Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?'), + 'where' => 'civicrm_pcp_block.is_approval_needed', 'default' => 'NULL', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', @@ -254,6 +262,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Tell a Friend Enabled?'), 'description' => ts('Does Personal Campaign Page allow using tell a friend?'), + 'where' => 'civicrm_pcp_block.is_tellfriend_enabled', 'default' => 'NULL', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', @@ -265,6 +274,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Tell A Friend Limit'), 'description' => ts('Maximum recipient fields allowed in tell a friend'), + 'where' => 'civicrm_pcp_block.tellfriend_limit', 'default' => 'NULL', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', @@ -278,6 +288,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'description' => ts('Link text for PCP.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_pcp_block.link_text', 'default' => 'NULL', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', @@ -289,6 +300,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Enabled?'), 'description' => ts('Is Personal Campaign Page Block enabled/active?'), + 'where' => 'civicrm_pcp_block.is_active', 'default' => '1', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', @@ -302,6 +314,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'description' => ts('If set, notification is automatically emailed to this email-address on create/update Personal Campaign Page'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_pcp_block.notify_email', 'default' => 'NULL', 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', diff --git a/CRM/Pledge/DAO/Pledge.php b/CRM/Pledge/DAO/Pledge.php index de2f298916..76e796bfc9 100644 --- a/CRM/Pledge/DAO/Pledge.php +++ b/CRM/Pledge/DAO/Pledge.php @@ -229,8 +229,6 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_pledge.id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -245,8 +243,6 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_pledge.contact_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -262,6 +258,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Type'), 'description' => ts('FK to Financial Type'), + 'where' => 'civicrm_pledge.financial_type_id', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', @@ -281,6 +278,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Pledge Contribution Page'), 'description' => ts('The Contribution Page which triggered this contribution'), + 'where' => 'civicrm_pledge.contribution_page_id', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', @@ -299,8 +297,6 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { ], 'import' => TRUE, 'where' => 'civicrm_pledge.amount', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -320,10 +316,8 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 20, 2 ], - 'export' => TRUE, 'where' => 'civicrm_pledge.original_installment_amount', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', @@ -339,6 +333,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'description' => ts('3 character string, value from config setting or input via user.'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_pledge.currency', 'default' => 'NULL', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -361,6 +356,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'description' => ts('Time units for recurrence of pledge payments.'), 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, + 'where' => 'civicrm_pledge.frequency_unit', 'default' => 'month', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -381,6 +377,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'title' => ts('Pledge Frequency Interval'), 'description' => ts('Number of time units for recurrence of pledge payments.'), 'required' => TRUE, + 'where' => 'civicrm_pledge.frequency_interval', 'default' => '1', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -396,6 +393,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'title' => ts('Pledge day'), 'description' => ts('Day in the period when the pledge payment is due e.g. 1st of month, 15th etc. Use this to set the scheduled dates for pledge payments.'), 'required' => TRUE, + 'where' => 'civicrm_pledge.frequency_day', 'default' => '3', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -410,10 +408,8 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Pledge Number of Installments'), 'description' => ts('Total number of payments to be made.'), - 'export' => TRUE, 'where' => 'civicrm_pledge.installments', - 'headerPattern' => '', - 'dataPattern' => '', + 'export' => TRUE, 'default' => '1', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -429,6 +425,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'title' => ts('Pledge Start Date'), 'description' => ts('The date the first scheduled pledge occurs.'), 'required' => TRUE, + 'where' => 'civicrm_pledge.start_date', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', @@ -445,8 +442,6 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_pledge.create_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -461,6 +456,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Pledge Acknowledged'), 'description' => ts('When a pledge acknowledgement message was sent to the contributor.'), + 'where' => 'civicrm_pledge.acknowledge_date', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', @@ -474,6 +470,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Pledge Modified Date'), 'description' => ts('Last updated date for this pledge record.'), + 'where' => 'civicrm_pledge.modified_date', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', @@ -484,6 +481,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Pledge Cancelled Date'), 'description' => ts('Date this pledge was cancelled by contributor.'), + 'where' => 'civicrm_pledge.cancel_date', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', @@ -497,6 +495,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Pledge End Date'), 'description' => ts('Date this pledge finished successfully (total pledge payments equal to or greater than pledged amount).'), + 'where' => 'civicrm_pledge.end_date', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', @@ -510,6 +509,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Maximum Number of Reminders'), 'description' => ts('The maximum number of payment reminders to send for any given payment.'), + 'where' => 'civicrm_pledge.max_reminders', 'default' => '1', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -524,6 +524,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Initial Reminder Day'), 'description' => ts('Send initial reminder this many days prior to the payment due date.'), + 'where' => 'civicrm_pledge.initial_reminder_day', 'default' => '5', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -538,6 +539,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Additional Reminder Days'), 'description' => ts('Send additional reminder this many days after last one sent, up to maximum number of reminders.'), + 'where' => 'civicrm_pledge.additional_reminder_day', 'default' => '5', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -554,8 +556,6 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'description' => ts('Implicit foreign key to civicrm_option_values in the pledge_status option group.'), 'import' => TRUE, 'where' => 'civicrm_pledge.status_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', @@ -572,8 +572,6 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'title' => ts('Test'), 'import' => TRUE, 'where' => 'civicrm_pledge.is_test', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_pledge', @@ -591,8 +589,6 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'description' => ts('The campaign for which this pledge has been initiated.'), 'import' => TRUE, 'where' => 'civicrm_pledge.campaign_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', diff --git a/CRM/Pledge/DAO/PledgeBlock.php b/CRM/Pledge/DAO/PledgeBlock.php index 381f297a2c..e319da634e 100644 --- a/CRM/Pledge/DAO/PledgeBlock.php +++ b/CRM/Pledge/DAO/PledgeBlock.php @@ -142,6 +142,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'title' => ts('Pledge Block ID'), 'description' => ts('Pledge ID'), 'required' => TRUE, + 'where' => 'civicrm_pledge_block.id', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', 'bao' => 'CRM_Pledge_BAO_PledgeBlock', @@ -154,6 +155,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'description' => ts('physical tablename for entity being joined to pledge, e.g. civicrm_contact'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_pledge_block.entity_table', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', 'bao' => 'CRM_Pledge_BAO_PledgeBlock', @@ -165,6 +167,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'title' => ts('Entity Id'), 'description' => ts('FK to entity table specified in entity_table column.'), 'required' => TRUE, + 'where' => 'civicrm_pledge_block.entity_id', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', 'bao' => 'CRM_Pledge_BAO_PledgeBlock', @@ -177,6 +180,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'description' => ts('Delimited list of supported frequency units'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_pledge_block.pledge_frequency_unit', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', 'bao' => 'CRM_Pledge_BAO_PledgeBlock', @@ -188,6 +192,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Expose Frequency Interval?'), 'description' => ts('Is frequency interval exposed on the contribution form.'), + 'where' => 'civicrm_pledge_block.is_pledge_interval', 'default' => '0', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', @@ -199,6 +204,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Maximum Number of Reminders'), 'description' => ts('The maximum number of payment reminders to send for any given payment.'), + 'where' => 'civicrm_pledge_block.max_reminders', 'default' => '1', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', @@ -210,6 +216,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Initial Reminder Day'), 'description' => ts('Send initial reminder this many days prior to the payment due date.'), + 'where' => 'civicrm_pledge_block.initial_reminder_day', 'default' => '5', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', @@ -221,6 +228,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Additional Reminder Days'), 'description' => ts('Send additional reminder this many days after last one sent, up to maximum number of reminders.'), + 'where' => 'civicrm_pledge_block.additional_reminder_day', 'default' => '5', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', @@ -234,6 +242,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'description' => ts('The date the first scheduled pledge occurs.'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_pledge_block.pledge_start_date', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', 'bao' => 'CRM_Pledge_BAO_PledgeBlock', @@ -245,6 +254,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'title' => ts('Show Recurring Donation Start Date?'), 'description' => ts('If true - recurring start date is shown.'), 'required' => TRUE, + 'where' => 'civicrm_pledge_block.is_pledge_start_date_visible', 'default' => '0', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', @@ -257,6 +267,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO { 'title' => ts('Allow Edits to Recurring Donation Start Date?'), 'description' => ts('If true - recurring start date is editable.'), 'required' => TRUE, + 'where' => 'civicrm_pledge_block.is_pledge_start_date_editable', 'default' => '0', 'table_name' => 'civicrm_pledge_block', 'entity' => 'PledgeBlock', diff --git a/CRM/Pledge/DAO/PledgePayment.php b/CRM/Pledge/DAO/PledgePayment.php index d43a0f7791..f3d80a9327 100644 --- a/CRM/Pledge/DAO/PledgePayment.php +++ b/CRM/Pledge/DAO/PledgePayment.php @@ -133,8 +133,6 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_pledge_payment.id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', @@ -147,6 +145,7 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { 'title' => ts('Pledge'), 'description' => ts('FK to Pledge table'), 'required' => TRUE, + 'where' => 'civicrm_pledge_payment.pledge_id', 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', 'bao' => 'CRM_Pledge_BAO_PledgePayment', @@ -158,6 +157,7 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contribution'), 'description' => ts('FK to contribution table.'), + 'where' => 'civicrm_pledge_payment.contribution_id', 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', 'bao' => 'CRM_Pledge_BAO_PledgePayment', @@ -176,8 +176,6 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { ], 'import' => TRUE, 'where' => 'civicrm_pledge_payment.scheduled_amount', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', @@ -195,8 +193,6 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { ], 'import' => TRUE, 'where' => 'civicrm_pledge_payment.actual_amount', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', @@ -210,6 +206,7 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { 'description' => ts('3 character string, value from config setting or input via user.'), 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, + 'where' => 'civicrm_pledge_payment.currency', 'default' => 'NULL', 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', @@ -233,8 +230,6 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { 'required' => TRUE, 'import' => TRUE, 'where' => 'civicrm_pledge_payment.scheduled_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', @@ -252,8 +247,6 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { 'description' => ts('The date that the most recent payment reminder was sent.'), 'import' => TRUE, 'where' => 'civicrm_pledge_payment.reminder_date', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', @@ -267,8 +260,6 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { 'description' => ts('The number of payment reminders sent.'), 'import' => TRUE, 'where' => 'civicrm_pledge_payment.reminder_count', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'default' => '0', 'table_name' => 'civicrm_pledge_payment', @@ -282,8 +273,6 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { 'title' => ts('Payment Status'), 'import' => TRUE, 'where' => 'civicrm_pledge_payment.status_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => FALSE, 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', diff --git a/CRM/Price/DAO/LineItem.php b/CRM/Price/DAO/LineItem.php index 40dbb3f999..8d7ae16d29 100644 --- a/CRM/Price/DAO/LineItem.php +++ b/CRM/Price/DAO/LineItem.php @@ -167,6 +167,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'title' => ts('Line Item ID'), 'description' => ts('Line Item'), 'required' => TRUE, + 'where' => 'civicrm_line_item.id', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -180,6 +181,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_line_item.entity_table', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -191,6 +193,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'title' => ts('Line Item Entity'), 'description' => ts('entry in table'), 'required' => TRUE, + 'where' => 'civicrm_line_item.entity_id', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -201,6 +204,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Line Item Contribution'), 'description' => ts('FK to civicrm_contribution'), + 'where' => 'civicrm_line_item.contribution_id', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -212,6 +216,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Line Item Price Field'), 'description' => ts('FK to civicrm_price_field'), + 'where' => 'civicrm_line_item.price_field_id', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -225,6 +230,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'description' => ts('descriptive label for item - from price_field_value.label'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_line_item.label', 'default' => 'NULL', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', @@ -244,6 +250,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_line_item.qty', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -262,6 +269,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_line_item.unit_price', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -280,6 +288,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_line_item.line_total', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -290,6 +299,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Line Item Participant Count'), 'description' => ts('Participant count for field'), + 'where' => 'civicrm_line_item.participant_count', 'default' => 'NULL', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', @@ -304,6 +314,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Line Item Option'), 'description' => ts('FK to civicrm_price_field_value'), + 'where' => 'civicrm_line_item.price_field_value_id', 'default' => 'NULL', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', @@ -316,6 +327,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('FK to Financial Type.'), + 'where' => 'civicrm_line_item.financial_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', @@ -341,6 +353,9 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_line_item.non_deductible_amount', + 'headerPattern' => '/non?.?deduct/i', + 'dataPattern' => '/^\d+(\.\d{2})?$/', 'default' => '0.0', 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', diff --git a/CRM/Price/DAO/PriceField.php b/CRM/Price/DAO/PriceField.php index 6211831f0b..8f825a1938 100644 --- a/CRM/Price/DAO/PriceField.php +++ b/CRM/Price/DAO/PriceField.php @@ -182,6 +182,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'title' => ts('Price Field ID'), 'description' => ts('Price Field'), 'required' => TRUE, + 'where' => 'civicrm_price_field.id', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', @@ -193,6 +194,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'title' => ts('Price Set'), 'description' => ts('FK to civicrm_price_set'), 'required' => TRUE, + 'where' => 'civicrm_price_field.price_set_id', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', @@ -207,6 +209,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_price_field.name', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', @@ -223,6 +226,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_price_field.label', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', @@ -238,6 +242,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 12, 'size' => CRM_Utils_Type::TWELVE, + 'where' => 'civicrm_price_field.html_type', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', @@ -254,6 +259,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Price Field Quantity Required?'), 'description' => ts('Enter a quantity for this field?'), + 'where' => 'civicrm_price_field.is_enter_qty', 'default' => '0', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', @@ -270,6 +276,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'description' => ts('Description and/or help text to display before this field.'), 'rows' => 4, 'cols' => 80, + 'where' => 'civicrm_price_field.help_pre', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', @@ -285,6 +292,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'description' => ts('Description and/or help text to display after this field.'), 'rows' => 4, 'cols' => 80, + 'where' => 'civicrm_price_field.help_post', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', @@ -298,6 +306,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Order'), 'description' => ts('Order in which the fields should appear'), + 'where' => 'civicrm_price_field.weight', 'default' => '1', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', @@ -312,6 +321,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Price Field Show Amounts?'), 'description' => ts('Should the price be displayed next to the label for each option?'), + 'where' => 'civicrm_price_field.is_display_amounts', 'default' => '1', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', @@ -326,6 +336,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Price Field Options per Row'), 'description' => ts('number of options per line for checkbox and radio'), + 'where' => 'civicrm_price_field.options_per_line', 'default' => '1', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', @@ -340,6 +351,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Price Field Is Active?'), 'description' => ts('Is this price field active'), + 'where' => 'civicrm_price_field.is_active', 'default' => '1', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', @@ -354,6 +366,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Price Field is Required?'), 'description' => ts('Is this price field required (value must be > 1)'), + 'where' => 'civicrm_price_field.is_required', 'default' => '1', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', @@ -368,6 +381,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Price Field Start Date'), 'description' => ts('If non-zero, do not show this field before the date specified'), + 'where' => 'civicrm_price_field.active_on', 'default' => 'NULL', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', @@ -383,6 +397,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Price Field End Date'), 'description' => ts('If non-zero, do not show this field after the date specified'), + 'where' => 'civicrm_price_field.expire_on', 'default' => 'NULL', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', @@ -400,6 +415,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'description' => ts('Optional scripting attributes for field'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_price_field.javascript', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', @@ -413,6 +429,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Price Field Visibility'), 'description' => ts('Implicit FK to civicrm_option_group with name = \'visibility\''), + 'where' => 'civicrm_price_field.visibility_id', 'default' => '1', 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', diff --git a/CRM/Price/DAO/PriceFieldValue.php b/CRM/Price/DAO/PriceFieldValue.php index c449711499..bd6f7daa20 100644 --- a/CRM/Price/DAO/PriceFieldValue.php +++ b/CRM/Price/DAO/PriceFieldValue.php @@ -193,6 +193,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'title' => ts('Price Field Value ID'), 'description' => ts('Price Field Value'), 'required' => TRUE, + 'where' => 'civicrm_price_field_value.id', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -204,6 +205,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'title' => ts('Price Field'), 'description' => ts('FK to civicrm_price_field'), 'required' => TRUE, + 'where' => 'civicrm_price_field_value.price_field_id', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -217,6 +219,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'description' => ts('Price field option name'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_price_field_value.name', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -232,6 +235,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'description' => ts('Price field option label'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_price_field_value.label', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -247,6 +251,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'description' => ts('Price field option description.'), 'rows' => 2, 'cols' => 60, + 'where' => 'civicrm_price_field_value.description', 'default' => 'NULL', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -263,6 +268,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'description' => ts('Price field option pre help text.'), 'rows' => 2, 'cols' => 60, + 'where' => 'civicrm_price_field_value.help_pre', 'default' => 'NULL', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -279,6 +285,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'description' => ts('Price field option post field help.'), 'rows' => 2, 'cols' => 60, + 'where' => 'civicrm_price_field_value.help_post', 'default' => 'NULL', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -298,6 +305,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 18, 9 ], + 'where' => 'civicrm_price_field_value.amount', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -311,6 +319,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Count'), 'description' => ts('Number of participants per field option'), + 'where' => 'civicrm_price_field_value.count', 'default' => 'NULL', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -325,6 +334,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Max Value'), 'description' => ts('Max number of participants per field options'), + 'where' => 'civicrm_price_field_value.max_value', 'default' => 'NULL', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -339,6 +349,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Order'), 'description' => ts('Order in which the field options should appear'), + 'where' => 'civicrm_price_field_value.weight', 'default' => '1', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -353,6 +364,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Membership Type'), 'description' => ts('FK to Membership Type'), + 'where' => 'civicrm_price_field_value.membership_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -368,6 +380,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Membership Num Terms'), 'description' => ts('Number of terms for this membership'), + 'where' => 'civicrm_price_field_value.membership_num_terms', 'default' => 'NULL', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -382,6 +395,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Default Price Field Option?'), 'description' => ts('Is this default price field option'), + 'where' => 'civicrm_price_field_value.is_default', 'default' => '0', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -396,6 +410,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Price Field Value is Active'), 'description' => ts('Is this price field value active'), + 'where' => 'civicrm_price_field_value.is_active', 'default' => '1', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -407,6 +422,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('FK to Financial Type.'), + 'where' => 'civicrm_price_field_value.financial_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -432,6 +448,9 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 20, 2 ], + 'where' => 'civicrm_price_field_value.non_deductible_amount', + 'headerPattern' => '/non?.?deduct/i', + 'dataPattern' => '/^\d+(\.\d{2})?$/', 'default' => '0.0', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', @@ -446,6 +465,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Price Field Option Visibility'), 'description' => ts('Implicit FK to civicrm_option_group with name = \'visibility\''), + 'where' => 'civicrm_price_field_value.visibility_id', 'default' => '1', 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', diff --git a/CRM/Price/DAO/PriceSet.php b/CRM/Price/DAO/PriceSet.php index ed8c4d685b..ae2e04ef8e 100644 --- a/CRM/Price/DAO/PriceSet.php +++ b/CRM/Price/DAO/PriceSet.php @@ -157,6 +157,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'title' => ts('Price Set ID'), 'description' => ts('Price Set'), 'required' => TRUE, + 'where' => 'civicrm_price_set.id', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', 'bao' => 'CRM_Price_BAO_PriceSet', @@ -167,6 +168,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Price Set Domain'), 'description' => ts('Which Domain is this price-set for'), + 'where' => 'civicrm_price_set.domain_id', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', 'bao' => 'CRM_Price_BAO_PriceSet', @@ -189,6 +191,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_price_set.name', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', 'bao' => 'CRM_Price_BAO_PriceSet', @@ -205,6 +208,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_price_set.title', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', 'bao' => 'CRM_Price_BAO_PriceSet', @@ -218,6 +222,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Price Set Is Active?'), 'description' => ts('Is this price set active'), + 'where' => 'civicrm_price_set.is_active', 'default' => '1', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', @@ -234,6 +239,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'description' => ts('Description and/or help text to display before fields in form.'), 'rows' => 4, 'cols' => 80, + 'where' => 'civicrm_price_set.help_pre', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', 'bao' => 'CRM_Price_BAO_PriceSet', @@ -249,6 +255,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'description' => ts('Description and/or help text to display after fields in form.'), 'rows' => 4, 'cols' => 80, + 'where' => 'civicrm_price_set.help_post', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', 'bao' => 'CRM_Price_BAO_PriceSet', @@ -264,6 +271,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'description' => ts('Optional Javascript script function(s) included on the form with this price_set. Can be used for conditional'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_price_set.javascript', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', 'bao' => 'CRM_Price_BAO_PriceSet', @@ -280,6 +288,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_price_set.extends', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', 'bao' => 'CRM_Price_BAO_PriceSet', @@ -298,6 +307,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Financial Type'), 'description' => ts('FK to Financial Type(for membership price sets only).'), + 'where' => 'civicrm_price_set.financial_type_id', 'default' => 'NULL', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', @@ -318,6 +328,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Is Price Set Quick Config?'), 'description' => ts('Is set if edited on Contribution or Event Page rather than through Manage Price Sets'), + 'where' => 'civicrm_price_set.is_quick_config', 'default' => '0', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', @@ -332,6 +343,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Price Set Is Reserved'), 'description' => ts('Is this a predefined system price set (i.e. it can not be deleted, edited)?'), + 'where' => 'civicrm_price_set.is_reserved', 'default' => '0', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', @@ -346,6 +358,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Minimum Amount'), 'description' => ts('Minimum Amount required for this set.'), + 'where' => 'civicrm_price_set.min_amount', 'default' => '0', 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', diff --git a/CRM/Price/DAO/PriceSetEntity.php b/CRM/Price/DAO/PriceSetEntity.php index 0bef5929d7..c665acc98a 100644 --- a/CRM/Price/DAO/PriceSetEntity.php +++ b/CRM/Price/DAO/PriceSetEntity.php @@ -94,6 +94,7 @@ class CRM_Price_DAO_PriceSetEntity extends CRM_Core_DAO { 'title' => ts('Price Set Entity ID'), 'description' => ts('Price Set Entity'), 'required' => TRUE, + 'where' => 'civicrm_price_set_entity.id', 'table_name' => 'civicrm_price_set_entity', 'entity' => 'PriceSetEntity', 'bao' => 'CRM_Price_DAO_PriceSetEntity', @@ -107,6 +108,7 @@ class CRM_Price_DAO_PriceSetEntity extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_price_set_entity.entity_table', 'table_name' => 'civicrm_price_set_entity', 'entity' => 'PriceSetEntity', 'bao' => 'CRM_Price_DAO_PriceSetEntity', @@ -118,6 +120,7 @@ class CRM_Price_DAO_PriceSetEntity extends CRM_Core_DAO { 'title' => ts('Entity IF'), 'description' => ts('Item in table'), 'required' => TRUE, + 'where' => 'civicrm_price_set_entity.entity_id', 'table_name' => 'civicrm_price_set_entity', 'entity' => 'PriceSetEntity', 'bao' => 'CRM_Price_DAO_PriceSetEntity', @@ -129,6 +132,7 @@ class CRM_Price_DAO_PriceSetEntity extends CRM_Core_DAO { 'title' => ts('Price Set'), 'description' => ts('price set being used'), 'required' => TRUE, + 'where' => 'civicrm_price_set_entity.price_set_id', 'table_name' => 'civicrm_price_set_entity', 'entity' => 'PriceSetEntity', 'bao' => 'CRM_Price_DAO_PriceSetEntity', diff --git a/CRM/Queue/DAO/QueueItem.php b/CRM/Queue/DAO/QueueItem.php index 9c54006cbd..de2e97635b 100644 --- a/CRM/Queue/DAO/QueueItem.php +++ b/CRM/Queue/DAO/QueueItem.php @@ -87,6 +87,7 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Queue ID'), 'required' => TRUE, + 'where' => 'civicrm_queue_item.id', 'table_name' => 'civicrm_queue_item', 'entity' => 'QueueItem', 'bao' => 'CRM_Queue_BAO_QueueItem', @@ -100,6 +101,7 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_queue_item.queue_name', 'table_name' => 'civicrm_queue_item', 'entity' => 'QueueItem', 'bao' => 'CRM_Queue_BAO_QueueItem', @@ -113,6 +115,7 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Order'), 'required' => TRUE, + 'where' => 'civicrm_queue_item.weight', 'table_name' => 'civicrm_queue_item', 'entity' => 'QueueItem', 'bao' => 'CRM_Queue_BAO_QueueItem', @@ -127,6 +130,7 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { 'title' => ts('Submit Time'), 'description' => ts('date on which this item was submitted to the queue'), 'required' => TRUE, + 'where' => 'civicrm_queue_item.submit_time', 'table_name' => 'civicrm_queue_item', 'entity' => 'QueueItem', 'bao' => 'CRM_Queue_BAO_QueueItem', @@ -140,6 +144,7 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, 'title' => ts('Release Time'), 'description' => ts('date on which this job becomes available; null if ASAP'), + 'where' => 'civicrm_queue_item.release_time', 'table_name' => 'civicrm_queue_item', 'entity' => 'QueueItem', 'bao' => 'CRM_Queue_BAO_QueueItem', @@ -153,6 +158,7 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Queue item data'), 'description' => ts('Serialized queue data'), + 'where' => 'civicrm_queue_item.data', 'table_name' => 'civicrm_queue_item', 'entity' => 'QueueItem', 'bao' => 'CRM_Queue_BAO_QueueItem', diff --git a/CRM/Report/DAO/ReportInstance.php b/CRM/Report/DAO/ReportInstance.php index bd2d42c3ef..1d5eae4979 100644 --- a/CRM/Report/DAO/ReportInstance.php +++ b/CRM/Report/DAO/ReportInstance.php @@ -214,6 +214,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'title' => ts('Report Instance ID'), 'description' => ts('Report Instance ID'), 'required' => TRUE, + 'where' => 'civicrm_report_instance.id', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -225,6 +226,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'title' => ts('Report Instance Domain ID'), 'description' => ts('Which Domain is this instance for'), 'required' => TRUE, + 'where' => 'civicrm_report_instance.domain_id', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -243,6 +245,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('Report Instance Title.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_report_instance.title', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -259,6 +262,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 512, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_report_instance.report_id', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -274,6 +278,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('when combined with report_id/template uniquely identifies the instance'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_report_instance.name', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -289,6 +294,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('arguments that are passed in the url when invoking the instance'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_report_instance.args', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -304,6 +310,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('Report Instance description.'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_report_instance.description', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -319,6 +326,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('permission required to be able to run this instance'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_report_instance.permission', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -334,6 +342,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('role required to be able to run this instance'), 'maxlength' => 1024, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_report_instance.grouprole', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -349,8 +358,6 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('Submitted form values for this report'), 'import' => TRUE, 'where' => 'civicrm_report_instance.form_values', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', @@ -363,6 +370,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Report Instance is Active'), 'description' => ts('Is this entry active?'), + 'where' => 'civicrm_report_instance.is_active', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -376,6 +384,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Report Instance Created By'), 'description' => ts('FK to contact table.'), + 'where' => 'civicrm_report_instance.created_id', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -387,6 +396,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Report Instance Owned By'), 'description' => ts('FK to contact table.'), + 'where' => 'civicrm_report_instance.owner_id', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -400,6 +410,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('Subject of email'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_report_instance.email_subject', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -413,6 +424,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Email Report Instance To'), 'description' => ts('comma-separated list of email addresses to send the report to'), + 'where' => 'civicrm_report_instance.email_to', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -426,6 +438,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('cc Email Report Instance To'), 'description' => ts('comma-separated list of email addresses to send the report to'), + 'where' => 'civicrm_report_instance.email_cc', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -441,6 +454,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('comma-separated list of email addresses to send the report to'), 'rows' => 4, 'cols' => 60, + 'where' => 'civicrm_report_instance.header', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -456,6 +470,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('comma-separated list of email addresses to send the report to'), 'rows' => 4, 'cols' => 60, + 'where' => 'civicrm_report_instance.footer', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', 'bao' => 'CRM_Report_BAO_ReportInstance', @@ -471,8 +486,6 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('FK to navigation ID'), 'import' => TRUE, 'where' => 'civicrm_report_instance.navigation_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', @@ -487,8 +500,6 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'description' => ts('FK to instance ID drilldown to'), 'import' => TRUE, 'where' => 'civicrm_report_instance.drilldown_id', - 'headerPattern' => '', - 'dataPattern' => '', 'export' => TRUE, 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', @@ -500,6 +511,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO { 'name' => 'is_reserved', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Instance is Reserved'), + 'where' => 'civicrm_report_instance.is_reserved', 'default' => '0', 'table_name' => 'civicrm_report_instance', 'entity' => 'ReportInstance', diff --git a/CRM/SMS/DAO/Provider.php b/CRM/SMS/DAO/Provider.php index 969c212421..36da579b4f 100644 --- a/CRM/SMS/DAO/Provider.php +++ b/CRM/SMS/DAO/Provider.php @@ -132,6 +132,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'title' => ts('SMS Provider ID'), 'description' => ts('SMS Provider ID'), 'required' => TRUE, + 'where' => 'civicrm_sms_provider.id', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', 'bao' => 'CRM_SMS_BAO_Provider', @@ -144,6 +145,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'description' => ts('Provider internal name points to option_value of option_group sms_provider_name'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_sms_provider.name', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', 'bao' => 'CRM_SMS_BAO_Provider', @@ -156,6 +158,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'description' => ts('Provider name visible to user'), 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, + 'where' => 'civicrm_sms_provider.title', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', 'bao' => 'CRM_SMS_BAO_Provider', @@ -170,6 +173,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'title' => ts('SMS Provider Username'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_sms_provider.username', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', 'bao' => 'CRM_SMS_BAO_Provider', @@ -184,6 +188,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'title' => ts('SMS Provider Password'), 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_sms_provider.password', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', 'bao' => 'CRM_SMS_BAO_Provider', @@ -198,6 +203,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'title' => ts('SMS Provider API'), 'description' => ts('points to value in civicrm_option_value for group sms_api_type'), 'required' => TRUE, + 'where' => 'civicrm_sms_provider.api_type', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', 'bao' => 'CRM_SMS_BAO_Provider', @@ -212,6 +218,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'title' => ts('SMS Provider API URL'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'where' => 'civicrm_sms_provider.api_url', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', 'bao' => 'CRM_SMS_BAO_Provider', @@ -225,6 +232,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('SMS Provider API Params'), 'description' => ts('the api params in xml, http or smtp format'), + 'where' => 'civicrm_sms_provider.api_params', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', 'bao' => 'CRM_SMS_BAO_Provider', @@ -237,6 +245,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'name' => 'is_default', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('SMS Provider is Default?'), + 'where' => 'civicrm_sms_provider.is_default', 'default' => '0', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', @@ -250,6 +259,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'name' => 'is_active', 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('SMS Provider is Active?'), + 'where' => 'civicrm_sms_provider.is_active', 'default' => '0', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', @@ -264,6 +274,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('SMS Domain'), 'description' => ts('Which Domain is this sms provider for'), + 'where' => 'civicrm_sms_provider.domain_id', 'table_name' => 'civicrm_sms_provider', 'entity' => 'Provider', 'bao' => 'CRM_SMS_BAO_Provider',