From: Jaap Jansma <jaap@edeveloper.nl>
Date: Thu, 23 Mar 2017 13:35:12 +0000 (+0100)
Subject: Fixed CRM-20330: provided a way to generate a table with a composite primary key... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=022785d8d5d4876aa1211b7adc0d7c31e2995fc5;p=civicrm-core.git

Fixed CRM-20330: provided a way to generate a table with a composite primary key. Because the generation of dao functionality is changed all the DAO's had to be regenerated.
---

diff --git a/CRM/ACL/DAO/ACL.php b/CRM/ACL/DAO/ACL.php
index b34649bd2f..dda6508a8a 100644
--- a/CRM/ACL/DAO/ACL.php
+++ b/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';
diff --git a/CRM/ACL/DAO/Cache.php b/CRM/ACL/DAO/Cache.php
index a06ffb3111..c2257939e3 100644
--- a/CRM/ACL/DAO/Cache.php
+++ b/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';
diff --git a/CRM/ACL/DAO/EntityRole.php b/CRM/ACL/DAO/EntityRole.php
index 88677377a0..eaf573ab9d 100644
--- a/CRM/ACL/DAO/EntityRole.php
+++ b/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';
diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php
index 26a5ec64c8..2f089491f2 100644
--- a/CRM/Activity/DAO/Activity.php
+++ b/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';
diff --git a/CRM/Activity/DAO/ActivityContact.php b/CRM/Activity/DAO/ActivityContact.php
index 0d41866638..6a59766ba5 100644
--- a/CRM/Activity/DAO/ActivityContact.php
+++ b/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';
diff --git a/CRM/Batch/DAO/Batch.php b/CRM/Batch/DAO/Batch.php
index 14ed8afb13..d71d121c2f 100644
--- a/CRM/Batch/DAO/Batch.php
+++ b/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';
diff --git a/CRM/Batch/DAO/EntityBatch.php b/CRM/Batch/DAO/EntityBatch.php
index 8280c76f2f..b4e4f84ad5 100644
--- a/CRM/Batch/DAO/EntityBatch.php
+++ b/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';
diff --git a/CRM/Campaign/DAO/Campaign.php b/CRM/Campaign/DAO/Campaign.php
index adc34aa461..b1ed093049 100644
--- a/CRM/Campaign/DAO/Campaign.php
+++ b/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';
diff --git a/CRM/Campaign/DAO/CampaignGroup.php b/CRM/Campaign/DAO/CampaignGroup.php
index dd86f03445..3a90a984b7 100644
--- a/CRM/Campaign/DAO/CampaignGroup.php
+++ b/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';
diff --git a/CRM/Campaign/DAO/Survey.php b/CRM/Campaign/DAO/Survey.php
index 0d749495e8..e3e94b8ba5 100644
--- a/CRM/Campaign/DAO/Survey.php
+++ b/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';
diff --git a/CRM/Case/DAO/Case.php b/CRM/Case/DAO/Case.php
index a028dd01a2..cde1c52c06 100644
--- a/CRM/Case/DAO/Case.php
+++ b/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';
diff --git a/CRM/Case/DAO/CaseActivity.php b/CRM/Case/DAO/CaseActivity.php
index 20322edd95..cbc1fa5da9 100644
--- a/CRM/Case/DAO/CaseActivity.php
+++ b/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';
diff --git a/CRM/Case/DAO/CaseContact.php b/CRM/Case/DAO/CaseContact.php
index 4a5dd9773a..7283537f67 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:e428f3bbe24412a65b780ae70d400ddb)
+ * (GenCodeChecksum:15085a2da2c504f3157b293dda26d4ab)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Case/DAO/CaseType.php b/CRM/Case/DAO/CaseType.php
index 52fa1f49c0..38db3681a9 100644
--- a/CRM/Case/DAO/CaseType.php
+++ b/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';
diff --git a/CRM/Contact/DAO/ACLContactCache.php b/CRM/Contact/DAO/ACLContactCache.php
index fa4297b893..ba68ccb6d8 100644
--- a/CRM/Contact/DAO/ACLContactCache.php
+++ b/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';
diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php
index 0f375714fc..60530b7e60 100644
--- a/CRM/Contact/DAO/Contact.php
+++ b/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';
diff --git a/CRM/Contact/DAO/ContactType.php b/CRM/Contact/DAO/ContactType.php
index 642094554a..9cbf782815 100644
--- a/CRM/Contact/DAO/ContactType.php
+++ b/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';
diff --git a/CRM/Contact/DAO/DashboardContact.php b/CRM/Contact/DAO/DashboardContact.php
index 14c00f5aba..3ee737a691 100644
--- a/CRM/Contact/DAO/DashboardContact.php
+++ b/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';
diff --git a/CRM/Contact/DAO/Group.php b/CRM/Contact/DAO/Group.php
index e6c12fe60b..7c746162c0 100644
--- a/CRM/Contact/DAO/Group.php
+++ b/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';
diff --git a/CRM/Contact/DAO/GroupContact.php b/CRM/Contact/DAO/GroupContact.php
index dd7e5cd7f0..f2bb0e3b20 100644
--- a/CRM/Contact/DAO/GroupContact.php
+++ b/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';
diff --git a/CRM/Contact/DAO/GroupContactCache.php b/CRM/Contact/DAO/GroupContactCache.php
index 27f82be87b..d3202269b6 100644
--- a/CRM/Contact/DAO/GroupContactCache.php
+++ b/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';
diff --git a/CRM/Contact/DAO/GroupNesting.php b/CRM/Contact/DAO/GroupNesting.php
index 71acd19462..23e8cbfcbf 100644
--- a/CRM/Contact/DAO/GroupNesting.php
+++ b/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';
diff --git a/CRM/Contact/DAO/GroupOrganization.php b/CRM/Contact/DAO/GroupOrganization.php
index 8832803dcf..ecd34003c8 100644
--- a/CRM/Contact/DAO/GroupOrganization.php
+++ b/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';
diff --git a/CRM/Contact/DAO/Relationship.php b/CRM/Contact/DAO/Relationship.php
index 9bf186c67a..81916e68b5 100644
--- a/CRM/Contact/DAO/Relationship.php
+++ b/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';
diff --git a/CRM/Contact/DAO/RelationshipType.php b/CRM/Contact/DAO/RelationshipType.php
index fe50113ac5..adb52d255f 100644
--- a/CRM/Contact/DAO/RelationshipType.php
+++ b/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';
diff --git a/CRM/Contact/DAO/SavedSearch.php b/CRM/Contact/DAO/SavedSearch.php
index 98bdf05f19..c74302667f 100644
--- a/CRM/Contact/DAO/SavedSearch.php
+++ b/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';
diff --git a/CRM/Contact/DAO/SubscriptionHistory.php b/CRM/Contact/DAO/SubscriptionHistory.php
index d41f339056..19389f8c91 100644
--- a/CRM/Contact/DAO/SubscriptionHistory.php
+++ b/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';
diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php
index 13d752e081..952ec43868 100644
--- a/CRM/Contribute/DAO/Contribution.php
+++ b/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';
diff --git a/CRM/Contribute/DAO/ContributionPage.php b/CRM/Contribute/DAO/ContributionPage.php
index 9e0574a496..1a45146fb9 100644
--- a/CRM/Contribute/DAO/ContributionPage.php
+++ b/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';
diff --git a/CRM/Contribute/DAO/ContributionProduct.php b/CRM/Contribute/DAO/ContributionProduct.php
index b278f6cfae..6b74957ca8 100644
--- a/CRM/Contribute/DAO/ContributionProduct.php
+++ b/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';
diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php
index 3f70686b8e..c47b176a85 100644
--- a/CRM/Contribute/DAO/ContributionRecur.php
+++ b/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';
diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php
index a0bb399e54..34ff28eeff 100644
--- a/CRM/Contribute/DAO/ContributionSoft.php
+++ b/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';
diff --git a/CRM/Contribute/DAO/Premium.php b/CRM/Contribute/DAO/Premium.php
index 3bb872d771..cdece291b2 100644
--- a/CRM/Contribute/DAO/Premium.php
+++ b/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';
diff --git a/CRM/Contribute/DAO/PremiumsProduct.php b/CRM/Contribute/DAO/PremiumsProduct.php
index 6d733cbb27..ffe453c7da 100644
--- a/CRM/Contribute/DAO/PremiumsProduct.php
+++ b/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';
diff --git a/CRM/Contribute/DAO/Product.php b/CRM/Contribute/DAO/Product.php
index f6f6ecd99a..a0e1effa1a 100644
--- a/CRM/Contribute/DAO/Product.php
+++ b/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';
diff --git a/CRM/Contribute/DAO/Widget.php b/CRM/Contribute/DAO/Widget.php
index b823394e8f..a8f66b31b4 100644
--- a/CRM/Contribute/DAO/Widget.php
+++ b/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';
diff --git a/CRM/Core/CodeGen/Specification.php b/CRM/Core/CodeGen/Specification.php
index be5b19b48a..f4333ec338 100644
--- a/CRM/Core/CodeGen/Specification.php
+++ b/CRM/Core/CodeGen/Specification.php
@@ -470,19 +470,49 @@ class CRM_Core_CodeGen_Specification {
   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;
   }
 
