Merge pull request #10038 from jaapjansma/CRM-20330

Fixed CRM-20330: composite primary keys

CRM/ACL/DAO/ACL.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:64a0037ac9582a2b613798886028013e)
+ * (GenCodeChecksum:0d351e0ae594f1db9f53743dfd3c2efb)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/ACL/DAO/Cache.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/ACL/Cache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c9b0fa8ca419c222fd5de7f8ceefcdd8)
+ * (GenCodeChecksum:160eb4959d8fd0a53ba842f8f32cdbd0)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/ACL/DAO/EntityRole.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/ACL/EntityRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:005d4928f36bf24b5e20e13f18f0588d)
+ * (GenCodeChecksum:e34346dd9bdc6252228fc4b120eac941)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Activity/DAO/Activity.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Activity/Activity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e29dddab1cbaae042d11ea6e022f3dd5)
+ * (GenCodeChecksum:29ee24c7bf76054dc9724f5629c7ebbf)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Activity/DAO/ActivityContact.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Activity/ActivityContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:aad054dda65b709f5861d75e45c20131)
+ * (GenCodeChecksum:7cf139d8144fc560c03c98cb6ae2a54a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Batch/DAO/Batch.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Batch/Batch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d02020e92b997906c5591971b4c4b988)
+ * (GenCodeChecksum:28922d3acf09a4ad091212f1bfa78732)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Batch/DAO/EntityBatch.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Batch/EntityBatch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e3fff81311c24e7691d3ae2c2522d93a)
+ * (GenCodeChecksum:bdeffe170df7314f5643fcd266b2ba16)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Campaign/DAO/Campaign.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Campaign.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1f3125d30683d39abc6a6e1d70a093c8)
+ * (GenCodeChecksum:e9d9e088056e37eb04e359efcc942c5c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Campaign/DAO/CampaignGroup.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/CampaignGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7ada46f496fcb74661d1de2090d934b5)
+ * (GenCodeChecksum:16989135f9745e57028278a41cc303ea)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Campaign/DAO/Survey.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Survey.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:094b1dddcc57e23dbccbfc315d403acc)
+ * (GenCodeChecksum:67be20ebb798711191266af1aaba7f86)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Case/DAO/Case.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Case/Case.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4e1de0ce877b15b7ab3f394dad97c5ac)
+ * (GenCodeChecksum:ec4612a24aed71e99dae33589efc40a0)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Case/DAO/CaseActivity.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseActivity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c769e126891a72af7142bb9a7e61a49e)
+ * (GenCodeChecksum:58cde8198d5fb054a6e3752e61d09d50)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

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:e428f3bbe24412a65b780ae70d400ddb)
+ * (GenCodeChecksum:15085a2da2c504f3157b293dda26d4ab)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Case/DAO/CaseType.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cc1d89a5ea5e6f961de5684cbc6376b9)
+ * (GenCodeChecksum:83343ea4b40dbc52f046f542d8f80d53)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/ACLContactCache.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/ACLContactCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7e4a14b1fc751e6afde12ef2d97c0848)
+ * (GenCodeChecksum:2d5f4a293cde82941d7d3aee38a844d7)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/Contact.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Contact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b16421c318c1224c65e18a9e2aa15a5e)
+ * (GenCodeChecksum:d77ca456ce6c4b21e0788e64b7f5effd)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/ContactType.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/ContactType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ab18da73e77c120a3b3797acdd86a312)
+ * (GenCodeChecksum:8c6a34656d3b53a8a37f5cbcf04b3414)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/DashboardContact.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/DashboardContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5b6c6d2ccc579b98b3300c77898e596e)
+ * (GenCodeChecksum:b02ee36683730f70ab6f1084dd1bfc09)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/Group.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Group.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f0c0283dd397c06e320397ca98628184)
+ * (GenCodeChecksum:7beb9aaa451a87c5e3c15b6508eef727)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/GroupContact.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:35fdfbf11a347cce6ecc36f73561a859)
+ * (GenCodeChecksum:832e42f213ced8c437cc1cb61bdf087f)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/GroupContactCache.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupContactCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:31cd73a50f43edb3cb192e7f3fb47d25)
+ * (GenCodeChecksum:41f4797f37f93e950d1503bf08645836)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/GroupNesting.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupNesting.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4524a06b9ef249c447ab998d441d7413)
+ * (GenCodeChecksum:00fc9bc828e1b87acf20aa16b24b1bac)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/GroupOrganization.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupOrganization.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1a4ff148dcbf5716ea44817892483d27)
+ * (GenCodeChecksum:eb0d4093ec10c1851421ec66f88862f7)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/Relationship.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Relationship.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7435ce706f5392235ecda689d0f55bba)
+ * (GenCodeChecksum:a5a833da9d5016f0aeb06ba7c1058b3c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/RelationshipType.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/RelationshipType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fd2114d6f9d64c68e710c21230e73c5f)
+ * (GenCodeChecksum:9e63f952e1ce68a51b3d4243cd8147c6)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/SavedSearch.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/SavedSearch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:80289cbf6e37633b88e216f1c456ed45)
+ * (GenCodeChecksum:8e799b35db1b6a38deee5a757d4183c0)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contact/DAO/SubscriptionHistory.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contact/SubscriptionHistory.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ec4a81f7d1a8999051ec7292f499b4c1)
+ * (GenCodeChecksum:eb20da8e82a8bc7211f8113a9ce4f76c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contribute/DAO/Contribution.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Contribution.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3e387ab5c998da1bbb367ed526e84289)
+ * (GenCodeChecksum:bff397bf9cf2dc2fef96d7c5ab560158)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contribute/DAO/ContributionPage.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionPage.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6b57cbb621c3ab76d60705c4aad97eb3)
+ * (GenCodeChecksum:4286bdb4dda9fcff6dacd02dba92f054)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contribute/DAO/ContributionProduct.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionProduct.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:79de7abf1bfa670fa9cf3d43e6818bc9)
+ * (GenCodeChecksum:8ef29c5c92b3ffb2a678bd4c585a3d0e)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contribute/DAO/ContributionRecur.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionRecur.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:903092052cbb36344deb3d866e823a0c)
+ * (GenCodeChecksum:5318b7daa057426c1bb8cdec6ed1e4b3)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contribute/DAO/ContributionSoft.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionSoft.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a5b8a7e4a71da5c1b8ac736dbb96d04c)
+ * (GenCodeChecksum:a0b09af89d31819a5108b277b6ba46eb)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contribute/DAO/Premium.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Premium.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:de907699739879536d4c8743092cb6c9)
+ * (GenCodeChecksum:d852ac136e19e27d125c8267e7cd4b95)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contribute/DAO/PremiumsProduct.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/PremiumsProduct.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1b580dfa766db80a9b2faaf4e8037bb7)
+ * (GenCodeChecksum:6c90561115f3fbe406af545ef055f79c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contribute/DAO/Product.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Product.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:664c12f246e380cf7761283a565a1bab)
+ * (GenCodeChecksum:ebf642f7ded9a2d834b74bb4adebd283)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Contribute/DAO/Widget.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Widget.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ab7155865feec4576bd385395739a49a)
+ * (GenCodeChecksum:b47ae223e6fd74db68394139a309be31)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Core/CodeGen/Specification.php

