projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f826e3e)
CRM-19506 - Remove conflicting uniqueName from CaseContact DAO
authorColeman Watts <coleman@civicrm.org>
Tue, 25 Oct 2016 17:26:14 +0000 (13:26 -0400)
committerColeman Watts <coleman@civicrm.org>
Tue, 25 Oct 2016 17:27:38 +0000 (13:27 -0400)
This uniqueName did not seem to serve any purpose, and was ambiguous,
easily confused with the "id" column.

CRM/Case/DAO/CaseContact.php patch | blob | blame | history
CRM/Core/DAO/AllCoreTables.data.php patch | blob | blame | history
xml/schema/Case/CaseContact.xml patch | blob | blame | history

diff --git a/CRM/Case/DAO/CaseContact.php b/CRM/Case/DAO/CaseContact.php
index ff1ef5f5e231dd5aed3916b04ee36d564c8e1b0b..19b5cee7d52e61672483d6c166efaf3e7ac036ed 100644 (file)
--- 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 27b381f596e8a67b55c540697c40c346391b60bb..0dbf28032f9791919c233554a6a3c509ee114a5f 100644 (file)
--- 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 738e23c253060633abcd826f182a918ccdbc4a25..7364efd9ed9f6571444809f6f8e02564f9388193 100644 (file)
--- a/xml/schema/Case/CaseContact.xml
+++ b/xml/schema/Case/CaseContact.xml
@@ -37,7 +37,6 @@
     <name>contact_id</name>
     <title>Contact ID</title>
     <type>int unsigned</type>
-    <uniqueName>case_contact_id</uniqueName>
     <required>true</required>
     <comment>Contact ID of contact record given case belongs to.</comment>
     <html>