diff --git a/CRM/Core/DAO/ActionLog.php b/CRM/Core/DAO/ActionLog.php
index 0a3170abc5..fe50dac0a2 100644
--- a/CRM/Core/DAO/ActionLog.php
+++ b/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';
diff --git a/CRM/Core/DAO/ActionMapping.php b/CRM/Core/DAO/ActionMapping.php
index 4040d01832..d95d767587 100644
--- a/CRM/Core/DAO/ActionMapping.php
+++ b/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';
diff --git a/CRM/Core/DAO/ActionSchedule.php b/CRM/Core/DAO/ActionSchedule.php
index 17a2d9e696..1014451614 100644
--- a/CRM/Core/DAO/ActionSchedule.php
+++ b/CRM/Core/DAO/ActionSchedule.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionSchedule.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b2eee0985301a53fa1b3f716da197103)
+ * (GenCodeChecksum:d158b2da297ca83e4210a3fa0da8d5eb)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Address.php b/CRM/Core/DAO/Address.php
index 48dd3159ff..82f28870b9 100644
--- a/CRM/Core/DAO/Address.php
+++ b/CRM/Core/DAO/Address.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Address.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f287c4fdc26ea566a1b4fdd3c8975bcb)
+ * (GenCodeChecksum:9538901568da81bcc055d263793c5177)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/AddressFormat.php b/CRM/Core/DAO/AddressFormat.php
index ef16a59f22..1bd75ee368 100644
--- a/CRM/Core/DAO/AddressFormat.php
+++ b/CRM/Core/DAO/AddressFormat.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/AddressFormat.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:dc31831c9c3be6d795d1f1b2c355f0e4)
+ * (GenCodeChecksum:9f58709f0e50bebe21edf4d50880e5fb)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php
index c95dfbfe6c..ad2994a51c 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:2d00b723ca52ca6cb6e6ce01e51cd673)
+// (GenCodeChecksum:fc886bdfa2a4995f67b67d9d1eaabf3c)
 return array(
   'CRM_Core_DAO_AddressFormat' => array(
     'name' => 'AddressFormat',
diff --git a/CRM/Core/DAO/Cache.php b/CRM/Core/DAO/Cache.php
index 526ecb118c..749d1b37f1 100644
--- a/CRM/Core/DAO/Cache.php
+++ b/CRM/Core/DAO/Cache.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Cache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b9b25f7ebdd74e09ed9641a217ffb521)
+ * (GenCodeChecksum:bd310a3a686583eeeb7e0e91edb50318)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Component.php b/CRM/Core/DAO/Component.php
index 72dbb3b4f2..53a6db34de 100644
--- a/CRM/Core/DAO/Component.php
+++ b/CRM/Core/DAO/Component.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Component.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:890aede5d4ff5b9408e5560494eca6e6)
+ * (GenCodeChecksum:14ca0040d5a5656fd5dd91ad60a8ac89)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Country.php b/CRM/Core/DAO/Country.php
index dfe97a6950..81f8ba1979 100644
--- a/CRM/Core/DAO/Country.php
+++ b/CRM/Core/DAO/Country.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Country.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c5310b6d489953cb4e44654d4dd990c2)
+ * (GenCodeChecksum:a24c5ddeda39cc2efe1110845d0d9484)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/County.php b/CRM/Core/DAO/County.php
index 3daea9d1a2..e346e2e8f9 100644
--- a/CRM/Core/DAO/County.php
+++ b/CRM/Core/DAO/County.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/County.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:824c915d12ea56f2abb94267ca139391)
+ * (GenCodeChecksum:85404ece3f86dd6b1af99b0756b55331)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/CustomField.php b/CRM/Core/DAO/CustomField.php
index 6552ccaa58..e679adf274 100644
--- a/CRM/Core/DAO/CustomField.php
+++ b/CRM/Core/DAO/CustomField.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9a71ccf425ce3ba8f5ad59f4fdb8ebf8)
+ * (GenCodeChecksum:64148b931b180c52c082dafcde1e604d)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/CustomGroup.php b/CRM/Core/DAO/CustomGroup.php
index 4eede3724b..15d381e34e 100644
--- a/CRM/Core/DAO/CustomGroup.php
+++ b/CRM/Core/DAO/CustomGroup.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:190b0c5691831c6708b5de7ce556836d)
+ * (GenCodeChecksum:2934f389569229a3217b9e1397b3120b)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Dashboard.php b/CRM/Core/DAO/Dashboard.php
index cffe960613..dc7623fa19 100644
--- a/CRM/Core/DAO/Dashboard.php
+++ b/CRM/Core/DAO/Dashboard.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Dashboard.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3e0b2bd066d83876c81d84a574f29fe1)
+ * (GenCodeChecksum:c7da94b2dee007a82d0687b025cc5ed6)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Discount.php b/CRM/Core/DAO/Discount.php
index 50957121f3..8f8bf59fd3 100644
--- a/CRM/Core/DAO/Discount.php
+++ b/CRM/Core/DAO/Discount.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Discount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f09af911434bdf229ff455ec8a0616b0)
+ * (GenCodeChecksum:7a25225a1380633ffa2bac34eb7f139c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Domain.php b/CRM/Core/DAO/Domain.php
index 989d117c3c..43df88c883 100644
--- a/CRM/Core/DAO/Domain.php
+++ b/CRM/Core/DAO/Domain.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Domain.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8dd47669e949ac899026a03b3c47c488)
+ * (GenCodeChecksum:aab20d05e6c3ebe8f6eb8a7de50190a0)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Email.php b/CRM/Core/DAO/Email.php
index 55b5ad19ae..807044de26 100644
--- a/CRM/Core/DAO/Email.php
+++ b/CRM/Core/DAO/Email.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Email.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4ad6f174320af9da20e5f3cd86295a8a)
+ * (GenCodeChecksum:33bf5e19c3136f4860d3d078a3fbd68d)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/EntityFile.php b/CRM/Core/DAO/EntityFile.php
index 8dfd35aa09..16a39ae5d7 100644
--- a/CRM/Core/DAO/EntityFile.php
+++ b/CRM/Core/DAO/EntityFile.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/EntityFile.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:59378491e72c7d8ae875c88b9a24d2c9)
+ * (GenCodeChecksum:f1092b243ba0c368c41d7b64dc90e115)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/EntityTag.php b/CRM/Core/DAO/EntityTag.php
index 7709f8eba4..6382461327 100644
--- a/CRM/Core/DAO/EntityTag.php
+++ b/CRM/Core/DAO/EntityTag.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/EntityTag.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5111634a7040650184aa7e5206b1ea56)
+ * (GenCodeChecksum:0a4ce003543cfc6ff15c6807b3ff1106)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Extension.php b/CRM/Core/DAO/Extension.php
index 5874746cbc..bae5de5daa 100644
--- a/CRM/Core/DAO/Extension.php
+++ b/CRM/Core/DAO/Extension.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Extension.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d6bfb607b63fda77d26266578ac330a8)
+ * (GenCodeChecksum:fdbe27f0b1587c2b4806d98f474e78ed)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/File.php b/CRM/Core/DAO/File.php
index 5c588ce244..81cc49889b 100644
--- a/CRM/Core/DAO/File.php
+++ b/CRM/Core/DAO/File.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/File.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5ebcac807175fc3e3aa6030c9416fd14)
+ * (GenCodeChecksum:996b2702471b24fb13c740ef104ea1f9)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/IM.php b/CRM/Core/DAO/IM.php
index d353372174..203e135248 100644
--- a/CRM/Core/DAO/IM.php
+++ b/CRM/Core/DAO/IM.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/IM.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:53a1953d19c17bde7f130123db0284fb)
+ * (GenCodeChecksum:1898c44afea9d407ac2d916b2bc2bb1c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Job.php b/CRM/Core/DAO/Job.php
index 2d393f3669..81fe117fbf 100644
--- a/CRM/Core/DAO/Job.php
+++ b/CRM/Core/DAO/Job.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Job.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e85676147c697d8b831063aa9e13f9b4)
+ * (GenCodeChecksum:c3340527b2d2cb17211eba848371b469)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/JobLog.php b/CRM/Core/DAO/JobLog.php
index 47ef0e816c..492425bfd9 100644
--- a/CRM/Core/DAO/JobLog.php
+++ b/CRM/Core/DAO/JobLog.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/JobLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:65d0e0cdf11d956a795d2793461e4432)
+ * (GenCodeChecksum:8bf259a1e340e91eb72255dd7cdba531)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/LocBlock.php b/CRM/Core/DAO/LocBlock.php
index ff2d054bbd..499e1a6aba 100644
--- a/CRM/Core/DAO/LocBlock.php
+++ b/CRM/Core/DAO/LocBlock.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/LocBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ecec4c8ded5032d2f163be6e13879e67)
+ * (GenCodeChecksum:0782115dac3b6bb5e8a0291ddf5285ba)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/LocationType.php b/CRM/Core/DAO/LocationType.php
index 90aa78f6ae..262d1cb842 100644
--- a/CRM/Core/DAO/LocationType.php
+++ b/CRM/Core/DAO/LocationType.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/LocationType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0b798f6f542204b5746806626f24361c)
+ * (GenCodeChecksum:daa67b934cbd545eaa5dbb659063900a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Log.php b/CRM/Core/DAO/Log.php
index 9b674bb136..673a98ead9 100644
--- a/CRM/Core/DAO/Log.php
+++ b/CRM/Core/DAO/Log.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Log.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a0c51596a4ccc5f07a5dcec00bbb7231)
+ * (GenCodeChecksum:8ba1221b34b495c2238ecf5197e5a47f)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/MailSettings.php b/CRM/Core/DAO/MailSettings.php
index 32dd11b9ab..33b82e903c 100644
--- a/CRM/Core/DAO/MailSettings.php
+++ b/CRM/Core/DAO/MailSettings.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/MailSettings.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0e3685a7f3ef7351dd7539dc0320cb1e)
+ * (GenCodeChecksum:739e36d6ca1f8572f5f9eff77975765e)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Managed.php b/CRM/Core/DAO/Managed.php
index b5d4a9159f..18f5aa9f65 100644
--- a/CRM/Core/DAO/Managed.php
+++ b/CRM/Core/DAO/Managed.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Managed.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1eadd6ffdb011ed6d4ff672f1e629719)
+ * (GenCodeChecksum:1ea17fedbb00e336fb0ed9f830990aed)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Mapping.php b/CRM/Core/DAO/Mapping.php
index 7c7bfbf5aa..48b803e5c3 100644
--- a/CRM/Core/DAO/Mapping.php
+++ b/CRM/Core/DAO/Mapping.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Mapping.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:87937c4e117abc8cd9ed04c2f054d26f)
+ * (GenCodeChecksum:d1765f6068ff03162b649e2cabbcff0b)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/MappingField.php b/CRM/Core/DAO/MappingField.php
index e4a9fd867e..391b1e674e 100644
--- a/CRM/Core/DAO/MappingField.php
+++ b/CRM/Core/DAO/MappingField.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/MappingField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:935db8f08ad2cb16367389613e1097a3)
+ * (GenCodeChecksum:6e729c48a9732fd57132ddfe6f9d02b9)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Menu.php b/CRM/Core/DAO/Menu.php
index 2142548933..2b5ccf467b 100644
--- a/CRM/Core/DAO/Menu.php
+++ b/CRM/Core/DAO/Menu.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Menu.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6b8b04ecdcad520cc0d209ea00c338c0)
+ * (GenCodeChecksum:4c287373462fde7a27f6e6b4388f19bf)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/MessageTemplate.php b/CRM/Core/DAO/MessageTemplate.php
index 5d03c8eac4..6934006495 100644
--- a/CRM/Core/DAO/MessageTemplate.php
+++ b/CRM/Core/DAO/MessageTemplate.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/MessageTemplate.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:eb871e98ab4f44d12853c54bd78c8077)
+ * (GenCodeChecksum:ca87344addd76f0aca31f53071a01238)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Navigation.php b/CRM/Core/DAO/Navigation.php
index 936857267c..7fc9e70410 100644
--- a/CRM/Core/DAO/Navigation.php
+++ b/CRM/Core/DAO/Navigation.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Navigation.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6bcfc36c3844541d96395d62c5f1b33e)
+ * (GenCodeChecksum:50047b21bb89d424e7852ea198e521fc)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Note.php b/CRM/Core/DAO/Note.php
index cf62bc16e4..dc632684f1 100644
--- a/CRM/Core/DAO/Note.php
+++ b/CRM/Core/DAO/Note.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Note.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ad394e9a106ae70fd38afdbe29030fae)
+ * (GenCodeChecksum:ec8b51e4a3440e6fb1979540b5f563cb)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/OpenID.php b/CRM/Core/DAO/OpenID.php
index 153c55cfba..e1caab8ad0 100644
--- a/CRM/Core/DAO/OpenID.php
+++ b/CRM/Core/DAO/OpenID.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/OpenID.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:901c3d244415b1f62513c4cb0acabb40)
+ * (GenCodeChecksum:b249eab35ab06ddd2ff558150552df97)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/OptionGroup.php b/CRM/Core/DAO/OptionGroup.php
index 25c8337a41..1baf1f36e5 100644
--- a/CRM/Core/DAO/OptionGroup.php
+++ b/CRM/Core/DAO/OptionGroup.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/OptionGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2e3db1094947600ecdc89b4d3255111c)
+ * (GenCodeChecksum:b096e68eb6d161af387cd86ac25d3fd7)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/OptionValue.php b/CRM/Core/DAO/OptionValue.php
index 0421faf71a..66f201b27a 100644
--- a/CRM/Core/DAO/OptionValue.php
+++ b/CRM/Core/DAO/OptionValue.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/OptionValue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6b362793b6f41ccdaa6281af6d6e7f46)
+ * (GenCodeChecksum:4612fedbdb7df79174580247d8d0109c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Persistent.php b/CRM/Core/DAO/Persistent.php
index a3257570f7..97b5a9fd3f 100644
--- a/CRM/Core/DAO/Persistent.php
+++ b/CRM/Core/DAO/Persistent.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Persistent.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:435a9aa78f94ebc91ddf5cccd749c06c)
+ * (GenCodeChecksum:f215d2eac0f061ca085bcee3c4dca25f)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Phone.php b/CRM/Core/DAO/Phone.php
index ca615e0fee..602f4ee916 100644
--- a/CRM/Core/DAO/Phone.php
+++ b/CRM/Core/DAO/Phone.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Phone.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5c4a5cc072b2fbe3bef7323078037a39)
+ * (GenCodeChecksum:aed6082497eb601fdc249c7a361204a8)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/PreferencesDate.php b/CRM/Core/DAO/PreferencesDate.php
index 333b574278..7ef031a137 100644
--- a/CRM/Core/DAO/PreferencesDate.php
+++ b/CRM/Core/DAO/PreferencesDate.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/PreferencesDate.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:83439f40bb9575f11349e417c71ca68e)
+ * (GenCodeChecksum:c6c3c0c91ca3f33fa11b89fb6e2dd704)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/PrevNextCache.php b/CRM/Core/DAO/PrevNextCache.php
index cb2038220d..fc096a58fe 100644
--- a/CRM/Core/DAO/PrevNextCache.php
+++ b/CRM/Core/DAO/PrevNextCache.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/PrevNextCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c8b28aa80b16b802dadc6f922048fc7d)
+ * (GenCodeChecksum:c079d78b4553940fd29dd4e1f7e19477)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/PrintLabel.php b/CRM/Core/DAO/PrintLabel.php
index b3d0281fe3..cefb1af313 100644
--- a/CRM/Core/DAO/PrintLabel.php
+++ b/CRM/Core/DAO/PrintLabel.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/PrintLabel.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bcabbb7ab1a643e2aeafe9cc0714027b)
+ * (GenCodeChecksum:af33d193b72fd8c8bf260c0625c7acf6)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/RecurringEntity.php b/CRM/Core/DAO/RecurringEntity.php
index 016ec1580b..c1c8cce7e4 100644
--- a/CRM/Core/DAO/RecurringEntity.php
+++ b/CRM/Core/DAO/RecurringEntity.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/RecurringEntity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5fb23a9b10fd9ba0dad2bfa4f28bd95a)
+ * (GenCodeChecksum:926c9bc8d5175511764721bc9dc8562a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Setting.php b/CRM/Core/DAO/Setting.php
index 7a81395814..e1a19f9972 100644
--- a/CRM/Core/DAO/Setting.php
+++ b/CRM/Core/DAO/Setting.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Setting.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:91a0de9ff5f2bffc9dee33e917c07899)
+ * (GenCodeChecksum:03045a230d0ba9aa60bf9dd4818cb12e)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/StateProvince.php b/CRM/Core/DAO/StateProvince.php
index 8b35cc4988..58b9596130 100644
--- a/CRM/Core/DAO/StateProvince.php
+++ b/CRM/Core/DAO/StateProvince.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/StateProvince.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e5dfa02e49518692335417068be35aa9)
+ * (GenCodeChecksum:baa81154c9779b2e56e78504e7c9b74c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/StatusPreference.php b/CRM/Core/DAO/StatusPreference.php
index c9cc246bad..53d1594e87 100644
--- a/CRM/Core/DAO/StatusPreference.php
+++ b/CRM/Core/DAO/StatusPreference.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/StatusPreference.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:85d69d553067343befccf2308e6e9cc5)
+ * (GenCodeChecksum:1499bd12f161a041bdb9ccfd2595cd94)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/SystemLog.php b/CRM/Core/DAO/SystemLog.php
index f4a4c9cc7e..d33d9042e9 100644
--- a/CRM/Core/DAO/SystemLog.php
+++ b/CRM/Core/DAO/SystemLog.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/SystemLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:593327a2dbc09824972cc4d44fbd6893)
+ * (GenCodeChecksum:74683682d7114abb261677b351cd8711)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Tag.php b/CRM/Core/DAO/Tag.php
index 65233d5d77..bb4240c22b 100644
--- a/CRM/Core/DAO/Tag.php
+++ b/CRM/Core/DAO/Tag.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Tag.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d676c3ec724cfc5f8b03e891b148c7ab)
+ * (GenCodeChecksum:44541277221c451f8aa93c6170180c44)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Timezone.php b/CRM/Core/DAO/Timezone.php
index 58ad4f8685..c9824e6650 100644
--- a/CRM/Core/DAO/Timezone.php
+++ b/CRM/Core/DAO/Timezone.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Timezone.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:42027e07849551eac4deddd0eb21da5d)
+ * (GenCodeChecksum:0f44e0b7202cc3ace2ec6b7003fc941a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/UFField.php b/CRM/Core/DAO/UFField.php
index cdb9f9032b..c63008dae4 100644
--- a/CRM/Core/DAO/UFField.php
+++ b/CRM/Core/DAO/UFField.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7fdc008a9c2681e68699bbb85690cfc6)
+ * (GenCodeChecksum:d2130248046efdb387d19bc28fab23b4)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/UFGroup.php b/CRM/Core/DAO/UFGroup.php
index 6f076d76de..7b5c7f4711 100644
--- a/CRM/Core/DAO/UFGroup.php
+++ b/CRM/Core/DAO/UFGroup.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:16bf8f20b843d4d8824e37d8f922108b)
+ * (GenCodeChecksum:3ab5150cf38511c5751620af69a513ec)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/UFJoin.php b/CRM/Core/DAO/UFJoin.php
index 915f4c0d61..2917ea9692 100644
--- a/CRM/Core/DAO/UFJoin.php
+++ b/CRM/Core/DAO/UFJoin.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFJoin.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ff46cde9614a8c441e00dc66cdeb8667)
+ * (GenCodeChecksum:eca8ea8e182d1cd8e3e21770ae28438e)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/UFMatch.php b/CRM/Core/DAO/UFMatch.php
index 6d19ec3c96..322158c34e 100644
--- a/CRM/Core/DAO/UFMatch.php
+++ b/CRM/Core/DAO/UFMatch.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFMatch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7a4ca7be149cba37dc9cfb8c2885989c)
+ * (GenCodeChecksum:dc761cd7cd2455417d981e8c3542cd28)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Website.php b/CRM/Core/DAO/Website.php
index c04526369c..382cdf677c 100644
--- a/CRM/Core/DAO/Website.php
+++ b/CRM/Core/DAO/Website.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Website.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:42189dd53f14c27bba3cc5f498ad1324)
+ * (GenCodeChecksum:acc04540983491cf9eac68c43b6d1c87)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/WordReplacement.php b/CRM/Core/DAO/WordReplacement.php
index 0ee85b9fcb..4faa878946 100644
--- a/CRM/Core/DAO/WordReplacement.php
+++ b/CRM/Core/DAO/WordReplacement.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/WordReplacement.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ae2435f4e472f131fa088a232ae6d88e)
+ * (GenCodeChecksum:9e67d9e8dbcc13ce3f943a19c77bbdfa)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Core/DAO/Worldregion.php b/CRM/Core/DAO/Worldregion.php
index c218d96f13..f475d46152 100644
--- a/CRM/Core/DAO/Worldregion.php
+++ b/CRM/Core/DAO/Worldregion.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Worldregion.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f5c8d65e40e3ba2255256675c0aa863f)
+ * (GenCodeChecksum:6dd4c29dfca409c7cd7a735836abd202)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Cxn/DAO/Cxn.php b/CRM/Cxn/DAO/Cxn.php
index 6429c60eee..ff7d3cf2c3 100644
--- a/CRM/Cxn/DAO/Cxn.php
+++ b/CRM/Cxn/DAO/Cxn.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Cxn/Cxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:72b767c4b9d246ef1efb8b9c7c5b6312)
+ * (GenCodeChecksum:5293636371f8d0062ac30e2626739e63)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Dedupe/DAO/Exception.php b/CRM/Dedupe/DAO/Exception.php
index d15ce148c6..cd21c161ed 100644
--- a/CRM/Dedupe/DAO/Exception.php
+++ b/CRM/Dedupe/DAO/Exception.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/Exception.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1686b10aca53b1028d00ba93c1275a01)
+ * (GenCodeChecksum:5ab409ab490ba266b8cff7ba387624fa)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Dedupe/DAO/Rule.php b/CRM/Dedupe/DAO/Rule.php
index fb4d4247f8..63b0d65b54 100644
--- a/CRM/Dedupe/DAO/Rule.php
+++ b/CRM/Dedupe/DAO/Rule.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/Rule.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:04d8d83fcc9facdeae7f32f1f0f0134d)
+ * (GenCodeChecksum:d4069481ff6f6925ed299206f67ab01e)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Dedupe/DAO/RuleGroup.php b/CRM/Dedupe/DAO/RuleGroup.php
index 24eacd38fd..fed2545027 100644
--- a/CRM/Dedupe/DAO/RuleGroup.php
+++ b/CRM/Dedupe/DAO/RuleGroup.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/RuleGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:025711212afbee5275704d4a7e63868f)
+ * (GenCodeChecksum:0f103fb52cf7d96d601d83e8417f77ad)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Event/Cart/DAO/Cart.php b/CRM/Event/Cart/DAO/Cart.php
index 3022119f76..85cfc48821 100644
--- a/CRM/Event/Cart/DAO/Cart.php
+++ b/CRM/Event/Cart/DAO/Cart.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Event/Cart/Cart.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d4897397e64f37a6e13086f1d4cab2ce)
+ * (GenCodeChecksum:fd3bfb8e04f5a5101f38d928b1d056cb)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Event/Cart/DAO/EventInCart.php b/CRM/Event/Cart/DAO/EventInCart.php
index 1d4ac3275b..7f09ad95f7 100644
--- a/CRM/Event/Cart/DAO/EventInCart.php
+++ b/CRM/Event/Cart/DAO/EventInCart.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Event/Cart/EventInCart.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7fc2704d7a10bd0af8f9a34ab7adf2f1)
+ * (GenCodeChecksum:6b0b02cd86b7cc7e07b35cd72afa785f)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php
index 8738f0b52d..0d16a902b6 100644
--- a/CRM/Event/DAO/Event.php
+++ b/CRM/Event/DAO/Event.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Event/Event.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:014eddf6b4d26ee14495d25e73ed6b64)
+ * (GenCodeChecksum:b56a42da43230cceef81f565d74b8805)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Event/DAO/Participant.php b/CRM/Event/DAO/Participant.php
index 8da34792f3..888f389009 100644
--- a/CRM/Event/DAO/Participant.php
+++ b/CRM/Event/DAO/Participant.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Event/Participant.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:87c3d1afa18e39e10ba019d773eb6ce8)
+ * (GenCodeChecksum:cb95d1337bbf4098362e0808dbbdeabf)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Event/DAO/ParticipantPayment.php b/CRM/Event/DAO/ParticipantPayment.php
index 1d67a167d9..79a66f3e03 100644
--- a/CRM/Event/DAO/ParticipantPayment.php
+++ b/CRM/Event/DAO/ParticipantPayment.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Event/ParticipantPayment.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:98af10333d1dca08770a55573e291c32)
+ * (GenCodeChecksum:6e45de066d601172a59c64752f11558a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Event/DAO/ParticipantStatusType.php b/CRM/Event/DAO/ParticipantStatusType.php
index d34564f22a..ca88711e54 100644
--- a/CRM/Event/DAO/ParticipantStatusType.php
+++ b/CRM/Event/DAO/ParticipantStatusType.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Event/ParticipantStatusType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c9d362916fb5d3e9c3ffa089517bff7e)
+ * (GenCodeChecksum:ee7ee3c21fbd68e35d4249da6136c4ef)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/Currency.php b/CRM/Financial/DAO/Currency.php
index 34f17c4486..cf2da99d66 100644
--- a/CRM/Financial/DAO/Currency.php
+++ b/CRM/Financial/DAO/Currency.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/Currency.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:901761be1a81c165e690e7cafe8fe419)
+ * (GenCodeChecksum:8cf9dbd2493448f02e1173d686b98fbb)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/EntityFinancialAccount.php b/CRM/Financial/DAO/EntityFinancialAccount.php
index 5021b4eb42..7f6f767adc 100644
--- a/CRM/Financial/DAO/EntityFinancialAccount.php
+++ b/CRM/Financial/DAO/EntityFinancialAccount.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/EntityFinancialAccount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:46b680193ab75e97679a2521282b1cc0)
+ * (GenCodeChecksum:227febd12437c66f2e3ef5b3689f9901)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/EntityFinancialTrxn.php b/CRM/Financial/DAO/EntityFinancialTrxn.php
index 93239a5809..c824b4fba1 100644
--- a/CRM/Financial/DAO/EntityFinancialTrxn.php
+++ b/CRM/Financial/DAO/EntityFinancialTrxn.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/EntityFinancialTrxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:058c355295d7bbbdefb1421ba1d2a294)
+ * (GenCodeChecksum:ebf620763b584524906dc13f45a3fbdf)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/FinancialAccount.php b/CRM/Financial/DAO/FinancialAccount.php
index 1e63f7f042..9fb34a8629 100644
--- a/CRM/Financial/DAO/FinancialAccount.php
+++ b/CRM/Financial/DAO/FinancialAccount.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialAccount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e2138251a2433069b991db111a5f55d2)
+ * (GenCodeChecksum:14d3715c48b20555e6bce4ff679cd251)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/FinancialItem.php b/CRM/Financial/DAO/FinancialItem.php
index 4fe424823c..790891f4ec 100644
--- a/CRM/Financial/DAO/FinancialItem.php
+++ b/CRM/Financial/DAO/FinancialItem.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:090a94af55641978012615f30c962781)
+ * (GenCodeChecksum:009860f02e86ddf541f553766597e0c6)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/FinancialTrxn.php b/CRM/Financial/DAO/FinancialTrxn.php
index 2a13482928..f840b3666b 100644
--- a/CRM/Financial/DAO/FinancialTrxn.php
+++ b/CRM/Financial/DAO/FinancialTrxn.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialTrxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:52a627d344bca95d30eb8b22aad1e245)
+ * (GenCodeChecksum:84188ea8db9380a96a74a4e577cb8b93)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/FinancialType.php b/CRM/Financial/DAO/FinancialType.php
index 2460fd503b..a40b12cc5d 100644
--- a/CRM/Financial/DAO/FinancialType.php
+++ b/CRM/Financial/DAO/FinancialType.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9afeed9e1cb73cc4abf490d723ff4ea1)
+ * (GenCodeChecksum:286b2e763395441774d1a91db61da8ca)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/PaymentProcessor.php b/CRM/Financial/DAO/PaymentProcessor.php
index 698fab0a6a..87b2ac0949 100644
--- a/CRM/Financial/DAO/PaymentProcessor.php
+++ b/CRM/Financial/DAO/PaymentProcessor.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentProcessor.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1a8c248f76428a0d765483634cf988f7)
+ * (GenCodeChecksum:d638c879011835041875c04db5831748)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/PaymentProcessorType.php b/CRM/Financial/DAO/PaymentProcessorType.php
index 012e91f877..ae695a5136 100644
--- a/CRM/Financial/DAO/PaymentProcessorType.php
+++ b/CRM/Financial/DAO/PaymentProcessorType.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentProcessorType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:39cdf5f44260a922c605275692b91f07)
+ * (GenCodeChecksum:db09edc5cc1a18facd824b62fe4d4061)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Financial/DAO/PaymentToken.php b/CRM/Financial/DAO/PaymentToken.php
index 3c78cba4c7..5cf746e632 100644
--- a/CRM/Financial/DAO/PaymentToken.php
+++ b/CRM/Financial/DAO/PaymentToken.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentToken.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5fc7f512cc85341d815456cf9c355797)
+ * (GenCodeChecksum:6b3810f34b7a2c1aacecfb67f1d09b42)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Friend/DAO/Friend.php b/CRM/Friend/DAO/Friend.php
index 2f78371225..cfea10efcc 100644
--- a/CRM/Friend/DAO/Friend.php
+++ b/CRM/Friend/DAO/Friend.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Friend/Friend.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:62f899b48f9f20def0ab8def52ff5be7)
+ * (GenCodeChecksum:f43aa2600521ff0d7c499e9d432dfe8f)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Grant/DAO/Grant.php b/CRM/Grant/DAO/Grant.php
index 63b7395591..234a6d1469 100644
--- a/CRM/Grant/DAO/Grant.php
+++ b/CRM/Grant/DAO/Grant.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Grant/Grant.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5b5a9e7de7ef9bec79b0aa543804422c)
+ * (GenCodeChecksum:2abbee941ab414e5e67978a55a5bb2ee)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/BouncePattern.php b/CRM/Mailing/DAO/BouncePattern.php
index 0a634603a8..04acb7d576 100644
--- a/CRM/Mailing/DAO/BouncePattern.php
+++ b/CRM/Mailing/DAO/BouncePattern.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/BouncePattern.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4e496c14b703c0c46a4011924eda52e6)
+ * (GenCodeChecksum:d913b0da4c5cbb03a7d23cc28e3d4dcd)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/BounceType.php b/CRM/Mailing/DAO/BounceType.php
index d988e57e08..16be48d6ed 100644
--- a/CRM/Mailing/DAO/BounceType.php
+++ b/CRM/Mailing/DAO/BounceType.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/BounceType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d68c2efe2239490c33482af1416b3c80)
+ * (GenCodeChecksum:58e082dadf7a5125e5c34d0f9cffb0f1)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/Component.php b/CRM/Mailing/DAO/Component.php
index e636dbbe48..3c3bf5fd47 100644
--- a/CRM/Mailing/DAO/Component.php
+++ b/CRM/Mailing/DAO/Component.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Component.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:108b795c40ec776368214ac33a4c2a52)
+ * (GenCodeChecksum:33742feaa53eaba2c4a543c4e5c673ab)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php
index 22fe945352..0d189b8a83 100644
--- a/CRM/Mailing/DAO/Mailing.php
+++ b/CRM/Mailing/DAO/Mailing.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Mailing.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ef93e557813ce88a79ae6a0e07765301)
+ * (GenCodeChecksum:3711bcf18e92336fdc0a4c81af169de6)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/MailingAB.php b/CRM/Mailing/DAO/MailingAB.php
index b4b1c5f999..e85dcbee98 100644
--- a/CRM/Mailing/DAO/MailingAB.php
+++ b/CRM/Mailing/DAO/MailingAB.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingAB.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:34704091aa51693971aaab2d2ac7c1cf)
+ * (GenCodeChecksum:fea3382fd8611956ff04827237800b49)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/MailingGroup.php b/CRM/Mailing/DAO/MailingGroup.php
index 69a8975723..18f437a68e 100644
--- a/CRM/Mailing/DAO/MailingGroup.php
+++ b/CRM/Mailing/DAO/MailingGroup.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fa734125b5fd4a3d8d916fc0cfdfbba4)
+ * (GenCodeChecksum:a96d346551d72b03fa3ca07ac47cff2b)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/MailingJob.php b/CRM/Mailing/DAO/MailingJob.php
index 899e0f5f4b..cb0a6bc085 100644
--- a/CRM/Mailing/DAO/MailingJob.php
+++ b/CRM/Mailing/DAO/MailingJob.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingJob.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0d980fe5408cdcfa95a640da20a9f2f2)
+ * (GenCodeChecksum:c08c4d0fc52564ca707e07af4649231c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/Recipients.php b/CRM/Mailing/DAO/Recipients.php
index 5ca8d796e9..2947f73955 100644
--- a/CRM/Mailing/DAO/Recipients.php
+++ b/CRM/Mailing/DAO/Recipients.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Recipients.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7eb576d30bbc948ab5b632294a081cf8)
+ * (GenCodeChecksum:c342948a9f69ec474335688029f101e0)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/Spool.php b/CRM/Mailing/DAO/Spool.php
index 6f402eae1d..85a4b6576e 100644
--- a/CRM/Mailing/DAO/Spool.php
+++ b/CRM/Mailing/DAO/Spool.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Spool.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8d44e660311ef22bdbe80d66a87485bd)
+ * (GenCodeChecksum:1062bf7f253de6cdb25f4a434249b050)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/DAO/TrackableURL.php b/CRM/Mailing/DAO/TrackableURL.php
index c93b410460..fc4f0a9d1a 100644
--- a/CRM/Mailing/DAO/TrackableURL.php
+++ b/CRM/Mailing/DAO/TrackableURL.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/TrackableURL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a9512c3a642cc3d3f5333f6c92aa430f)
+ * (GenCodeChecksum:13d0c2db9be0713818bda26731896ae6)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/Bounce.php b/CRM/Mailing/Event/DAO/Bounce.php
index d968f653c8..f062ac4e78 100644
--- a/CRM/Mailing/Event/DAO/Bounce.php
+++ b/CRM/Mailing/Event/DAO/Bounce.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Bounce.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:190aac8f61192fc1b2ff3dd7b3f3214a)
+ * (GenCodeChecksum:b3ece7fb5a8c702f3a9c8e4bef1a38ca)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/Confirm.php b/CRM/Mailing/Event/DAO/Confirm.php
index 9e76bd61fa..92fc0f5fb4 100644
--- a/CRM/Mailing/Event/DAO/Confirm.php
+++ b/CRM/Mailing/Event/DAO/Confirm.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Confirm.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2f2090543c189e82f75a64b171646b0a)
+ * (GenCodeChecksum:34fbb1cde41160b56cd12dc74fd1056b)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/Delivered.php b/CRM/Mailing/Event/DAO/Delivered.php
index 13dde5292a..a878fe3ef3 100644
--- a/CRM/Mailing/Event/DAO/Delivered.php
+++ b/CRM/Mailing/Event/DAO/Delivered.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Delivered.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:dfd599fb520f1b5a626a2821aaa1066f)
+ * (GenCodeChecksum:5d91312ebe18853291f2f72c8d486ca4)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/Forward.php b/CRM/Mailing/Event/DAO/Forward.php
index 36033e9db1..65f47f3d5b 100644
--- a/CRM/Mailing/Event/DAO/Forward.php
+++ b/CRM/Mailing/Event/DAO/Forward.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Forward.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:436109f4cf7ea2aef0c5c4b5d094bfd3)
+ * (GenCodeChecksum:5b9039dd2973b4a8b776e20c9afd519a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/Opened.php b/CRM/Mailing/Event/DAO/Opened.php
index ca3398c1ef..89ddc64d8c 100644
--- a/CRM/Mailing/Event/DAO/Opened.php
+++ b/CRM/Mailing/Event/DAO/Opened.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Opened.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f198eefb2b8122c48c0ad7fd0705ffcf)
+ * (GenCodeChecksum:34b01566048993f3564bb13df83d7ebc)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/Queue.php b/CRM/Mailing/Event/DAO/Queue.php
index 57b20b59de..aaf6440ea5 100644
--- a/CRM/Mailing/Event/DAO/Queue.php
+++ b/CRM/Mailing/Event/DAO/Queue.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Queue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fd33cf9185f35b5abc7f906115e5fe91)
+ * (GenCodeChecksum:1791a9127131362b0224dd2781085e4a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/Reply.php b/CRM/Mailing/Event/DAO/Reply.php
index 465647e100..9451364600 100644
--- a/CRM/Mailing/Event/DAO/Reply.php
+++ b/CRM/Mailing/Event/DAO/Reply.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Reply.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:64d95bdb81a8c4a7abfa045510d72396)
+ * (GenCodeChecksum:b4b1d874923b9181d155aeffd8639a6a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/Subscribe.php b/CRM/Mailing/Event/DAO/Subscribe.php
index 8a33bf712f..cd0bbd5b89 100644
--- a/CRM/Mailing/Event/DAO/Subscribe.php
+++ b/CRM/Mailing/Event/DAO/Subscribe.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Subscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:24bb2ee64dae74379cb2a1bbc038bdac)
+ * (GenCodeChecksum:cfca620c53960824402743820987892a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/TrackableURLOpen.php b/CRM/Mailing/Event/DAO/TrackableURLOpen.php
index 45c5ac1d3e..262cca729e 100644
--- a/CRM/Mailing/Event/DAO/TrackableURLOpen.php
+++ b/CRM/Mailing/Event/DAO/TrackableURLOpen.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/TrackableURLOpen.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:52362dedcb8c728132a0968cefe06b87)
+ * (GenCodeChecksum:4deaa2fd1534e9f0493f6059eaa74a23)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Mailing/Event/DAO/Unsubscribe.php b/CRM/Mailing/Event/DAO/Unsubscribe.php
index b42c425b79..b7dd2dbcfb 100644
--- a/CRM/Mailing/Event/DAO/Unsubscribe.php
+++ b/CRM/Mailing/Event/DAO/Unsubscribe.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Unsubscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e5970acf41727e81f0fa1a7ca2044305)
+ * (GenCodeChecksum:459e65f073984db62e5e6ca22f121044)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php
index a3cb6c7097..a83c65f748 100644
--- a/CRM/Member/DAO/Membership.php
+++ b/CRM/Member/DAO/Membership.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Member/Membership.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d92ffd88f95da56ec5e4463369c59155)
+ * (GenCodeChecksum:4d1ebbf7062cc793f845bfa84e0c0230)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Member/DAO/MembershipBlock.php b/CRM/Member/DAO/MembershipBlock.php
index 206bc94891..580ada98a2 100644
--- a/CRM/Member/DAO/MembershipBlock.php
+++ b/CRM/Member/DAO/MembershipBlock.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:59de2666c2c92dc873bbe7dc303eeca8)
+ * (GenCodeChecksum:7d3680991e8df4820b93c443def8d5d0)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Member/DAO/MembershipLog.php b/CRM/Member/DAO/MembershipLog.php
index a5e5c27c6a..b4b23de027 100644
--- a/CRM/Member/DAO/MembershipLog.php
+++ b/CRM/Member/DAO/MembershipLog.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:aa569c9888f34d402e688ef7d6fdb88c)
+ * (GenCodeChecksum:9182bcbeed0a05c3fed5f3027ba89668)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Member/DAO/MembershipPayment.php b/CRM/Member/DAO/MembershipPayment.php
index 675b0cf5d9..90559ff39b 100644
--- a/CRM/Member/DAO/MembershipPayment.php
+++ b/CRM/Member/DAO/MembershipPayment.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipPayment.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:64b3b70a3f88a5a11a8a75570911be7f)
+ * (GenCodeChecksum:0ccf0d7294a2039689712b93dd6e9bab)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Member/DAO/MembershipStatus.php b/CRM/Member/DAO/MembershipStatus.php
index 0581aab70f..8b0a3a66a8 100644
--- a/CRM/Member/DAO/MembershipStatus.php
+++ b/CRM/Member/DAO/MembershipStatus.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipStatus.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9c8aaaf7ade5ec9ba8d46131fc335d0b)
+ * (GenCodeChecksum:8a187a58ad0526f5710f4ed07587b7a6)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Member/DAO/MembershipType.php b/CRM/Member/DAO/MembershipType.php
index 20bcb23461..6f4bba308d 100644
--- a/CRM/Member/DAO/MembershipType.php
+++ b/CRM/Member/DAO/MembershipType.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a53e1a6c010fd3c018de37aaab2b5d70)
+ * (GenCodeChecksum:ca9e72dff6418e8d3e0950000e08681a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/PCP/DAO/PCP.php b/CRM/PCP/DAO/PCP.php
index 0ce07e503b..13e717cb6f 100644
--- a/CRM/PCP/DAO/PCP.php
+++ b/CRM/PCP/DAO/PCP.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/PCP/PCP.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b0ad3c4d4285b2ea74ea434530fa6f64)
+ * (GenCodeChecksum:55283776659b636af6e8511f8978d660)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/PCP/DAO/PCPBlock.php b/CRM/PCP/DAO/PCPBlock.php
index ee0cdca75c..b2da78e91e 100644
--- a/CRM/PCP/DAO/PCPBlock.php
+++ b/CRM/PCP/DAO/PCPBlock.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/PCP/PCPBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:19658f7692f6185ddf125d80f236aede)
+ * (GenCodeChecksum:381817268156521bc7cc8fabe518bf7b)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Pledge/DAO/Pledge.php b/CRM/Pledge/DAO/Pledge.php
index 8b8ab496c8..aaab6287e3 100644
--- a/CRM/Pledge/DAO/Pledge.php
+++ b/CRM/Pledge/DAO/Pledge.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/Pledge.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:abf97ff2eccd3eddbdfce18258aff4a1)
+ * (GenCodeChecksum:93d3db6cf90649f6bc070d1b72def5af)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Pledge/DAO/PledgeBlock.php b/CRM/Pledge/DAO/PledgeBlock.php
index 1a488cc5fe..deb1e26f20 100644
--- a/CRM/Pledge/DAO/PledgeBlock.php
+++ b/CRM/Pledge/DAO/PledgeBlock.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/PledgeBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ae4e663c058d6484605ac75df78fef1f)
+ * (GenCodeChecksum:7d41ef2735585fe5dddadb9a8f63a7fd)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Pledge/DAO/PledgePayment.php b/CRM/Pledge/DAO/PledgePayment.php
index f2b4fd013c..b8f9c66c65 100644
--- a/CRM/Pledge/DAO/PledgePayment.php
+++ b/CRM/Pledge/DAO/PledgePayment.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/PledgePayment.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a879d5d1209af280f5713279e0911e2b)
+ * (GenCodeChecksum:09fc3071c5172648ed851790f09873b6)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Price/DAO/LineItem.php b/CRM/Price/DAO/LineItem.php
index 3be1793e2c..efd0d9c23b 100644
--- a/CRM/Price/DAO/LineItem.php
+++ b/CRM/Price/DAO/LineItem.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Price/LineItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b79438c224d31b7195236f3e1cdd5855)
+ * (GenCodeChecksum:8ecde6a576075d58db3c53106b9d4d1c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Price/DAO/PriceField.php b/CRM/Price/DAO/PriceField.php
index c1f0546063..b16306e42e 100644
--- a/CRM/Price/DAO/PriceField.php
+++ b/CRM/Price/DAO/PriceField.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:966d70f0e4bc5a6726beff4a9b43952c)
+ * (GenCodeChecksum:3e31ae2c91a74260789a9d76f5508d4f)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Price/DAO/PriceFieldValue.php b/CRM/Price/DAO/PriceFieldValue.php
index 9f42662fce..a7530d34a1 100644
--- a/CRM/Price/DAO/PriceFieldValue.php
+++ b/CRM/Price/DAO/PriceFieldValue.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceFieldValue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f0ace0187969a76ff45c62032e8303a2)
+ * (GenCodeChecksum:034bac340e871703cc4b4595280b83b5)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Price/DAO/PriceSet.php b/CRM/Price/DAO/PriceSet.php
index af48d1ce51..6e4f51e05a 100644
--- a/CRM/Price/DAO/PriceSet.php
+++ b/CRM/Price/DAO/PriceSet.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceSet.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:80d53a8eb9ccb6a4fe13148a41fb30d1)
+ * (GenCodeChecksum:faebb3c4f46520f6328a6aaf0a8c85a0)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Price/DAO/PriceSetEntity.php b/CRM/Price/DAO/PriceSetEntity.php
index aeaf556dc3..2dd62cc7f8 100644
--- a/CRM/Price/DAO/PriceSetEntity.php
+++ b/CRM/Price/DAO/PriceSetEntity.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceSetEntity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:60733cc4b62e54f28024d6e0b1d90bd5)
+ * (GenCodeChecksum:da96598372bdbc553ae76312db786c2c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Queue/DAO/QueueItem.php b/CRM/Queue/DAO/QueueItem.php
index 177d6d6fae..6d640fedca 100644
--- a/CRM/Queue/DAO/QueueItem.php
+++ b/CRM/Queue/DAO/QueueItem.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Queue/QueueItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:29c70cc367a66f90eb5616927289949e)
+ * (GenCodeChecksum:a7927e0d742d5a5600ffe80c75d90bf6)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/Report/DAO/ReportInstance.php b/CRM/Report/DAO/ReportInstance.php
index 87d26a1401..4771939be4 100644
--- a/CRM/Report/DAO/ReportInstance.php
+++ b/CRM/Report/DAO/ReportInstance.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Report/ReportInstance.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d5a94a431757634406b4710296279835)
+ * (GenCodeChecksum:857f3f19bbbb33bf039b6ea95f2097c5)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/CRM/SMS/DAO/Provider.php b/CRM/SMS/DAO/Provider.php
index c4ab65208c..0b23efb27e 100644
--- a/CRM/SMS/DAO/Provider.php
+++ b/CRM/SMS/DAO/Provider.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/SMS/Provider.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e3213cedffb39026a84af8e4c210669f)
+ * (GenCodeChecksum:58f9deb2ac0314b717ef619c4ff8fdf0)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
diff --git a/xml/templates/schema.tpl b/xml/templates/schema.tpl
index 7faeb14782..c9b6bdcb82 100644
--- a/xml/templates/schema.tpl
+++ b/xml/templates/schema.tpl
@@ -59,7 +59,8 @@ CREATE TABLE `{$table.name}` (
 {if ! $first},{/if}
 {assign var='first' value=false}
 
-    PRIMARY KEY ( `{$table.primaryKey.name}` )
+    {assign var='firstIndexField' value=true}
+    PRIMARY KEY ({foreach from=$table.primaryKey.field item=fieldName}{if $firstIndexField}{assign var='firstIndexField' value=false}{else},{/if}`{$fieldName}`{/foreach})
 {/if} {* table.primaryKey *}
 
 {if $table.index}