From 7b9c2f3e6125ffe082012c0dfd40c54e6c92d64d Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 25 Oct 2016 13:26:14 -0400 Subject: [PATCH] CRM-19506 - Remove conflicting uniqueName from CaseContact DAO This uniqueName did not seem to serve any purpose, and was ambiguous, easily confused with the "id" column. --- CRM/Case/DAO/CaseContact.php | 4 ++-- CRM/Core/DAO/AllCoreTables.data.php | 2 +- xml/schema/Case/CaseContact.xml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CRM/Case/DAO/CaseContact.php b/CRM/Case/DAO/CaseContact.php index ff1ef5f5e2..19b5cee7d5 100644 --- a/CRM/Case/DAO/CaseContact.php +++ b/CRM/Case/DAO/CaseContact.php @@ -30,7 +30,7 @@ * * Generated from xml/schema/CRM/Case/CaseContact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:52a6a7dd974e88c088097761faa8ead7) + * (GenCodeChecksum:81a99f6c6d9abe6d08efd359c015036c) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -113,7 +113,7 @@ class CRM_Case_DAO_CaseContact extends CRM_Core_DAO { 'required' => true, 'FKClassName' => 'CRM_Case_DAO_Case', ) , - 'case_contact_id' => array( + 'contact_id' => array( 'name' => 'contact_id', 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Contact ID') , diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php index 27b381f596..0dbf28032f 100644 --- a/CRM/Core/DAO/AllCoreTables.data.php +++ b/CRM/Core/DAO/AllCoreTables.data.php @@ -24,7 +24,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ */ -// (GenCodeChecksum:01f161241dcb8f3cbe924b68f5a42a9d) +// (GenCodeChecksum:89f332e5e88581181224fac51b45a1a4) return array( 'CRM_Core_DAO_AddressFormat' => array( 'name' => 'AddressFormat', diff --git a/xml/schema/Case/CaseContact.xml b/xml/schema/Case/CaseContact.xml index 738e23c253..7364efd9ed 100644 --- a/xml/schema/Case/CaseContact.xml +++ b/xml/schema/Case/CaseContact.xml @@ -37,7 +37,6 @@ contact_id Contact ID int unsigned - case_contact_id true Contact ID of contact record given case belongs to. -- 2.25.1