From ab00f69d20c86d3818cb1efa2eb06241ea102f7a Mon Sep 17 00:00:00 2001
From: "Donald A. Lobo" <lobo@civicrm.org>
Date: Sun, 24 Mar 2013 19:54:21 -0700
Subject: [PATCH] CRM-12205

---
 CRM/Core/DAO.php                                |  3 ++-
 CRM/Upgrade/Incremental/php/FourThree.php       | 14 +++++++++++++-
 CRM/Upgrade/Incremental/sql/4.3.beta5.mysql.tpl |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 CRM/Upgrade/Incremental/sql/4.3.beta5.mysql.tpl

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 1eb3f9e895..6ba9978780 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -1727,7 +1727,8 @@ SELECT contact_id
     $dao = CRM_Core_DAO::executeQuery("SHOW VARIABLES LIKE '$escapedName'");
     if ($dao->fetch()) {
       return $dao->Value;
-    } else {
+    }
+    else {
       return $default;
     }
   }
diff --git a/CRM/Upgrade/Incremental/php/FourThree.php b/CRM/Upgrade/Incremental/php/FourThree.php
index c1866a363f..5494d103d9 100644
--- a/CRM/Upgrade/Incremental/php/FourThree.php
+++ b/CRM/Upgrade/Incremental/php/FourThree.php
@@ -189,6 +189,7 @@ WHERE    entity_value = '' OR entity_value IS NULL
 
   function upgrade_4_3_beta2($rev) {
     $this->addTask(ts('Upgrade DB to 4.3.beta2: SQL'), 'task_4_3_x_runSql', $rev);
+
     // CRM-12002
     if (
       CRM_Core_DAO::checkTableExists('log_civicrm_line_item') &&
@@ -214,6 +215,17 @@ WHERE    entity_value = '' OR entity_value IS NULL
     $this->addTask(ts('Check/Add indexes for civicrm_entity_financial_trxn'), 'task_4_3_x_checkIndexes', $rev);
   }
 
+  function upgrade_4_3_beta5($rev) {
+    $this->addTask(ts('Upgrade DB to 4.3.beta5: SQL'), 'task_4_3_x_runSql', $rev);
+    // CRM-12205
+    if (
+      CRM_Core_DAO::checkTableExists('log_civicrm_financial_trxn') &&
+      CRM_Core_DAO::checkFieldExists('log_civicrm_financial_trxn', 'trxn_id')
+    ) {
+      CRM_Core_DAO::executeQuery('ALTER TABLE `log_civicrm_financial_trxn` CHANGE `trxn_id` `trxn_id` VARCHAR(255) NULL DEFAULT NULL');
+    }
+  }
+
   //CRM-11636
   function assignFinancialTypeToPriceRecords() {
     $upgrade = new CRM_Upgrade_Form();
@@ -789,7 +801,7 @@ AND TABLE_SCHEMA = '{$dbUf['database']}'";
    * @return bool TRUE for success
    */
   function task_4_3_x_checkIndexes(CRM_Queue_TaskContext $ctx) {
-    $query = "SHOW KEYS FROM  `civicrm_entity_financial_trxn` 
+    $query = "SHOW KEYS FROM  `civicrm_entity_financial_trxn`
 WHERE key_name IN ('UI_entity_financial_trxn_entity_table', 'UI_entity_financial_trxn_entity_id');";
     $dao = CRM_Core_DAO::executeQuery($query);
     if (!$dao->N) {
diff --git a/CRM/Upgrade/Incremental/sql/4.3.beta5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.beta5.mysql.tpl
new file mode 100644
index 0000000000..d6d3a2a105
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/4.3.beta5.mysql.tpl
@@ -0,0 +1 @@
+# empty sql file as a placeholder
\ No newline at end of file
-- 
2.25.1