@@ -470,19 +470,49 @@ public function composeTitle($name) {
   public function getPrimaryKey(&$primaryXML, &$fields, &$table) {
     $name = trim((string ) $primaryXML->name);
 
-    /** need to make sure there is a field of type name */
-    if (!array_key_exists($name, $fields)) {
-      echo "primary key $name in {$table['name']} does not have a field definition, ignoring\n";
-      return;
-    }
-
     // set the autoincrement property of the field
     $auto = $this->value('autoincrement', $primaryXML);
+    if (isset($fields[$name])) {
+      $fields[$name]['autoincrement'] = $auto;
+    }
     $fields[$name]['autoincrement'] = $auto;
     $primaryKey = array(
       'name' => $name,
       'autoincrement' => $auto,
     );
+
+    // populate fields
+    foreach ($primaryXML->fieldName as $v) {
+      $fieldName = (string) ($v);
+      $length = (string) ($v['length']);
+      if (strlen($length) > 0) {
+        $fieldName = "$fieldName($length)";
+      }
+      $primaryKey['field'][] = $fieldName;
+    }
+
+    // when field array is empty set it to the name of the primary key.
+    if (empty($primaryKey['field'])) {
+      $primaryKey['field'][] = $name;
+    }
+
+    // all fieldnames have to be defined and should exist in schema.
+    foreach ($primaryKey['field'] as $fieldName) {
+      if (!$fieldName) {
+        echo "Invalid field defination for index $name\n";
+        return;
+      }
+      $parenOffset = strpos($fieldName, '(');
+      if ($parenOffset > 0) {
+        $fieldName = substr($fieldName, 0, $parenOffset);
+      }
+      if (!array_key_exists($fieldName, $fields)) {
+        echo "Table does not contain $fieldName\n";
+        print_r($fields);
+        exit();
+      }
+    }
+
     $table['primaryKey'] = &$primaryKey;
   }
 

CRM/Core/DAO/ActionLog.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:606dca7d7eee4bb6a8e1fd397fa47c70)
+ * (GenCodeChecksum:4ef96df03630ecc884c881b79a40818f)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';

CRM/Core/DAO/ActionMapping.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionMapping.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ad6e23eb5487a699b76678891df6175e)
+ * (GenCodeChecksum:3ae720be63fdf4626db2d1508c2d8f44)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';