From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 19 Jun 2021 22:23:58 +0000 (+0000)
Subject: [NFC] Regenerate ContributeProduct DAO and also fix search_kit install on MySQL 5... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=513ae7e3a5c01fa96e0d930acb600d385969bb93;p=civicrm-core.git

[NFC] Regenerate ContributeProduct DAO and also fix search_kit install on MySQL 5.6 on test boxes
---

diff --git a/CRM/Contribute/DAO/ContributionProduct.php b/CRM/Contribute/DAO/ContributionProduct.php
index 4c6063fd49..010117db25 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:641405fdb810dd88fcd6859510a65390)
+ * (GenCodeChecksum:b8b2fd54470db337ec6285ac53bc51b1)
  */
 
 /**
diff --git a/ext/search_kit/sql/auto_install.sql b/ext/search_kit/sql/auto_install.sql
index e6c2463ec5..4a4db8ad6c 100644
--- 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 ebfdfb8b5e..7aacd67d3a 100644
--- 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.
  */