From 828c69155ec55d6abf50db8a8fc0f92e838faacf Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 12 Nov 2020 12:00:13 +1100 Subject: [PATCH] dev/core#339 Install CiviCRM tables using utf8mb4 Update sample custom value tables as appropriate as well Fix conflict between test setting ROW_FORMAT being compressed and the ROW_FORMAT of the original table being DYNAMIC --- CRM/ACL/DAO/ACL.php | 2 +- CRM/ACL/DAO/ACLCache.php | 2 +- CRM/ACL/DAO/EntityRole.php | 2 +- CRM/Activity/DAO/Activity.php | 2 +- CRM/Activity/DAO/ActivityContact.php | 2 +- CRM/Batch/DAO/Batch.php | 2 +- CRM/Batch/DAO/EntityBatch.php | 2 +- CRM/Campaign/DAO/Campaign.php | 2 +- CRM/Campaign/DAO/CampaignGroup.php | 2 +- CRM/Campaign/DAO/Survey.php | 2 +- CRM/Case/DAO/Case.php | 2 +- CRM/Case/DAO/CaseActivity.php | 2 +- CRM/Case/DAO/CaseContact.php | 2 +- CRM/Case/DAO/CaseType.php | 2 +- CRM/Contact/DAO/ACLContactCache.php | 2 +- CRM/Contact/DAO/Contact.php | 2 +- CRM/Contact/DAO/ContactType.php | 2 +- CRM/Contact/DAO/DashboardContact.php | 2 +- CRM/Contact/DAO/Group.php | 2 +- CRM/Contact/DAO/GroupContact.php | 2 +- CRM/Contact/DAO/GroupContactCache.php | 2 +- CRM/Contact/DAO/GroupNesting.php | 2 +- CRM/Contact/DAO/GroupOrganization.php | 2 +- CRM/Contact/DAO/Relationship.php | 2 +- CRM/Contact/DAO/RelationshipCache.php | 2 +- CRM/Contact/DAO/RelationshipType.php | 2 +- CRM/Contact/DAO/SavedSearch.php | 2 +- CRM/Contact/DAO/SubscriptionHistory.php | 2 +- CRM/Contribute/DAO/Contribution.php | 2 +- CRM/Contribute/DAO/ContributionPage.php | 2 +- CRM/Contribute/DAO/ContributionProduct.php | 2 +- CRM/Contribute/DAO/ContributionRecur.php | 2 +- CRM/Contribute/DAO/ContributionSoft.php | 2 +- CRM/Contribute/DAO/Premium.php | 2 +- CRM/Contribute/DAO/PremiumsProduct.php | 2 +- CRM/Contribute/DAO/Product.php | 2 +- CRM/Contribute/DAO/Widget.php | 2 +- CRM/Core/CodeGen/Specification.php | 1 + CRM/Core/DAO/ActionLog.php | 2 +- CRM/Core/DAO/ActionMapping.php | 2 +- CRM/Core/DAO/ActionSchedule.php | 2 +- CRM/Core/DAO/Address.php | 2 +- CRM/Core/DAO/AddressFormat.php | 2 +- CRM/Core/DAO/Cache.php | 2 +- CRM/Core/DAO/Component.php | 2 +- CRM/Core/DAO/Country.php | 2 +- CRM/Core/DAO/County.php | 2 +- CRM/Core/DAO/CustomField.php | 2 +- CRM/Core/DAO/CustomGroup.php | 2 +- CRM/Core/DAO/Dashboard.php | 2 +- CRM/Core/DAO/Discount.php | 2 +- CRM/Core/DAO/Domain.php | 2 +- CRM/Core/DAO/Email.php | 2 +- CRM/Core/DAO/EntityFile.php | 2 +- CRM/Core/DAO/EntityTag.php | 2 +- CRM/Core/DAO/Extension.php | 2 +- CRM/Core/DAO/File.php | 2 +- CRM/Core/DAO/IM.php | 2 +- CRM/Core/DAO/Job.php | 2 +- CRM/Core/DAO/JobLog.php | 2 +- CRM/Core/DAO/LocBlock.php | 2 +- CRM/Core/DAO/LocationType.php | 2 +- CRM/Core/DAO/Log.php | 2 +- CRM/Core/DAO/MailSettings.php | 2 +- CRM/Core/DAO/Managed.php | 2 +- CRM/Core/DAO/Mapping.php | 2 +- CRM/Core/DAO/MappingField.php | 2 +- CRM/Core/DAO/Menu.php | 2 +- CRM/Core/DAO/MessageTemplate.php | 2 +- CRM/Core/DAO/Navigation.php | 2 +- CRM/Core/DAO/Note.php | 2 +- CRM/Core/DAO/OpenID.php | 2 +- CRM/Core/DAO/OptionGroup.php | 2 +- CRM/Core/DAO/OptionValue.php | 2 +- CRM/Core/DAO/Phone.php | 2 +- CRM/Core/DAO/PreferencesDate.php | 2 +- CRM/Core/DAO/PrevNextCache.php | 2 +- CRM/Core/DAO/PrintLabel.php | 2 +- CRM/Core/DAO/RecurringEntity.php | 2 +- CRM/Core/DAO/Setting.php | 2 +- CRM/Core/DAO/StateProvince.php | 2 +- CRM/Core/DAO/StatusPreference.php | 2 +- CRM/Core/DAO/SystemLog.php | 2 +- CRM/Core/DAO/Tag.php | 2 +- CRM/Core/DAO/Timezone.php | 2 +- CRM/Core/DAO/UFField.php | 2 +- CRM/Core/DAO/UFGroup.php | 2 +- CRM/Core/DAO/UFJoin.php | 2 +- CRM/Core/DAO/UFMatch.php | 2 +- CRM/Core/DAO/Website.php | 2 +- CRM/Core/DAO/WordReplacement.php | 2 +- CRM/Core/DAO/Worldregion.php | 2 +- CRM/Cxn/DAO/Cxn.php | 2 +- CRM/Dedupe/DAO/Exception.php | 2 +- CRM/Dedupe/DAO/Rule.php | 2 +- CRM/Dedupe/DAO/RuleGroup.php | 2 +- CRM/Event/Cart/DAO/Cart.php | 2 +- CRM/Event/Cart/DAO/EventInCart.php | 2 +- CRM/Event/DAO/Event.php | 2 +- CRM/Event/DAO/Participant.php | 2 +- CRM/Event/DAO/ParticipantPayment.php | 2 +- CRM/Event/DAO/ParticipantStatusType.php | 2 +- CRM/Financial/DAO/Currency.php | 2 +- CRM/Financial/DAO/EntityFinancialAccount.php | 2 +- CRM/Financial/DAO/EntityFinancialTrxn.php | 2 +- CRM/Financial/DAO/FinancialAccount.php | 2 +- CRM/Financial/DAO/FinancialItem.php | 2 +- CRM/Financial/DAO/FinancialTrxn.php | 2 +- CRM/Financial/DAO/FinancialType.php | 2 +- CRM/Financial/DAO/PaymentProcessor.php | 2 +- CRM/Financial/DAO/PaymentProcessorType.php | 2 +- CRM/Financial/DAO/PaymentToken.php | 2 +- CRM/Friend/DAO/Friend.php | 2 +- CRM/Grant/DAO/Grant.php | 2 +- CRM/Logging/Schema.php | 3 +++ CRM/Mailing/DAO/BouncePattern.php | 2 +- CRM/Mailing/DAO/BounceType.php | 2 +- CRM/Mailing/DAO/Mailing.php | 2 +- CRM/Mailing/DAO/MailingAB.php | 2 +- CRM/Mailing/DAO/MailingComponent.php | 2 +- CRM/Mailing/DAO/MailingGroup.php | 2 +- CRM/Mailing/DAO/MailingJob.php | 2 +- CRM/Mailing/DAO/Recipients.php | 2 +- CRM/Mailing/DAO/Spool.php | 2 +- CRM/Mailing/DAO/TrackableURL.php | 2 +- CRM/Mailing/Event/DAO/Bounce.php | 2 +- CRM/Mailing/Event/DAO/Confirm.php | 2 +- CRM/Mailing/Event/DAO/Delivered.php | 2 +- CRM/Mailing/Event/DAO/Forward.php | 2 +- CRM/Mailing/Event/DAO/Opened.php | 2 +- CRM/Mailing/Event/DAO/Queue.php | 2 +- CRM/Mailing/Event/DAO/Reply.php | 2 +- CRM/Mailing/Event/DAO/Subscribe.php | 2 +- CRM/Mailing/Event/DAO/TrackableURLOpen.php | 2 +- CRM/Mailing/Event/DAO/Unsubscribe.php | 2 +- CRM/Member/DAO/Membership.php | 2 +- CRM/Member/DAO/MembershipBlock.php | 2 +- CRM/Member/DAO/MembershipLog.php | 2 +- CRM/Member/DAO/MembershipPayment.php | 2 +- CRM/Member/DAO/MembershipStatus.php | 2 +- CRM/Member/DAO/MembershipType.php | 2 +- CRM/PCP/DAO/PCP.php | 2 +- CRM/PCP/DAO/PCPBlock.php | 2 +- CRM/Pledge/DAO/Pledge.php | 2 +- CRM/Pledge/DAO/PledgeBlock.php | 2 +- CRM/Pledge/DAO/PledgePayment.php | 2 +- CRM/Price/DAO/LineItem.php | 2 +- CRM/Price/DAO/PriceField.php | 2 +- CRM/Price/DAO/PriceFieldValue.php | 2 +- CRM/Price/DAO/PriceSet.php | 2 +- CRM/Price/DAO/PriceSetEntity.php | 2 +- CRM/Queue/DAO/QueueItem.php | 2 +- CRM/Report/DAO/ReportInstance.php | 2 +- CRM/SMS/DAO/Provider.php | 2 +- sql/civicrm_generated.mysql | 8 ++++---- sql/civicrm_sample_custom_data.mysql | 6 +++--- tests/phpunit/CRM/Core/BAO/CustomFieldTest.php | 2 +- tests/phpunit/CRM/Core/I18n/SchemaTest.php | 5 +++-- tests/phpunit/api/v3/ReportTemplateTest.php | 4 ++-- xml/schema/Schema.xml | 4 ++-- 160 files changed, 171 insertions(+), 166 deletions(-) diff --git a/CRM/ACL/DAO/ACL.php b/CRM/ACL/DAO/ACL.php index 57934d1303..f44367cb27 100644 --- a/CRM/ACL/DAO/ACL.php +++ b/CRM/ACL/DAO/ACL.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/ACL/ACL.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:54e8c75c28c9dd74192f60bbcf1605f6) + * (GenCodeChecksum:fa7ab50bdcacf98f9b1b043f912fed47) */ /** diff --git a/CRM/ACL/DAO/ACLCache.php b/CRM/ACL/DAO/ACLCache.php index 4418878c76..c37c2aee5a 100644 --- a/CRM/ACL/DAO/ACLCache.php +++ b/CRM/ACL/DAO/ACLCache.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/ACL/ACLCache.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:7faa5879056a56b463304bd81829afda) + * (GenCodeChecksum:4776199edbbb83ae58a37f1b056bf86a) */ /** diff --git a/CRM/ACL/DAO/EntityRole.php b/CRM/ACL/DAO/EntityRole.php index 4e31bd8466..7c83da2983 100644 --- a/CRM/ACL/DAO/EntityRole.php +++ b/CRM/ACL/DAO/EntityRole.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/ACL/EntityRole.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:c1087517beb5b266d4a1a0a1a342ced0) + * (GenCodeChecksum:53e459e0bbdca49556b59c10aee21862) */ /** diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php index 39655685fd..c83a5c304f 100644 --- a/CRM/Activity/DAO/Activity.php +++ b/CRM/Activity/DAO/Activity.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Activity/Activity.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:af42b47e95e8c7f47eb7a3ef53833383) + * (GenCodeChecksum:4291bcd82f8d55861172be9d2a8243de) */ /** diff --git a/CRM/Activity/DAO/ActivityContact.php b/CRM/Activity/DAO/ActivityContact.php index fd6633a191..ae14f3a547 100644 --- a/CRM/Activity/DAO/ActivityContact.php +++ b/CRM/Activity/DAO/ActivityContact.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Activity/ActivityContact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:60851972b9f03efb52350929e557c768) + * (GenCodeChecksum:4b08cccd27b433486baf2b9eea79f97e) */ /** diff --git a/CRM/Batch/DAO/Batch.php b/CRM/Batch/DAO/Batch.php index 7e153f4786..31bac04ea0 100644 --- a/CRM/Batch/DAO/Batch.php +++ b/CRM/Batch/DAO/Batch.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Batch/Batch.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:29e187971d03eba3ce5e3848f2ea1a5b) + * (GenCodeChecksum:f37d12b3bc0d6b5efc4768f210a45a3c) */ /** diff --git a/CRM/Batch/DAO/EntityBatch.php b/CRM/Batch/DAO/EntityBatch.php index f7e2fffb74..3e5ea2b5d5 100644 --- a/CRM/Batch/DAO/EntityBatch.php +++ b/CRM/Batch/DAO/EntityBatch.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Batch/EntityBatch.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:aaeb317f89d831d683f53e7c45e1b175) + * (GenCodeChecksum:bbeab14232892d3ec8069ef3a499efdd) */ /** diff --git a/CRM/Campaign/DAO/Campaign.php b/CRM/Campaign/DAO/Campaign.php index 89de98a9bb..6dbafa422a 100644 --- a/CRM/Campaign/DAO/Campaign.php +++ b/CRM/Campaign/DAO/Campaign.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Campaign/Campaign.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:1356a7073a6caa15e0da58422c6763b9) + * (GenCodeChecksum:8bafee489dc4969a456393ed48544880) */ /** diff --git a/CRM/Campaign/DAO/CampaignGroup.php b/CRM/Campaign/DAO/CampaignGroup.php index 581ab4e505..f63ad69ecc 100644 --- a/CRM/Campaign/DAO/CampaignGroup.php +++ b/CRM/Campaign/DAO/CampaignGroup.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Campaign/CampaignGroup.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:55b3974bbc1aa8405d11a5c396401fa9) + * (GenCodeChecksum:210636d218ebf8e84f862c48bbe9edf9) */ /** diff --git a/CRM/Campaign/DAO/Survey.php b/CRM/Campaign/DAO/Survey.php index b6bc191260..0a30191030 100644 --- a/CRM/Campaign/DAO/Survey.php +++ b/CRM/Campaign/DAO/Survey.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Campaign/Survey.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:afb7cfcccd2a6177b2b10e07afa92e8e) + * (GenCodeChecksum:6f3dd03a11c679278374affba3d2bd76) */ /** diff --git a/CRM/Case/DAO/Case.php b/CRM/Case/DAO/Case.php index ebf2311f67..4f04b3ab1b 100644 --- a/CRM/Case/DAO/Case.php +++ b/CRM/Case/DAO/Case.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Case/Case.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:bae905b3b253acc0df005cc66dd9b717) + * (GenCodeChecksum:bc33a854daf3f695bd92c4bca41ad5b3) */ /** diff --git a/CRM/Case/DAO/CaseActivity.php b/CRM/Case/DAO/CaseActivity.php index e0d65cb58b..93bc1135f3 100644 --- a/CRM/Case/DAO/CaseActivity.php +++ b/CRM/Case/DAO/CaseActivity.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Case/CaseActivity.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:565c78ce07c94d858e5e6e400c4d1ad6) + * (GenCodeChecksum:3f39cbc8d1438b9a0cdee0382638bcae) */ /** diff --git a/CRM/Case/DAO/CaseContact.php b/CRM/Case/DAO/CaseContact.php index d5b524ae02..fa5290d631 100644 --- a/CRM/Case/DAO/CaseContact.php +++ b/CRM/Case/DAO/CaseContact.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Case/CaseContact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:57c93b00e00d0a48d5071d5a991289ab) + * (GenCodeChecksum:f9da4680a9dc863f5dc6675f5e2fdc0b) */ /** diff --git a/CRM/Case/DAO/CaseType.php b/CRM/Case/DAO/CaseType.php index 246edc51fd..4050cc6477 100644 --- a/CRM/Case/DAO/CaseType.php +++ b/CRM/Case/DAO/CaseType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Case/CaseType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:52f839e38c020cd422ef99dff4ab5f1b) + * (GenCodeChecksum:b138422db3438224fef3d477a9e1648a) */ /** diff --git a/CRM/Contact/DAO/ACLContactCache.php b/CRM/Contact/DAO/ACLContactCache.php index eb34f36000..f11ef7f27b 100644 --- a/CRM/Contact/DAO/ACLContactCache.php +++ b/CRM/Contact/DAO/ACLContactCache.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/ACLContactCache.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:4eaf1e99ce247c430fc280cc6ce68538) + * (GenCodeChecksum:0d21895a5f58ee81f21ae524c86a165c) */ /** diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php index 30a35c82d0..5567e95813 100644 --- a/CRM/Contact/DAO/Contact.php +++ b/CRM/Contact/DAO/Contact.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/Contact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:25d4fcd3814380d746574c9a17b51134) + * (GenCodeChecksum:28e3f64d22175c9d2efea3d1c49196fa) */ /** diff --git a/CRM/Contact/DAO/ContactType.php b/CRM/Contact/DAO/ContactType.php index 4f7f63f5a3..0677295aa6 100644 --- a/CRM/Contact/DAO/ContactType.php +++ b/CRM/Contact/DAO/ContactType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/ContactType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:9719ec84435a76decf1937f7a389ac7f) + * (GenCodeChecksum:ee06613c82c85ea8773dcc16105d2b9b) */ /** diff --git a/CRM/Contact/DAO/DashboardContact.php b/CRM/Contact/DAO/DashboardContact.php index f8f4e87daa..0a59615b44 100644 --- a/CRM/Contact/DAO/DashboardContact.php +++ b/CRM/Contact/DAO/DashboardContact.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/DashboardContact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:ef3a393d20b6654dcef952f21df8072d) + * (GenCodeChecksum:a5629fa4472b5745ec13703142a66f3f) */ /** diff --git a/CRM/Contact/DAO/Group.php b/CRM/Contact/DAO/Group.php index b126c0e9fd..e7208d7fc1 100644 --- a/CRM/Contact/DAO/Group.php +++ b/CRM/Contact/DAO/Group.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/Group.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:e40e779ac8e9bec5ea4d6c55f6f3b863) + * (GenCodeChecksum:abbdc0ad43c008e444512d444c537ebf) */ /** diff --git a/CRM/Contact/DAO/GroupContact.php b/CRM/Contact/DAO/GroupContact.php index 3cee7b7e07..7838dde527 100644 --- a/CRM/Contact/DAO/GroupContact.php +++ b/CRM/Contact/DAO/GroupContact.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/GroupContact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:69e994c5047ecf8d68700c694047720f) + * (GenCodeChecksum:ea7c012e774a203b869e0fadec080cab) */ /** diff --git a/CRM/Contact/DAO/GroupContactCache.php b/CRM/Contact/DAO/GroupContactCache.php index e4310747a9..119f4f3b6a 100644 --- a/CRM/Contact/DAO/GroupContactCache.php +++ b/CRM/Contact/DAO/GroupContactCache.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/GroupContactCache.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:424f49d5c972e05144c327cf7ba0992c) + * (GenCodeChecksum:efae8178ae6bc7c26423501ffb2ba751) */ /** diff --git a/CRM/Contact/DAO/GroupNesting.php b/CRM/Contact/DAO/GroupNesting.php index 6262c1f5a4..2364a2536a 100644 --- a/CRM/Contact/DAO/GroupNesting.php +++ b/CRM/Contact/DAO/GroupNesting.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/GroupNesting.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:396dffdb22106c85cc4832b61307c264) + * (GenCodeChecksum:65fe8a838c3cad53df4a76d3f117d99b) */ /** diff --git a/CRM/Contact/DAO/GroupOrganization.php b/CRM/Contact/DAO/GroupOrganization.php index 0553dff9ec..5e5499f6a9 100644 --- a/CRM/Contact/DAO/GroupOrganization.php +++ b/CRM/Contact/DAO/GroupOrganization.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/GroupOrganization.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:0ae83aef7dbfb877f46a92f27001dd6b) + * (GenCodeChecksum:d70fc21adc9befb2edc9c26f9fbe4457) */ /** diff --git a/CRM/Contact/DAO/Relationship.php b/CRM/Contact/DAO/Relationship.php index 8ad5e40702..ee92fd0ce9 100644 --- a/CRM/Contact/DAO/Relationship.php +++ b/CRM/Contact/DAO/Relationship.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/Relationship.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:7fed0ad7c2ed2b072582b55afdb6469f) + * (GenCodeChecksum:6bff7ab95b9b2b5faa9d547ce5219b92) */ /** diff --git a/CRM/Contact/DAO/RelationshipCache.php b/CRM/Contact/DAO/RelationshipCache.php index 1e874cb2bd..d6bee088a1 100644 --- a/CRM/Contact/DAO/RelationshipCache.php +++ b/CRM/Contact/DAO/RelationshipCache.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/RelationshipCache.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:6de8ba08019ff8821fd4e09f14db6da9) + * (GenCodeChecksum:3b42f72f3268d49d99353a8816d9889b) */ /** diff --git a/CRM/Contact/DAO/RelationshipType.php b/CRM/Contact/DAO/RelationshipType.php index 3ac981c81f..5066ff293f 100644 --- a/CRM/Contact/DAO/RelationshipType.php +++ b/CRM/Contact/DAO/RelationshipType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/RelationshipType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:258f862b2238ae69432d8955ae8df803) + * (GenCodeChecksum:376ec7436375e3ccc2ec6687a3d5b526) */ /** diff --git a/CRM/Contact/DAO/SavedSearch.php b/CRM/Contact/DAO/SavedSearch.php index 86d7d917d9..6129221832 100644 --- a/CRM/Contact/DAO/SavedSearch.php +++ b/CRM/Contact/DAO/SavedSearch.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/SavedSearch.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2a23a737d07cbfc49ce1d60a642fee3e) + * (GenCodeChecksum:64396e21031229c36c11423bb4b92fc5) */ /** diff --git a/CRM/Contact/DAO/SubscriptionHistory.php b/CRM/Contact/DAO/SubscriptionHistory.php index cbdab5b535..2feece30bc 100644 --- a/CRM/Contact/DAO/SubscriptionHistory.php +++ b/CRM/Contact/DAO/SubscriptionHistory.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/SubscriptionHistory.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:c38d68dcab2d037fc65d4e59bd30d1d4) + * (GenCodeChecksum:2fc83b2d730e10fe0508fa088b241365) */ /** diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php index 76c7adc133..b0a2d5ab59 100644 --- a/CRM/Contribute/DAO/Contribution.php +++ b/CRM/Contribute/DAO/Contribution.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/Contribution.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:600b0cd019cba16cd62aae7463beab77) + * (GenCodeChecksum:6681702174b0431d22a1bc98c71bd747) */ /** diff --git a/CRM/Contribute/DAO/ContributionPage.php b/CRM/Contribute/DAO/ContributionPage.php index be85752fb7..795591c821 100644 --- a/CRM/Contribute/DAO/ContributionPage.php +++ b/CRM/Contribute/DAO/ContributionPage.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/ContributionPage.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:4910b973830834fcb2ce5bb3637070d6) + * (GenCodeChecksum:1a64443b99f8c5f11333e600e3cb47a3) */ /** diff --git a/CRM/Contribute/DAO/ContributionProduct.php b/CRM/Contribute/DAO/ContributionProduct.php index 9837f2b8c0..78d7a932f4 100644 --- a/CRM/Contribute/DAO/ContributionProduct.php +++ b/CRM/Contribute/DAO/ContributionProduct.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/ContributionProduct.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:a2a4170ca2004a1630e27ba83e5edff3) + * (GenCodeChecksum:45dff2998f47d5bd918d767c018eeac4) */ /** diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php index f61c447051..f574c6c485 100644 --- a/CRM/Contribute/DAO/ContributionRecur.php +++ b/CRM/Contribute/DAO/ContributionRecur.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/ContributionRecur.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:ba5f7682a5f99b682f70cd45097feb56) + * (GenCodeChecksum:f8fcfe64d80dea9fe9f1f8eb86246f73) */ /** diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php index fa78630bad..97fc0e8eeb 100644 --- a/CRM/Contribute/DAO/ContributionSoft.php +++ b/CRM/Contribute/DAO/ContributionSoft.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/ContributionSoft.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:e37496d0b9938151e5bcf9e6dad23c0a) + * (GenCodeChecksum:f790cd9c491079f788527103d96230f9) */ /** diff --git a/CRM/Contribute/DAO/Premium.php b/CRM/Contribute/DAO/Premium.php index ebbafd660e..9493fa1803 100644 --- a/CRM/Contribute/DAO/Premium.php +++ b/CRM/Contribute/DAO/Premium.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/Premium.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:b35b6fb4895df990a55d9015bb82a852) + * (GenCodeChecksum:30736c3404f66636b59373f2e81f5d2e) */ /** diff --git a/CRM/Contribute/DAO/PremiumsProduct.php b/CRM/Contribute/DAO/PremiumsProduct.php index f99e9ddf30..82f2f4d7fb 100644 --- a/CRM/Contribute/DAO/PremiumsProduct.php +++ b/CRM/Contribute/DAO/PremiumsProduct.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/PremiumsProduct.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:84fea8d6a2a852495da5ed86232d42d1) + * (GenCodeChecksum:490466ed1df27a5a6157a87f0dd6eb30) */ /** diff --git a/CRM/Contribute/DAO/Product.php b/CRM/Contribute/DAO/Product.php index 7b481641af..48bacacc24 100644 --- a/CRM/Contribute/DAO/Product.php +++ b/CRM/Contribute/DAO/Product.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/Product.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:d6c90aacbe802ff244a6a4bbaecad4d3) + * (GenCodeChecksum:6f4d4d48a0c392a2a72b268a9815006b) */ /** diff --git a/CRM/Contribute/DAO/Widget.php b/CRM/Contribute/DAO/Widget.php index a49f0a9471..16d735e643 100644 --- a/CRM/Contribute/DAO/Widget.php +++ b/CRM/Contribute/DAO/Widget.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/Widget.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:bb99920b9b2c2a8b7419ecd94dcbf577) + * (GenCodeChecksum:f1346769d093ec9021994764d62dedfe) */ /** diff --git a/CRM/Core/CodeGen/Specification.php b/CRM/Core/CodeGen/Specification.php index ed9e2f768e..c4508b1859 100644 --- a/CRM/Core/CodeGen/Specification.php +++ b/CRM/Core/CodeGen/Specification.php @@ -72,6 +72,7 @@ class CRM_Core_CodeGen_Specification { $attributes = ''; $this->checkAndAppend($attributes, $dbXML, 'character_set', 'DEFAULT CHARACTER SET ', ''); $this->checkAndAppend($attributes, $dbXML, 'collate', 'COLLATE ', ''); + $attributes .= ' ROW_FORMAT=DYNAMIC'; $database['attributes'] = $attributes; $tableAttributes_modern = $tableAttributes_simple = ''; diff --git a/CRM/Core/DAO/ActionLog.php b/CRM/Core/DAO/ActionLog.php index 8eb9523e50..75d98dc023 100644 --- a/CRM/Core/DAO/ActionLog.php +++ b/CRM/Core/DAO/ActionLog.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/ActionLog.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:a449765feaf80c56214be9fce2f118b4) + * (GenCodeChecksum:d1a6159f18c0818e42fb3763f097772d) */ /** diff --git a/CRM/Core/DAO/ActionMapping.php b/CRM/Core/DAO/ActionMapping.php index 3224bc1269..20093f808e 100644 --- a/CRM/Core/DAO/ActionMapping.php +++ b/CRM/Core/DAO/ActionMapping.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/ActionMapping.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:7db8e13984f33629f584a8a54c37fd4a) + * (GenCodeChecksum:c095a458e031091596adf3b9bb46baf5) */ /** diff --git a/CRM/Core/DAO/ActionSchedule.php b/CRM/Core/DAO/ActionSchedule.php index 181a1bdee5..376f8feeed 100644 --- a/CRM/Core/DAO/ActionSchedule.php +++ b/CRM/Core/DAO/ActionSchedule.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/ActionSchedule.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:77bfa18590c85ad7b6430c018acd508c) + * (GenCodeChecksum:d2d45ba583a410b375e261a1cf1ce485) */ /** diff --git a/CRM/Core/DAO/Address.php b/CRM/Core/DAO/Address.php index 257de9924f..9636ae9664 100644 --- a/CRM/Core/DAO/Address.php +++ b/CRM/Core/DAO/Address.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Address.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:01b95dc4df972f40d718b61c77cd3b58) + * (GenCodeChecksum:b612c958c68fcd4f5e4b0b244ca6c3b1) */ /** diff --git a/CRM/Core/DAO/AddressFormat.php b/CRM/Core/DAO/AddressFormat.php index d1c1d08842..e8f8525231 100644 --- a/CRM/Core/DAO/AddressFormat.php +++ b/CRM/Core/DAO/AddressFormat.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/AddressFormat.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:7cc2864a78be48031ca829de49afeef6) + * (GenCodeChecksum:090b4784d528f3c465b4daa2cc7bdf1e) */ /** diff --git a/CRM/Core/DAO/Cache.php b/CRM/Core/DAO/Cache.php index f8366cb2d0..10a1489a8c 100644 --- a/CRM/Core/DAO/Cache.php +++ b/CRM/Core/DAO/Cache.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Cache.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:bafe6ce2f7fd94b2581bfc4dad813130) + * (GenCodeChecksum:637ce0498ba1c4f1f32fbfd16bb7d66d) */ /** diff --git a/CRM/Core/DAO/Component.php b/CRM/Core/DAO/Component.php index f1d560b656..dd7d0c43ba 100644 --- a/CRM/Core/DAO/Component.php +++ b/CRM/Core/DAO/Component.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Component.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:a5136517000cfab182cdacc3130bc29c) + * (GenCodeChecksum:e8ae3905d2f7dc380ec1e334dad6e198) */ /** diff --git a/CRM/Core/DAO/Country.php b/CRM/Core/DAO/Country.php index b91e0062fb..f6febfcdeb 100644 --- a/CRM/Core/DAO/Country.php +++ b/CRM/Core/DAO/Country.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Country.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2215bb79c9fe62c60700f232598a9462) + * (GenCodeChecksum:707ca40a97f702747efb02f28ed710e6) */ /** diff --git a/CRM/Core/DAO/County.php b/CRM/Core/DAO/County.php index 9b05e4bee6..7aba507039 100644 --- a/CRM/Core/DAO/County.php +++ b/CRM/Core/DAO/County.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/County.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:5620d2136c764c786eef1c15853eaf9b) + * (GenCodeChecksum:4317f5a9d6526937ac406407ce9a97a1) */ /** diff --git a/CRM/Core/DAO/CustomField.php b/CRM/Core/DAO/CustomField.php index a453096360..838b3fc7de 100644 --- a/CRM/Core/DAO/CustomField.php +++ b/CRM/Core/DAO/CustomField.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/CustomField.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:3a8f6978ec00d7e2cff93f2915ac1f48) + * (GenCodeChecksum:754b560576d029a21029661e48f3075b) */ /** diff --git a/CRM/Core/DAO/CustomGroup.php b/CRM/Core/DAO/CustomGroup.php index 8be9d28b24..df8fb2c33e 100644 --- a/CRM/Core/DAO/CustomGroup.php +++ b/CRM/Core/DAO/CustomGroup.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/CustomGroup.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:3436e2a4cf99bd9b7c859170db37bce3) + * (GenCodeChecksum:a40273d2f899d4fa280d0c02297b5263) */ /** diff --git a/CRM/Core/DAO/Dashboard.php b/CRM/Core/DAO/Dashboard.php index 57773da9df..45282f4731 100644 --- a/CRM/Core/DAO/Dashboard.php +++ b/CRM/Core/DAO/Dashboard.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Dashboard.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:262213759ac6f4c9943f4ebd454256ae) + * (GenCodeChecksum:d1da8f66f209f70a5e8a1fd440bb4694) */ /** diff --git a/CRM/Core/DAO/Discount.php b/CRM/Core/DAO/Discount.php index a18cacfb60..7298c492fd 100644 --- a/CRM/Core/DAO/Discount.php +++ b/CRM/Core/DAO/Discount.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Discount.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:5fbe08bc556f5b913860a55c6d0cedc4) + * (GenCodeChecksum:7f9f8e28c00e7b9c3dbf1631b4ad4391) */ /** diff --git a/CRM/Core/DAO/Domain.php b/CRM/Core/DAO/Domain.php index ce6b480508..2a632dc1cb 100644 --- a/CRM/Core/DAO/Domain.php +++ b/CRM/Core/DAO/Domain.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Domain.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:99a50c29878792b8864e20d184ce9bbb) + * (GenCodeChecksum:4af215dcb8fae4156854344b4dfb3960) */ /** diff --git a/CRM/Core/DAO/Email.php b/CRM/Core/DAO/Email.php index 4f890d5cf0..0a95daea34 100644 --- a/CRM/Core/DAO/Email.php +++ b/CRM/Core/DAO/Email.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Email.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2736b767bcd747315f0382f4e298ad35) + * (GenCodeChecksum:fef14f6148a58eacf0e1695dfd794134) */ /** diff --git a/CRM/Core/DAO/EntityFile.php b/CRM/Core/DAO/EntityFile.php index e405a0d0d6..0ba6edd26e 100644 --- a/CRM/Core/DAO/EntityFile.php +++ b/CRM/Core/DAO/EntityFile.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/EntityFile.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:70221552c8c9532b2aaf9cd89e73a68d) + * (GenCodeChecksum:7fa9cd793366f00f34e879ba97791bf5) */ /** diff --git a/CRM/Core/DAO/EntityTag.php b/CRM/Core/DAO/EntityTag.php index 6db35b547c..798191aad4 100644 --- a/CRM/Core/DAO/EntityTag.php +++ b/CRM/Core/DAO/EntityTag.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/EntityTag.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:82e27d87178a408cd0a1c201f3501dd2) + * (GenCodeChecksum:975426ca9328abeb310b81dd060af25a) */ /** diff --git a/CRM/Core/DAO/Extension.php b/CRM/Core/DAO/Extension.php index b1fc0de3f6..1a46364fd3 100644 --- a/CRM/Core/DAO/Extension.php +++ b/CRM/Core/DAO/Extension.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Extension.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:46f6ff725b1ad9909d2340d728438d36) + * (GenCodeChecksum:dd8b0d8ddff649f7180b28991e578a3f) */ /** diff --git a/CRM/Core/DAO/File.php b/CRM/Core/DAO/File.php index 620734811c..1e4e9aae1f 100644 --- a/CRM/Core/DAO/File.php +++ b/CRM/Core/DAO/File.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/File.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:dd8a70727f67481339dd514fdca6aae5) + * (GenCodeChecksum:aa00f0710c5c740b37ff1c7f91df3638) */ /** diff --git a/CRM/Core/DAO/IM.php b/CRM/Core/DAO/IM.php index fdc40df188..4f595ba695 100644 --- a/CRM/Core/DAO/IM.php +++ b/CRM/Core/DAO/IM.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/IM.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:f64b9a15f4a240d7a137cb5655feb696) + * (GenCodeChecksum:f56fbd26bb48c845527d822e77392881) */ /** diff --git a/CRM/Core/DAO/Job.php b/CRM/Core/DAO/Job.php index cbc870082e..ed582a8852 100644 --- a/CRM/Core/DAO/Job.php +++ b/CRM/Core/DAO/Job.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Job.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:bbc36abe96310ec5cf23d46d2d1728cb) + * (GenCodeChecksum:9b8f984453f85c6a451aff41f267fdc5) */ /** diff --git a/CRM/Core/DAO/JobLog.php b/CRM/Core/DAO/JobLog.php index 51db971463..4920de1673 100644 --- a/CRM/Core/DAO/JobLog.php +++ b/CRM/Core/DAO/JobLog.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/JobLog.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:74e191eba977eb496bae109ca9720ab7) + * (GenCodeChecksum:15b8a4864ded5f1a68773ec432bf620b) */ /** diff --git a/CRM/Core/DAO/LocBlock.php b/CRM/Core/DAO/LocBlock.php index 2eca88b4b6..07bf949d62 100644 --- a/CRM/Core/DAO/LocBlock.php +++ b/CRM/Core/DAO/LocBlock.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/LocBlock.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:801a2e7e05f688cf38882b466f22a292) + * (GenCodeChecksum:8a50c9ef2129e7b7b0ed8b99a86d13a5) */ /** diff --git a/CRM/Core/DAO/LocationType.php b/CRM/Core/DAO/LocationType.php index 3427ba89b3..5df47dc899 100644 --- a/CRM/Core/DAO/LocationType.php +++ b/CRM/Core/DAO/LocationType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/LocationType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:450719aeeb146b60007152d03e0b6faf) + * (GenCodeChecksum:a0fb6f020e3685ffe293609a32bcc741) */ /** diff --git a/CRM/Core/DAO/Log.php b/CRM/Core/DAO/Log.php index b550b04515..c4dae9152a 100644 --- a/CRM/Core/DAO/Log.php +++ b/CRM/Core/DAO/Log.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Log.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:3b97d17eeaa407d9f7f7aa6e1d819090) + * (GenCodeChecksum:d5fdccfff5a70b31fb787ca55f0d589f) */ /** diff --git a/CRM/Core/DAO/MailSettings.php b/CRM/Core/DAO/MailSettings.php index 86b0d72cd2..32969569bc 100644 --- a/CRM/Core/DAO/MailSettings.php +++ b/CRM/Core/DAO/MailSettings.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/MailSettings.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:7ce404283a48da50fceaf69d40c58048) + * (GenCodeChecksum:685ef3fc528a263bfb0546a1e523c6e5) */ /** diff --git a/CRM/Core/DAO/Managed.php b/CRM/Core/DAO/Managed.php index a67271247c..ee1ab17a43 100644 --- a/CRM/Core/DAO/Managed.php +++ b/CRM/Core/DAO/Managed.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Managed.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:119de7e386aa83b1ca5038a1e409aafe) + * (GenCodeChecksum:5e27c0a48637f591ddd474093510e532) */ /** diff --git a/CRM/Core/DAO/Mapping.php b/CRM/Core/DAO/Mapping.php index 3c7639a857..180a957223 100644 --- a/CRM/Core/DAO/Mapping.php +++ b/CRM/Core/DAO/Mapping.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Mapping.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:49336d40a24f0312944123741932dd25) + * (GenCodeChecksum:fed9ff4fb50e9c53d4b17f3015e7dabe) */ /** diff --git a/CRM/Core/DAO/MappingField.php b/CRM/Core/DAO/MappingField.php index bfe139eda9..11e7eee502 100644 --- a/CRM/Core/DAO/MappingField.php +++ b/CRM/Core/DAO/MappingField.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/MappingField.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:7197da108e5452be6ab8b419a1506aec) + * (GenCodeChecksum:b65ac30d21a5de881f6c7ac422d532b3) */ /** diff --git a/CRM/Core/DAO/Menu.php b/CRM/Core/DAO/Menu.php index 3fb9a797c3..b49215189c 100644 --- a/CRM/Core/DAO/Menu.php +++ b/CRM/Core/DAO/Menu.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Menu.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:b94ecc10dafe21deb7e5067ef46f32af) + * (GenCodeChecksum:f9b7fc0b2a944f399d46f739459f6174) */ /** diff --git a/CRM/Core/DAO/MessageTemplate.php b/CRM/Core/DAO/MessageTemplate.php index f3da47e578..a048026a44 100644 --- a/CRM/Core/DAO/MessageTemplate.php +++ b/CRM/Core/DAO/MessageTemplate.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/MessageTemplate.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:6881b34cbbefc06722c58fe7f20b1c58) + * (GenCodeChecksum:a85d986e421657c55de1e56dcb475a60) */ /** diff --git a/CRM/Core/DAO/Navigation.php b/CRM/Core/DAO/Navigation.php index ed52b19610..05f5119ef3 100644 --- a/CRM/Core/DAO/Navigation.php +++ b/CRM/Core/DAO/Navigation.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Navigation.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:8cc5473f0cd98bf289dc455eefb0af76) + * (GenCodeChecksum:c8bbc337e1ec2dfac5a6a470131e80d9) */ /** diff --git a/CRM/Core/DAO/Note.php b/CRM/Core/DAO/Note.php index 3c730b47ee..22dfc9b7fa 100644 --- a/CRM/Core/DAO/Note.php +++ b/CRM/Core/DAO/Note.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Note.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:75161cdedcd719f035387c9c1d0d83dd) + * (GenCodeChecksum:ac7f4de63097d51ee52cc876ccad55e9) */ /** diff --git a/CRM/Core/DAO/OpenID.php b/CRM/Core/DAO/OpenID.php index dfe13c489d..e993122b22 100644 --- a/CRM/Core/DAO/OpenID.php +++ b/CRM/Core/DAO/OpenID.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/OpenID.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:7af55174e40a30da959ad7734573eb9a) + * (GenCodeChecksum:0dfd6eb0f06f6d29d661fdc2b51d707a) */ /** diff --git a/CRM/Core/DAO/OptionGroup.php b/CRM/Core/DAO/OptionGroup.php index 76ef9a0bcf..16ef4582f6 100644 --- a/CRM/Core/DAO/OptionGroup.php +++ b/CRM/Core/DAO/OptionGroup.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/OptionGroup.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:e9bb68e874d377a0c30b433103d438d4) + * (GenCodeChecksum:ce2435eb871ead2e9fe08535da0efdf4) */ /** diff --git a/CRM/Core/DAO/OptionValue.php b/CRM/Core/DAO/OptionValue.php index 5fb8ddb452..cb8ba2cd42 100644 --- a/CRM/Core/DAO/OptionValue.php +++ b/CRM/Core/DAO/OptionValue.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/OptionValue.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:f47024ac081427ddadce4c569934f8a6) + * (GenCodeChecksum:44af5e1daf9325ef98fbd4ec20927635) */ /** diff --git a/CRM/Core/DAO/Phone.php b/CRM/Core/DAO/Phone.php index 5c0b7816a5..e0283a285d 100644 --- a/CRM/Core/DAO/Phone.php +++ b/CRM/Core/DAO/Phone.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Phone.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:f77d3ef5985c8945730c2fe22bb3fa45) + * (GenCodeChecksum:ab1d2489e34ff90df7146ee39364fb2a) */ /** diff --git a/CRM/Core/DAO/PreferencesDate.php b/CRM/Core/DAO/PreferencesDate.php index 78fa11538f..7b3a3780d7 100644 --- a/CRM/Core/DAO/PreferencesDate.php +++ b/CRM/Core/DAO/PreferencesDate.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/PreferencesDate.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:d0de29e655d17a479ec8cfc762582c39) + * (GenCodeChecksum:0c9efd56cae3a34bea22b763c67162df) */ /** diff --git a/CRM/Core/DAO/PrevNextCache.php b/CRM/Core/DAO/PrevNextCache.php index 258e3ef5c4..ec7e351401 100644 --- a/CRM/Core/DAO/PrevNextCache.php +++ b/CRM/Core/DAO/PrevNextCache.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/PrevNextCache.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:325d605774498631dd0a2742963d1032) + * (GenCodeChecksum:10cb66e317ece2bfe45642c4004d9b36) */ /** diff --git a/CRM/Core/DAO/PrintLabel.php b/CRM/Core/DAO/PrintLabel.php index 97575a87dd..2ef91fe1d4 100644 --- a/CRM/Core/DAO/PrintLabel.php +++ b/CRM/Core/DAO/PrintLabel.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/PrintLabel.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:9612aababed43ba4eaacc71a727c5ed9) + * (GenCodeChecksum:2505ce7214d5180635182054f5a784b1) */ /** diff --git a/CRM/Core/DAO/RecurringEntity.php b/CRM/Core/DAO/RecurringEntity.php index 1cffe8c273..6ee540259a 100644 --- a/CRM/Core/DAO/RecurringEntity.php +++ b/CRM/Core/DAO/RecurringEntity.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/RecurringEntity.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2667b60a5f917352d52964de09cf85fa) + * (GenCodeChecksum:50582177a0117aba7d8f7b65f98a9d59) */ /** diff --git a/CRM/Core/DAO/Setting.php b/CRM/Core/DAO/Setting.php index 4fb42fd82a..67348cfbcd 100644 --- a/CRM/Core/DAO/Setting.php +++ b/CRM/Core/DAO/Setting.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Setting.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:24ec63102452f5cdff8424b5caf8b679) + * (GenCodeChecksum:d50b37651a6a36273110251643e9e633) */ /** diff --git a/CRM/Core/DAO/StateProvince.php b/CRM/Core/DAO/StateProvince.php index e376f57c65..67a04a1373 100644 --- a/CRM/Core/DAO/StateProvince.php +++ b/CRM/Core/DAO/StateProvince.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/StateProvince.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:504a7092bbd803d38b7f0fb91756bede) + * (GenCodeChecksum:6af37b242446cb229568ae2c0a05d95e) */ /** diff --git a/CRM/Core/DAO/StatusPreference.php b/CRM/Core/DAO/StatusPreference.php index e5654e6014..cec45ce482 100644 --- a/CRM/Core/DAO/StatusPreference.php +++ b/CRM/Core/DAO/StatusPreference.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/StatusPreference.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:7c7deea1bd07dccee5a5bae0b1d6c4c7) + * (GenCodeChecksum:51374620eeab683f30d11aee9b51a448) */ /** diff --git a/CRM/Core/DAO/SystemLog.php b/CRM/Core/DAO/SystemLog.php index d3cc2ec358..4cfe5f1262 100644 --- a/CRM/Core/DAO/SystemLog.php +++ b/CRM/Core/DAO/SystemLog.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/SystemLog.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:3765c5a89ca1e9ff224fbd49e31a4037) + * (GenCodeChecksum:ca34da7770ea481ca165e648c5b456f0) */ /** diff --git a/CRM/Core/DAO/Tag.php b/CRM/Core/DAO/Tag.php index 15078e57da..e6edf14624 100644 --- a/CRM/Core/DAO/Tag.php +++ b/CRM/Core/DAO/Tag.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Tag.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:8a5eeefa40273898a4e3661b1ef43b3d) + * (GenCodeChecksum:2ee103855c84fdb6d8487b3a028aca7e) */ /** diff --git a/CRM/Core/DAO/Timezone.php b/CRM/Core/DAO/Timezone.php index bae04f5e2d..f0006ca68b 100644 --- a/CRM/Core/DAO/Timezone.php +++ b/CRM/Core/DAO/Timezone.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Timezone.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:b49b5541f20c732fc7ff4cdc3687899b) + * (GenCodeChecksum:4d758a9da910a13c54c4fce360cfbb03) */ /** diff --git a/CRM/Core/DAO/UFField.php b/CRM/Core/DAO/UFField.php index 87cde6f32d..180ddae187 100644 --- a/CRM/Core/DAO/UFField.php +++ b/CRM/Core/DAO/UFField.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/UFField.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:1cf845aa31eed1a29bffcd4404862f6a) + * (GenCodeChecksum:2c1662232dc0ee7de0f5ffb329a956a0) */ /** diff --git a/CRM/Core/DAO/UFGroup.php b/CRM/Core/DAO/UFGroup.php index 89d25b997e..1e5739156e 100644 --- a/CRM/Core/DAO/UFGroup.php +++ b/CRM/Core/DAO/UFGroup.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/UFGroup.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:e33df676b4e3ae50e18f1c44e437e3ea) + * (GenCodeChecksum:ca1887e29e1d2daf1318be1cfd5ae8b9) */ /** diff --git a/CRM/Core/DAO/UFJoin.php b/CRM/Core/DAO/UFJoin.php index 28f3f56340..52a6403368 100644 --- a/CRM/Core/DAO/UFJoin.php +++ b/CRM/Core/DAO/UFJoin.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/UFJoin.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:4bcf2b3e5905f98d83d449b1226903da) + * (GenCodeChecksum:50c3c6aa59540ad200f1fac488337a75) */ /** diff --git a/CRM/Core/DAO/UFMatch.php b/CRM/Core/DAO/UFMatch.php index 6a5d32b772..2ecaee86fe 100644 --- a/CRM/Core/DAO/UFMatch.php +++ b/CRM/Core/DAO/UFMatch.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/UFMatch.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:613e38722266d0117e69f521e4f0d140) + * (GenCodeChecksum:37ebdcccf0be04453b78d536b688e2a9) */ /** diff --git a/CRM/Core/DAO/Website.php b/CRM/Core/DAO/Website.php index aed21d3676..c1c8942ea7 100644 --- a/CRM/Core/DAO/Website.php +++ b/CRM/Core/DAO/Website.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Website.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:1d9c6cf4e3d809a3b3f5963ccb189e83) + * (GenCodeChecksum:521615f9d64b0fcdc159ca28efaaec31) */ /** diff --git a/CRM/Core/DAO/WordReplacement.php b/CRM/Core/DAO/WordReplacement.php index 691291abcf..91e530a2ec 100644 --- a/CRM/Core/DAO/WordReplacement.php +++ b/CRM/Core/DAO/WordReplacement.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/WordReplacement.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:104090c38770547ffa491fccdf299765) + * (GenCodeChecksum:59c9ea0b5ac2faa96c0c40bd1ff519ca) */ /** diff --git a/CRM/Core/DAO/Worldregion.php b/CRM/Core/DAO/Worldregion.php index 0974aecff5..cec48a02d7 100644 --- a/CRM/Core/DAO/Worldregion.php +++ b/CRM/Core/DAO/Worldregion.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/Worldregion.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:af9fba05839764ec479cc5fad738390a) + * (GenCodeChecksum:5da53f7fa56df3c4873bdc36d431b87f) */ /** diff --git a/CRM/Cxn/DAO/Cxn.php b/CRM/Cxn/DAO/Cxn.php index 03e9fc8ef0..22632dc1f5 100644 --- a/CRM/Cxn/DAO/Cxn.php +++ b/CRM/Cxn/DAO/Cxn.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Cxn/Cxn.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:10e6547299a52750abd62b96dfacc9de) + * (GenCodeChecksum:aae971d0607825ba1b21bc2f11ea3f8a) */ /** diff --git a/CRM/Dedupe/DAO/Exception.php b/CRM/Dedupe/DAO/Exception.php index ca488f4208..8de5b5cbef 100644 --- a/CRM/Dedupe/DAO/Exception.php +++ b/CRM/Dedupe/DAO/Exception.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Dedupe/Exception.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:95d83f44443d6ddfed8758214c46ff1b) + * (GenCodeChecksum:0af60fac5e3a7987feaa168009fcc29f) */ /** diff --git a/CRM/Dedupe/DAO/Rule.php b/CRM/Dedupe/DAO/Rule.php index a09f6a7f4b..1470eb59bc 100644 --- a/CRM/Dedupe/DAO/Rule.php +++ b/CRM/Dedupe/DAO/Rule.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Dedupe/Rule.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:1c0c64573702774a043ea32c73f05bd8) + * (GenCodeChecksum:32900bb777ad3b4433835fb588ca9e8b) */ /** diff --git a/CRM/Dedupe/DAO/RuleGroup.php b/CRM/Dedupe/DAO/RuleGroup.php index 62c6a4b2d0..f2c54cfaa8 100644 --- a/CRM/Dedupe/DAO/RuleGroup.php +++ b/CRM/Dedupe/DAO/RuleGroup.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Dedupe/RuleGroup.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:5fb31b058249567562ab0a30a739fda2) + * (GenCodeChecksum:8cfa2fabe0dc4bd5d8f5668619b1c3bd) */ /** diff --git a/CRM/Event/Cart/DAO/Cart.php b/CRM/Event/Cart/DAO/Cart.php index bf8ece70d4..819457017c 100644 --- a/CRM/Event/Cart/DAO/Cart.php +++ b/CRM/Event/Cart/DAO/Cart.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Event/Cart/Cart.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:b7a4ad0bbb09a64b8afefd7a1a2d6a9b) + * (GenCodeChecksum:9ba9d7103a061bdc244d16a6c7252fde) */ /** diff --git a/CRM/Event/Cart/DAO/EventInCart.php b/CRM/Event/Cart/DAO/EventInCart.php index 61f42ceb22..8f2bb529e7 100644 --- a/CRM/Event/Cart/DAO/EventInCart.php +++ b/CRM/Event/Cart/DAO/EventInCart.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Event/Cart/EventInCart.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:ef07999cbb7872dc9c1cfa6a0055bee1) + * (GenCodeChecksum:ac722f73c2721247894ec9fff3c7ee3e) */ /** diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php index a1e23959c0..f9ae994c58 100644 --- a/CRM/Event/DAO/Event.php +++ b/CRM/Event/DAO/Event.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Event/Event.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:a7abbcbe6a0e5e49e55d61afd013c791) + * (GenCodeChecksum:d6fecb12a76e0474aa4bfab8a7b012fb) */ /** diff --git a/CRM/Event/DAO/Participant.php b/CRM/Event/DAO/Participant.php index 3d7a2fa49d..0f87a1a039 100644 --- a/CRM/Event/DAO/Participant.php +++ b/CRM/Event/DAO/Participant.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Event/Participant.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:97d6a90c8b1f973347dc8decd97f84ee) + * (GenCodeChecksum:89a8003239597da5e935fbce49827aee) */ /** diff --git a/CRM/Event/DAO/ParticipantPayment.php b/CRM/Event/DAO/ParticipantPayment.php index 44cff71fab..49faf4362f 100644 --- a/CRM/Event/DAO/ParticipantPayment.php +++ b/CRM/Event/DAO/ParticipantPayment.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Event/ParticipantPayment.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:767fb54121e25d39d9b82cfbb4a5355b) + * (GenCodeChecksum:4acfc883c7ffc0ac03801022d6620a6c) */ /** diff --git a/CRM/Event/DAO/ParticipantStatusType.php b/CRM/Event/DAO/ParticipantStatusType.php index cf410c357b..c68386fe3a 100644 --- a/CRM/Event/DAO/ParticipantStatusType.php +++ b/CRM/Event/DAO/ParticipantStatusType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Event/ParticipantStatusType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:6bf827c56f673a914923346816449255) + * (GenCodeChecksum:ae55eda6ef9990e6f3c5868545b96c34) */ /** diff --git a/CRM/Financial/DAO/Currency.php b/CRM/Financial/DAO/Currency.php index 868495d6d7..07e10ae151 100644 --- a/CRM/Financial/DAO/Currency.php +++ b/CRM/Financial/DAO/Currency.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/Currency.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:0347ed61e0dc585d250a83f9fa162f2d) + * (GenCodeChecksum:59d9bdfece27d7a08113a81a83cd36ef) */ /** diff --git a/CRM/Financial/DAO/EntityFinancialAccount.php b/CRM/Financial/DAO/EntityFinancialAccount.php index 6474da9830..b85d64b0c8 100644 --- a/CRM/Financial/DAO/EntityFinancialAccount.php +++ b/CRM/Financial/DAO/EntityFinancialAccount.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/EntityFinancialAccount.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:04ae90cfa08b3e1380f48c64e0bcc1ce) + * (GenCodeChecksum:3e6010351d131140c8cf791e1ec2ee87) */ /** diff --git a/CRM/Financial/DAO/EntityFinancialTrxn.php b/CRM/Financial/DAO/EntityFinancialTrxn.php index 4935cf9f2c..186521f898 100644 --- a/CRM/Financial/DAO/EntityFinancialTrxn.php +++ b/CRM/Financial/DAO/EntityFinancialTrxn.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/EntityFinancialTrxn.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:bbf884307aab01daa88aa7f3c06c2624) + * (GenCodeChecksum:e834c532b7de805d7caf615f7cb1dc89) */ /** diff --git a/CRM/Financial/DAO/FinancialAccount.php b/CRM/Financial/DAO/FinancialAccount.php index 30be03ce47..f424a53d07 100644 --- a/CRM/Financial/DAO/FinancialAccount.php +++ b/CRM/Financial/DAO/FinancialAccount.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/FinancialAccount.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:09d2e3d6a970fa2413b6f29ab1f580e0) + * (GenCodeChecksum:0ec6a6cdeba369d17f5fd2502183af58) */ /** diff --git a/CRM/Financial/DAO/FinancialItem.php b/CRM/Financial/DAO/FinancialItem.php index dd75f2405a..c1e8a499a6 100644 --- a/CRM/Financial/DAO/FinancialItem.php +++ b/CRM/Financial/DAO/FinancialItem.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/FinancialItem.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:a70adfdd0e2248a7583c5c49ad0a5b85) + * (GenCodeChecksum:07179eb8641f88a9849b268070ba3916) */ /** diff --git a/CRM/Financial/DAO/FinancialTrxn.php b/CRM/Financial/DAO/FinancialTrxn.php index d0f2b85738..c123d23def 100644 --- a/CRM/Financial/DAO/FinancialTrxn.php +++ b/CRM/Financial/DAO/FinancialTrxn.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/FinancialTrxn.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:834a9dbff8acecd70dbb68d640cb1d46) + * (GenCodeChecksum:06958233f84eb778009eb5b02002f342) */ /** diff --git a/CRM/Financial/DAO/FinancialType.php b/CRM/Financial/DAO/FinancialType.php index d9b1ce7f58..89eacce2ec 100644 --- a/CRM/Financial/DAO/FinancialType.php +++ b/CRM/Financial/DAO/FinancialType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/FinancialType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:36875c58b3267bdc2def295713858868) + * (GenCodeChecksum:14e5e79b764d26b8861496c73cacca14) */ /** diff --git a/CRM/Financial/DAO/PaymentProcessor.php b/CRM/Financial/DAO/PaymentProcessor.php index f882e0d0b1..b073331bd2 100644 --- a/CRM/Financial/DAO/PaymentProcessor.php +++ b/CRM/Financial/DAO/PaymentProcessor.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/PaymentProcessor.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:8277056355c9f16ae28f69ba3298730e) + * (GenCodeChecksum:0333db5b51d70297d51351e8e97baec6) */ /** diff --git a/CRM/Financial/DAO/PaymentProcessorType.php b/CRM/Financial/DAO/PaymentProcessorType.php index 3b01445876..bcffa4ea0a 100644 --- a/CRM/Financial/DAO/PaymentProcessorType.php +++ b/CRM/Financial/DAO/PaymentProcessorType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/PaymentProcessorType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:62dd4d3229f289de4afb3c5e3e39db66) + * (GenCodeChecksum:baffa34a0c2ee650a71299ea2df91b57) */ /** diff --git a/CRM/Financial/DAO/PaymentToken.php b/CRM/Financial/DAO/PaymentToken.php index 1608dab55d..f5e020b99a 100644 --- a/CRM/Financial/DAO/PaymentToken.php +++ b/CRM/Financial/DAO/PaymentToken.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Financial/PaymentToken.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2923b7966bbe25d435eb7b909d35541f) + * (GenCodeChecksum:ec9e29386ab9e67c4e3256bd47222eda) */ /** diff --git a/CRM/Friend/DAO/Friend.php b/CRM/Friend/DAO/Friend.php index 690419d0b9..920353eb7c 100644 --- a/CRM/Friend/DAO/Friend.php +++ b/CRM/Friend/DAO/Friend.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Friend/Friend.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:1452e2f2b01782f26a30e94bd6af3783) + * (GenCodeChecksum:988585422bc3fa558dd2cd8b84867f30) */ /** diff --git a/CRM/Grant/DAO/Grant.php b/CRM/Grant/DAO/Grant.php index 4a37002606..438641761e 100644 --- a/CRM/Grant/DAO/Grant.php +++ b/CRM/Grant/DAO/Grant.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Grant/Grant.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:febf55259ea92f4dd6a7d1ee4b5ea93a) + * (GenCodeChecksum:1e2a7c1d16518e1bffa40c673976aa28) */ /** diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php index 39786f0332..48ff217fe3 100644 --- a/CRM/Logging/Schema.php +++ b/CRM/Logging/Schema.php @@ -817,6 +817,9 @@ COLS; $query = preg_replace("/^ [^`].*$/m", '', $query); $engine = strtoupper(CRM_Utils_Array::value('engine', $this->logTableSpec[$table], self::ENGINE)); $engine .= " " . CRM_Utils_Array::value('engine_config', $this->logTableSpec[$table]); + if (strpos($engine, 'ROW_FORMAT') !== FALSE) { + $query = preg_replace("/ROW_FORMAT=\w+/m", '', $query); + } $query = preg_replace("/^\) ENGINE=[^ ]+ /im", ') ENGINE=' . $engine . ' ', $query); // log_civicrm_contact.modified_date for example would always be copied from civicrm_contact.modified_date, diff --git a/CRM/Mailing/DAO/BouncePattern.php b/CRM/Mailing/DAO/BouncePattern.php index 8c74d99ecf..24d754b6b9 100644 --- a/CRM/Mailing/DAO/BouncePattern.php +++ b/CRM/Mailing/DAO/BouncePattern.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/BouncePattern.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:65ffd17da4de88b093e578fc52d42800) + * (GenCodeChecksum:560357c028d9622650b14d00ff4a988b) */ /** diff --git a/CRM/Mailing/DAO/BounceType.php b/CRM/Mailing/DAO/BounceType.php index 6511adf6d2..6d2c61ffec 100644 --- a/CRM/Mailing/DAO/BounceType.php +++ b/CRM/Mailing/DAO/BounceType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/BounceType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:41a2f33a589d43ba388d36dcf8f9e54f) + * (GenCodeChecksum:5bc7e4fa62c93ca85f2be5049c835364) */ /** diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php index 392012f845..d4dd5e9093 100644 --- a/CRM/Mailing/DAO/Mailing.php +++ b/CRM/Mailing/DAO/Mailing.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Mailing.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:f1ac9d0a02ed59171d4efdc4209a376c) + * (GenCodeChecksum:99b193c66e023171c288bf12e2548c9d) */ /** diff --git a/CRM/Mailing/DAO/MailingAB.php b/CRM/Mailing/DAO/MailingAB.php index 1932930dc2..06c9c7cfdf 100644 --- a/CRM/Mailing/DAO/MailingAB.php +++ b/CRM/Mailing/DAO/MailingAB.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/MailingAB.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:075e135a610dcb619ab3ddc8c23944e1) + * (GenCodeChecksum:f272ec7c03cec8fc418235f43faee2f0) */ /** diff --git a/CRM/Mailing/DAO/MailingComponent.php b/CRM/Mailing/DAO/MailingComponent.php index b544c0ea2e..739c4b73ef 100644 --- a/CRM/Mailing/DAO/MailingComponent.php +++ b/CRM/Mailing/DAO/MailingComponent.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/MailingComponent.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:bb6ab1e7538409ecfa1e72a45bb287a1) + * (GenCodeChecksum:976aaaac1e4b5b4292eed10c4790c815) */ /** diff --git a/CRM/Mailing/DAO/MailingGroup.php b/CRM/Mailing/DAO/MailingGroup.php index 0d3497c6cd..2f4890745c 100644 --- a/CRM/Mailing/DAO/MailingGroup.php +++ b/CRM/Mailing/DAO/MailingGroup.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/MailingGroup.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:4ab3dccb8706ec8f03072118ff2e9c12) + * (GenCodeChecksum:01f3eba5240adc62845ac97f6e0a73db) */ /** diff --git a/CRM/Mailing/DAO/MailingJob.php b/CRM/Mailing/DAO/MailingJob.php index edbd20cd5f..ca807ec748 100644 --- a/CRM/Mailing/DAO/MailingJob.php +++ b/CRM/Mailing/DAO/MailingJob.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/MailingJob.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:eb066e39ba2501608759e6ac3dfbcaaf) + * (GenCodeChecksum:65a91689ae410dcce9b9b181269e6b4d) */ /** diff --git a/CRM/Mailing/DAO/Recipients.php b/CRM/Mailing/DAO/Recipients.php index 7e6bb43ab1..ee3e810413 100644 --- a/CRM/Mailing/DAO/Recipients.php +++ b/CRM/Mailing/DAO/Recipients.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Recipients.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:3fb8b7a18899cd7dba958e9e08a944a7) + * (GenCodeChecksum:cbb42af0d0519d97437cb92707a169d8) */ /** diff --git a/CRM/Mailing/DAO/Spool.php b/CRM/Mailing/DAO/Spool.php index 6329553862..33e5f83280 100644 --- a/CRM/Mailing/DAO/Spool.php +++ b/CRM/Mailing/DAO/Spool.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Spool.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:f2aa2d8c8ee3203bf674e6c193818dda) + * (GenCodeChecksum:4da95477da6dcac11d1f7d8aade85953) */ /** diff --git a/CRM/Mailing/DAO/TrackableURL.php b/CRM/Mailing/DAO/TrackableURL.php index 0452ac93ba..dd5207e8ae 100644 --- a/CRM/Mailing/DAO/TrackableURL.php +++ b/CRM/Mailing/DAO/TrackableURL.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/TrackableURL.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:ac0ae37c12d442071e726deb75e8a7ba) + * (GenCodeChecksum:0cf245411bb62afa6c9b8f63a903f1ad) */ /** diff --git a/CRM/Mailing/Event/DAO/Bounce.php b/CRM/Mailing/Event/DAO/Bounce.php index 7252307252..0e4f373f52 100644 --- a/CRM/Mailing/Event/DAO/Bounce.php +++ b/CRM/Mailing/Event/DAO/Bounce.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/Bounce.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:dc1c97304810848da9a9c4255456799f) + * (GenCodeChecksum:50ce35d916fa3bda6ce5bc04b623918e) */ /** diff --git a/CRM/Mailing/Event/DAO/Confirm.php b/CRM/Mailing/Event/DAO/Confirm.php index 3c757f302d..4782e61fc1 100644 --- a/CRM/Mailing/Event/DAO/Confirm.php +++ b/CRM/Mailing/Event/DAO/Confirm.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/Confirm.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:3d1dae89470e79336dab7506dd173499) + * (GenCodeChecksum:f2ed5f47531f144f3850e179fee6c18f) */ /** diff --git a/CRM/Mailing/Event/DAO/Delivered.php b/CRM/Mailing/Event/DAO/Delivered.php index 93bb85e2d5..1b92fe506d 100644 --- a/CRM/Mailing/Event/DAO/Delivered.php +++ b/CRM/Mailing/Event/DAO/Delivered.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/Delivered.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:6a81ffa6ed10a254979274ea5edbd855) + * (GenCodeChecksum:5c10ce5edff5d1ca52c405080756bb69) */ /** diff --git a/CRM/Mailing/Event/DAO/Forward.php b/CRM/Mailing/Event/DAO/Forward.php index 6650dd0c0c..cbf07e35de 100644 --- a/CRM/Mailing/Event/DAO/Forward.php +++ b/CRM/Mailing/Event/DAO/Forward.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/Forward.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:16bd96b998ed8316250158886d0dc7c8) + * (GenCodeChecksum:0e75326c3a49e51e29781f8a0d532553) */ /** diff --git a/CRM/Mailing/Event/DAO/Opened.php b/CRM/Mailing/Event/DAO/Opened.php index 9ce62afcf5..96c2c601eb 100644 --- a/CRM/Mailing/Event/DAO/Opened.php +++ b/CRM/Mailing/Event/DAO/Opened.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/Opened.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:d636f34b01a876a72874c4b86abacff4) + * (GenCodeChecksum:b875f7351dbd80e0b09eb8aa7118a3ab) */ /** diff --git a/CRM/Mailing/Event/DAO/Queue.php b/CRM/Mailing/Event/DAO/Queue.php index 4dd92f1047..be83f4bf5d 100644 --- a/CRM/Mailing/Event/DAO/Queue.php +++ b/CRM/Mailing/Event/DAO/Queue.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/Queue.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:f37d1a6e35b4f827ed7daf29b3005fad) + * (GenCodeChecksum:a1a2a9f4685e49e3888669527b7ccfc9) */ /** diff --git a/CRM/Mailing/Event/DAO/Reply.php b/CRM/Mailing/Event/DAO/Reply.php index 3c3cb9cff7..28ec734dc6 100644 --- a/CRM/Mailing/Event/DAO/Reply.php +++ b/CRM/Mailing/Event/DAO/Reply.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/Reply.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:e4f80247fbee550b68997bd9f264dc66) + * (GenCodeChecksum:09d539a90e11ec1cb333d10900eaba88) */ /** diff --git a/CRM/Mailing/Event/DAO/Subscribe.php b/CRM/Mailing/Event/DAO/Subscribe.php index 6659fcca1d..e389110706 100644 --- a/CRM/Mailing/Event/DAO/Subscribe.php +++ b/CRM/Mailing/Event/DAO/Subscribe.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/Subscribe.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:b5a2a60211ad6eb943a6aa0db5f88840) + * (GenCodeChecksum:29a50c0404f021195a3102f41a67f3fa) */ /** diff --git a/CRM/Mailing/Event/DAO/TrackableURLOpen.php b/CRM/Mailing/Event/DAO/TrackableURLOpen.php index 85f4b96810..8d066db1b4 100644 --- a/CRM/Mailing/Event/DAO/TrackableURLOpen.php +++ b/CRM/Mailing/Event/DAO/TrackableURLOpen.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/TrackableURLOpen.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:6e1eb0a358ed16c691ea25a741ce6f8c) + * (GenCodeChecksum:7e3b22693523f8453eaa28a44a286de9) */ /** diff --git a/CRM/Mailing/Event/DAO/Unsubscribe.php b/CRM/Mailing/Event/DAO/Unsubscribe.php index 71432c59ab..102f53854f 100644 --- a/CRM/Mailing/Event/DAO/Unsubscribe.php +++ b/CRM/Mailing/Event/DAO/Unsubscribe.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/Unsubscribe.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:48ace30af145c288185e356b721a22d1) + * (GenCodeChecksum:cbe929e71408b28356b7f66c16fd630b) */ /** diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php index 58610aef48..382fb5ba70 100644 --- a/CRM/Member/DAO/Membership.php +++ b/CRM/Member/DAO/Membership.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Member/Membership.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2f2fd321dc15b2e2f453fc600d994c9a) + * (GenCodeChecksum:d7667a8f99b6f74f97eb5d167a10588a) */ /** diff --git a/CRM/Member/DAO/MembershipBlock.php b/CRM/Member/DAO/MembershipBlock.php index 9bfff52639..9a1b171e38 100644 --- a/CRM/Member/DAO/MembershipBlock.php +++ b/CRM/Member/DAO/MembershipBlock.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Member/MembershipBlock.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:6a38472a1103f6f5de9e33fed620060d) + * (GenCodeChecksum:213063eacc89b54159a5b8a9be83e154) */ /** diff --git a/CRM/Member/DAO/MembershipLog.php b/CRM/Member/DAO/MembershipLog.php index 1619acbedb..d290e78d3d 100644 --- a/CRM/Member/DAO/MembershipLog.php +++ b/CRM/Member/DAO/MembershipLog.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Member/MembershipLog.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:d1e55c6d7f0e93b21778fdd36dd6e022) + * (GenCodeChecksum:c566d3d521cd6d8c69985dfee3966f32) */ /** diff --git a/CRM/Member/DAO/MembershipPayment.php b/CRM/Member/DAO/MembershipPayment.php index 67e9bc6057..86a3fa3063 100644 --- a/CRM/Member/DAO/MembershipPayment.php +++ b/CRM/Member/DAO/MembershipPayment.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Member/MembershipPayment.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:e9764dc46ae261f8cad8ef1383063d61) + * (GenCodeChecksum:f9f29f55166a77a306e48917878c13eb) */ /** diff --git a/CRM/Member/DAO/MembershipStatus.php b/CRM/Member/DAO/MembershipStatus.php index 5857dca3cf..9dac1319e1 100644 --- a/CRM/Member/DAO/MembershipStatus.php +++ b/CRM/Member/DAO/MembershipStatus.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Member/MembershipStatus.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:6bdad135e9f0e94f085296d68ca59253) + * (GenCodeChecksum:8a9ae3df6a24e73e88c365b49b794939) */ /** diff --git a/CRM/Member/DAO/MembershipType.php b/CRM/Member/DAO/MembershipType.php index d904024ac4..2a26d7176e 100644 --- a/CRM/Member/DAO/MembershipType.php +++ b/CRM/Member/DAO/MembershipType.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Member/MembershipType.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:db300e3a7f5ca29a1b6ca43e0885bcb5) + * (GenCodeChecksum:23a28ee6fccd8f82844eb2bd78968ce1) */ /** diff --git a/CRM/PCP/DAO/PCP.php b/CRM/PCP/DAO/PCP.php index bd3fedb780..deba667bfe 100644 --- a/CRM/PCP/DAO/PCP.php +++ b/CRM/PCP/DAO/PCP.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/PCP/PCP.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2232571099c216fb7a823556f5bd8328) + * (GenCodeChecksum:90c78e7a79e25aedd5c724e39954fce1) */ /** diff --git a/CRM/PCP/DAO/PCPBlock.php b/CRM/PCP/DAO/PCPBlock.php index 711dc584c9..3ddc6b2ecb 100644 --- a/CRM/PCP/DAO/PCPBlock.php +++ b/CRM/PCP/DAO/PCPBlock.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/PCP/PCPBlock.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2039aecf7902bf0fda7f91081778b1c8) + * (GenCodeChecksum:520b1c5953cbbc59f2d8f017a47447ce) */ /** diff --git a/CRM/Pledge/DAO/Pledge.php b/CRM/Pledge/DAO/Pledge.php index 2a2f80900d..9ad4fd299a 100644 --- a/CRM/Pledge/DAO/Pledge.php +++ b/CRM/Pledge/DAO/Pledge.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Pledge/Pledge.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:0447b8be2ab956b77d0d6be123e0bdb4) + * (GenCodeChecksum:90520b21b729953e89642a110732c3a7) */ /** diff --git a/CRM/Pledge/DAO/PledgeBlock.php b/CRM/Pledge/DAO/PledgeBlock.php index 111d085910..181d04dce8 100644 --- a/CRM/Pledge/DAO/PledgeBlock.php +++ b/CRM/Pledge/DAO/PledgeBlock.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Pledge/PledgeBlock.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2b02296af6d4e280950d483d222b20b9) + * (GenCodeChecksum:0013d80a4d2323ab5165901d323c642d) */ /** diff --git a/CRM/Pledge/DAO/PledgePayment.php b/CRM/Pledge/DAO/PledgePayment.php index bb88db54a7..b05d0fb992 100644 --- a/CRM/Pledge/DAO/PledgePayment.php +++ b/CRM/Pledge/DAO/PledgePayment.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Pledge/PledgePayment.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:b3b6719f4f4a8c441f271213ff7f52db) + * (GenCodeChecksum:29c227f26fe3caa851814aaaf7145a07) */ /** diff --git a/CRM/Price/DAO/LineItem.php b/CRM/Price/DAO/LineItem.php index 82cea2af7f..1bf602f677 100644 --- a/CRM/Price/DAO/LineItem.php +++ b/CRM/Price/DAO/LineItem.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Price/LineItem.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:c9962dd4253fbcf43073bf10fbb0ce86) + * (GenCodeChecksum:6a7eb4dd390df7342c9a7d81f308d5e8) */ /** diff --git a/CRM/Price/DAO/PriceField.php b/CRM/Price/DAO/PriceField.php index 2f5d0d653a..4c22eaffc5 100644 --- a/CRM/Price/DAO/PriceField.php +++ b/CRM/Price/DAO/PriceField.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Price/PriceField.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:fdebc45a7d5c35abb0c9c480dbf201b2) + * (GenCodeChecksum:d7e79b4e9e95854e162c629324a05004) */ /** diff --git a/CRM/Price/DAO/PriceFieldValue.php b/CRM/Price/DAO/PriceFieldValue.php index 2057dd655d..1c9a8ba91d 100644 --- a/CRM/Price/DAO/PriceFieldValue.php +++ b/CRM/Price/DAO/PriceFieldValue.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Price/PriceFieldValue.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:16987d2cc463a2d9290339ad37070f16) + * (GenCodeChecksum:fca6ff018517b3def65b2a381f400c69) */ /** diff --git a/CRM/Price/DAO/PriceSet.php b/CRM/Price/DAO/PriceSet.php index 3c62426ff7..cd9c6244da 100644 --- a/CRM/Price/DAO/PriceSet.php +++ b/CRM/Price/DAO/PriceSet.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Price/PriceSet.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:98eebd80f22712ce0809cec244b6f92a) + * (GenCodeChecksum:af23f33ee60d1b06662c4e11187dbcb6) */ /** diff --git a/CRM/Price/DAO/PriceSetEntity.php b/CRM/Price/DAO/PriceSetEntity.php index 4b1d3749a5..16e92b3a84 100644 --- a/CRM/Price/DAO/PriceSetEntity.php +++ b/CRM/Price/DAO/PriceSetEntity.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Price/PriceSetEntity.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:0284d1a184dd635d93dd170e94451e86) + * (GenCodeChecksum:bbdb5b9c0e6f8df52ab74238ec47883d) */ /** diff --git a/CRM/Queue/DAO/QueueItem.php b/CRM/Queue/DAO/QueueItem.php index 7ee05fcafa..88737075a2 100644 --- a/CRM/Queue/DAO/QueueItem.php +++ b/CRM/Queue/DAO/QueueItem.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Queue/QueueItem.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:32350e9450942f29e7785ceaaed7a1b9) + * (GenCodeChecksum:21270fc0075d353032051ac4343095bc) */ /** diff --git a/CRM/Report/DAO/ReportInstance.php b/CRM/Report/DAO/ReportInstance.php index f4ab944703..a0e9823737 100644 --- a/CRM/Report/DAO/ReportInstance.php +++ b/CRM/Report/DAO/ReportInstance.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Report/ReportInstance.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:9c05a0739ee0b8250fdc0418b5fb247d) + * (GenCodeChecksum:4a333db47b94692a5cbc5395fdfcb899) */ /** diff --git a/CRM/SMS/DAO/Provider.php b/CRM/SMS/DAO/Provider.php index afdd808359..1af2b2b570 100644 --- a/CRM/SMS/DAO/Provider.php +++ b/CRM/SMS/DAO/Provider.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/SMS/Provider.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:478e0d0caeb2d2a81068db6ad2db67aa) + * (GenCodeChecksum:abd82ad9d4a5b45b82523ec84dcf848a) */ /** diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index ade11c28c4..8eeadd33c6 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -7,7 +7,7 @@ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; +/*!40101 SET NAMES utf8mb4 */; /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -1534,7 +1534,7 @@ INSERT INTO `civicrm_custom_field` (`custom_group_id`, `name`, `label`, `data_ty -- * -- *******************************************************/ DROP TABLE IF EXISTS `civicrm_value_constituent_information_1`; -CREATE TABLE `civicrm_value_constituent_information_1` (`id` int(10) unsigned NOT NULL auto_increment, `entity_id` int(10) unsigned NOT NULL, `most_important_issue_1` varchar(255) default NULL, `marital_status_2` varchar(255) default NULL, `marriage_date_3` datetime default NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique_entity_id` (`entity_id`), INDEX `INDEX_most_important_issue_1` (`most_important_issue_1`), INDEX `INDEX_marital_status_2` (`marital_status_2`), INDEX `INDEX_marriage_date_3` (`marriage_date_3`), CONSTRAINT `FK_civicrm_value_constituent_information_1_entity_id` FOREIGN KEY (`entity_id`) REFERENCES `civicrm_contact` (`id`) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +CREATE TABLE `civicrm_value_constituent_information_1` (`id` int(10) unsigned NOT NULL auto_increment, `entity_id` int(10) unsigned NOT NULL, `most_important_issue_1` varchar(255) default NULL, `marital_status_2` varchar(255) default NULL, `marriage_date_3` datetime default NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique_entity_id` (`entity_id`), INDEX `INDEX_most_important_issue_1` (`most_important_issue_1`), INDEX `INDEX_marital_status_2` (`marital_status_2`), INDEX `INDEX_marriage_date_3` (`marriage_date_3`), CONSTRAINT `FK_civicrm_value_constituent_information_1_entity_id` FOREIGN KEY (`entity_id`) REFERENCES `civicrm_contact` (`id`) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; @@ -1551,7 +1551,7 @@ INSERT INTO civicrm_custom_field ( custom_group_id, label, name, data_type, html INSERT INTO civicrm_option_value ( option_group_id, label, value, name, weight ) VALUES ( @ogid, 'Bean Broth', 'bean', 'Bean_Broth', 1 ), ( @ogid, 'Chicken Combo', 'chicken', 'Chicken_Combo', 2), ( @ogid, 'Salmon Stew', 'salmon', 'Salmon_Stew', 3); DROP TABLE IF EXISTS `civicrm_value_food_preference_2`; -CREATE TABLE civicrm_value_food_preference_2 ( id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Default MySQL primary key', entity_id INT(10) UNSIGNED NOT NULL COMMENT 'Table that this extends', soup_selection_4 VARCHAR(255) DEFAULT NULL, PRIMARY KEY (id), UNIQUE KEY unique_entity_id (entity_id), CONSTRAINT `FK_civicrm_value_food_preference_2_entity_id` FOREIGN KEY (`entity_id`) REFERENCES `civicrm_participant` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +CREATE TABLE civicrm_value_food_preference_2 ( id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Default MySQL primary key', entity_id INT(10) UNSIGNED NOT NULL COMMENT 'Table that this extends', soup_selection_4 VARCHAR(255) DEFAULT NULL, PRIMARY KEY (id), UNIQUE KEY unique_entity_id (entity_id), CONSTRAINT `FK_civicrm_value_food_preference_2_entity_id` FOREIGN KEY (`entity_id`) REFERENCES `civicrm_participant` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; -- Donors’ custom data @@ -1568,7 +1568,7 @@ INSERT INTO `civicrm_custom_field` (`custom_group_id`, `label`, `name`, `data_ty INSERT INTO `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `weight`) VALUES (@ogid_contribution, 'Less than 1 year', '1', 'Less_than_1_year', 1), (@ogid_contribution, '1-3 years', '2', '1_3_years', 2),(@ogid_contribution, '4-6 years', '3', '4_6_years', 3),(@ogid_contribution, '7-9 years', '4', '7_9_years', 4),(@ogid_contribution, 'More than 9 years', '5', 'More_than_9_years', 5); DROP TABLE IF EXISTS `civicrm_value_donor_information_3`; -CREATE TABLE IF NOT EXISTS `civicrm_value_donor_information_3` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Default MySQL primary key', `entity_id` int(10) unsigned NOT NULL COMMENT 'Table that this extends', `known_areas_of_interest_5` text COLLATE utf8_unicode_ci, `how_long_have_you_been_a_donor_6` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique_entity_id` (`entity_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +CREATE TABLE IF NOT EXISTS `civicrm_value_donor_information_3` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Default MySQL primary key', `entity_id` int(10) unsigned NOT NULL COMMENT 'Table that this extends', `known_areas_of_interest_5` text COLLATE utf8mb4_unicode_ci, `how_long_have_you_been_a_donor_6` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique_entity_id` (`entity_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 7, 1, 1, 0, 'dummy', NULL, NULL, 'http://dummy.com', NULL, 'http://dummyrecur.com', NULL, NULL, 'Payment_Dummy', 1, 1, 1); INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 7, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'Payment_Dummy', 1, 1, 1); diff --git a/sql/civicrm_sample_custom_data.mysql b/sql/civicrm_sample_custom_data.mysql index 0e57a406b3..c49dd14a83 100644 --- a/sql/civicrm_sample_custom_data.mysql +++ b/sql/civicrm_sample_custom_data.mysql @@ -56,7 +56,7 @@ INSERT INTO `civicrm_custom_field` (`custom_group_id`, `name`, `label`, `data_ty -- * -- *******************************************************/ DROP TABLE IF EXISTS `civicrm_value_constituent_information_1`; -CREATE TABLE `civicrm_value_constituent_information_1` (`id` int(10) unsigned NOT NULL auto_increment, `entity_id` int(10) unsigned NOT NULL, `most_important_issue_1` varchar(255) default NULL, `marital_status_2` varchar(255) default NULL, `marriage_date_3` datetime default NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique_entity_id` (`entity_id`), INDEX `INDEX_most_important_issue_1` (`most_important_issue_1`), INDEX `INDEX_marital_status_2` (`marital_status_2`), INDEX `INDEX_marriage_date_3` (`marriage_date_3`), CONSTRAINT `FK_civicrm_value_constituent_information_1_entity_id` FOREIGN KEY (`entity_id`) REFERENCES `civicrm_contact` (`id`) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +CREATE TABLE `civicrm_value_constituent_information_1` (`id` int(10) unsigned NOT NULL auto_increment, `entity_id` int(10) unsigned NOT NULL, `most_important_issue_1` varchar(255) default NULL, `marital_status_2` varchar(255) default NULL, `marriage_date_3` datetime default NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique_entity_id` (`entity_id`), INDEX `INDEX_most_important_issue_1` (`most_important_issue_1`), INDEX `INDEX_marital_status_2` (`marital_status_2`), INDEX `INDEX_marriage_date_3` (`marriage_date_3`), CONSTRAINT `FK_civicrm_value_constituent_information_1_entity_id` FOREIGN KEY (`entity_id`) REFERENCES `civicrm_contact` (`id`) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; @@ -73,7 +73,7 @@ INSERT INTO civicrm_custom_field ( custom_group_id, label, name, data_type, html INSERT INTO civicrm_option_value ( option_group_id, label, value, name, weight ) VALUES ( @ogid, 'Bean Broth', 'bean', 'Bean_Broth', 1 ), ( @ogid, 'Chicken Combo', 'chicken', 'Chicken_Combo', 2), ( @ogid, 'Salmon Stew', 'salmon', 'Salmon_Stew', 3); DROP TABLE IF EXISTS `civicrm_value_food_preference_2`; -CREATE TABLE civicrm_value_food_preference_2 ( id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Default MySQL primary key', entity_id INT(10) UNSIGNED NOT NULL COMMENT 'Table that this extends', soup_selection_4 VARCHAR(255) DEFAULT NULL, PRIMARY KEY (id), UNIQUE KEY unique_entity_id (entity_id), CONSTRAINT `FK_civicrm_value_food_preference_2_entity_id` FOREIGN KEY (`entity_id`) REFERENCES `civicrm_participant` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +CREATE TABLE civicrm_value_food_preference_2 ( id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Default MySQL primary key', entity_id INT(10) UNSIGNED NOT NULL COMMENT 'Table that this extends', soup_selection_4 VARCHAR(255) DEFAULT NULL, PRIMARY KEY (id), UNIQUE KEY unique_entity_id (entity_id), CONSTRAINT `FK_civicrm_value_food_preference_2_entity_id` FOREIGN KEY (`entity_id`) REFERENCES `civicrm_participant` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; -- Donors’ custom data @@ -90,4 +90,4 @@ INSERT INTO `civicrm_custom_field` (`custom_group_id`, `label`, `name`, `data_ty INSERT INTO `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `weight`) VALUES (@ogid_contribution, 'Less than 1 year', '1', 'Less_than_1_year', 1), (@ogid_contribution, '1-3 years', '2', '1_3_years', 2),(@ogid_contribution, '4-6 years', '3', '4_6_years', 3),(@ogid_contribution, '7-9 years', '4', '7_9_years', 4),(@ogid_contribution, 'More than 9 years', '5', 'More_than_9_years', 5); DROP TABLE IF EXISTS `civicrm_value_donor_information_3`; -CREATE TABLE IF NOT EXISTS `civicrm_value_donor_information_3` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Default MySQL primary key', `entity_id` int(10) unsigned NOT NULL COMMENT 'Table that this extends', `known_areas_of_interest_5` text COLLATE utf8_unicode_ci, `how_long_have_you_been_a_donor_6` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique_entity_id` (`entity_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +CREATE TABLE IF NOT EXISTS `civicrm_value_donor_information_3` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Default MySQL primary key', `entity_id` int(10) unsigned NOT NULL COMMENT 'Table that this extends', `known_areas_of_interest_5` text COLLATE utf8mb4_unicode_ci, `how_long_have_you_been_a_donor_6` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique_entity_id` (`entity_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; diff --git a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php index 082f24ed68..8ea4dad0cd 100644 --- a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php +++ b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php @@ -910,7 +910,7 @@ class CRM_Core_BAO_CustomFieldTest extends CiviUnitTestCase { ]); $dao = CRM_Core_DAO::executeQuery(('SHOW CREATE TABLE ' . $customGroup['values'][$customGroup['id']]['table_name'])); $dao->fetch(); - $this->assertContains('`test_link_2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL', $dao->Create_Table); + $this->assertContains('`test_link_2` varchar(255) COLLATE ' . CRM_Core_BAO_SchemaHandler::getInUseCollation() . ' DEFAULT NULL', $dao->Create_Table); $this->assertContains('KEY `INDEX_my_text` (`my_text`)', $dao->Create_Table); } diff --git a/tests/phpunit/CRM/Core/I18n/SchemaTest.php b/tests/phpunit/CRM/Core/I18n/SchemaTest.php index 3eae6703f0..4c1f04c0b5 100644 --- a/tests/phpunit/CRM/Core/I18n/SchemaTest.php +++ b/tests/phpunit/CRM/Core/I18n/SchemaTest.php @@ -106,10 +106,11 @@ class CRM_Core_I18n_SchemaTest extends CiviUnitTestCase { public function testSchemaBuild() { CRM_Core_I18n_Schema::makeMultilingual('en_US'); + $inUseCollation = CRM_Core_BAO_SchemaHandler::getInUseCollation(); $testCreateTable = CRM_Core_DAO::executeQuery("show create table civicrm_price_set", [], TRUE, NULL, FALSE, FALSE); while ($testCreateTable->fetch()) { - $this->assertContains("`title_en_US` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Displayed title for the Price Set.'", $testCreateTable->Create_Table); - $this->assertContains("`help_pre_en_US` text COLLATE utf8_unicode_ci COMMENT 'Description and/or help text to display before fields in form.'", $testCreateTable->Create_Table); + $this->assertContains("`title_en_US` varchar(255) COLLATE {$inUseCollation} NOT NULL COMMENT 'Displayed title for the Price Set.'", $testCreateTable->Create_Table); + $this->assertContains("`help_pre_en_US` text COLLATE {$inUseCollation} COMMENT 'Description and/or help text to display before fields in form.'", $testCreateTable->Create_Table); } } diff --git a/tests/phpunit/api/v3/ReportTemplateTest.php b/tests/phpunit/api/v3/ReportTemplateTest.php index 340d7040d5..5335a8eb53 100644 --- a/tests/phpunit/api/v3/ReportTemplateTest.php +++ b/tests/phpunit/api/v3/ReportTemplateTest.php @@ -492,8 +492,8 @@ class api_v3_ReportTemplateTest extends CiviUnitTestCase { ]); $this->assertEquals(2, $rows['count'], 'Report failed - the sql used to generate the results was ' . print_r($rows['metadata']['sql'], TRUE)); - - $expected = preg_replace('/\s+/', ' ', 'COLLATE utf8_unicode_ci AS + $inUseCollation = CRM_Core_BAO_SchemaHandler::getInUseCollation(); + $expected = preg_replace('/\s+/', ' ', 'COLLATE ' . $inUseCollation . ' AS SELECT SQL_CALC_FOUND_ROWS contact_civireport.id as cid FROM civicrm_contact contact_civireport INNER JOIN civicrm_contribution contribution_civireport USE index (received_date) ON contribution_civireport.contact_id = contact_civireport.id AND contribution_civireport.is_test = 0 AND contribution_civireport.receive_date BETWEEN \'20140701000000\' AND \'20150630235959\' diff --git a/xml/schema/Schema.xml b/xml/schema/Schema.xml index 19def883b4..b7843f4009 100644 --- a/xml/schema/Schema.xml +++ b/xml/schema/Schema.xml @@ -2,8 +2,8 @@ civicrm -utf8 -utf8_unicode_ci +utf8mb4 +utf8mb4_unicode_ci InnoDB Schema for CiviCRM -- 2.25.1