[NFC] Regenerate ContributeProduct DAO and also fix search_kit install on MySQL 5...

diff --git a/CRM/Contribute/DAO/ContributionProduct.php b/CRM/Contribute/DAO/ContributionProduct.php
index 4c6063fd491e7697bc0c0a97da6d2d4403fdfe34..010117db25365eb0a8433c2619a6bfdfb50dbb50 100644 (file)
--- 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:641405fdb810dd88fcd6859510a65390)
+ * (GenCodeChecksum:b8b2fd54470db337ec6285ac53bc51b1)
  */
 
 /**

diff --git a/ext/search_kit/sql/auto_install.sql b/ext/search_kit/sql/auto_install.sql
index e6c2463ec5c4c49d0d7768681f82d785786fcf2a..4a4db8ad6c3b9abe348b0349a7c42e41f451c83c 100644 (file)
--- a/ext/search_kit/sql/auto_install.sql
+++ b/ext/search_kit/sql/auto_install.sql
@@ -45,4 +45,4 @@ CREATE TABLE `civicrm_search_display` (
   UNIQUE INDEX `UI_saved_search__id_name`(saved_search_id, name),
   CONSTRAINT FK_civicrm_search_display_saved_search_id FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE CASCADE
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB ROW_FORMAT=DYNAMIC;

diff --git a/xml/templates/dao.tpl b/xml/templates/dao.tpl
index ebfdfb8b5ea5398b2d08abfb0f3e98bd9ff62512..7aacd67d3aa851fec4aa643cfcab7ca8ba68ff5a 100644 (file)
--- a/xml/templates/dao.tpl
+++ b/xml/templates/dao.tpl
@@ -7,7 +7,7 @@
  * {$generated}
  * (GenCodeChecksum:{$genCodeChecksum})
  */
-{$useHelper}
+{if isset($useHelper)}{$useHelper}{/if}
 /**
  * Database access object for the {$table.entity} entity.
  */