From 003b4269b6a98206e0beee001f1e94f2fb88aab5 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 13 Apr 2016 16:40:07 +1200
Subject: [PATCH] CRM-18404 Rebuild triggers not including all tables

This is an alternate fix to the one proposed here https://github.com/civicrm/civicrm-core/pull/8017 - the test part of itis leveraging tests in the revert-api PR so I have added it into the PR
---
 CRM/Logging/Schema.php               | 19 +++++++------------
 tests/phpunit/api/v3/LoggingTest.php | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php
index 821ecb88f8..436aa8df73 100644
--- a/CRM/Logging/Schema.php
+++ b/CRM/Logging/Schema.php
@@ -467,10 +467,9 @@ AND    (TABLE_NAME LIKE 'log_civicrm_%' $nonStandardTableNameString )
     foreach ($diffs as $table => $cols) {
       $this->fixSchemaDifferencesFor($table, $cols, FALSE);
     }
-
     if ($rebuildTrigger) {
       // invoke the meta trigger creation call
-      CRM_Core_DAO::triggerRebuild($table);
+      CRM_Core_DAO::triggerRebuild(NULL, TRUE);
     }
   }
 
@@ -534,23 +533,19 @@ AND    (TABLE_NAME LIKE 'log_civicrm_%' $nonStandardTableNameString )
    * @return array
    */
   private function columnsOf($table, $force = FALSE) {
-    static $columnsOf = array();
-
-    $from = (substr($table, 0, 4) == 'log_') ? "`{$this->db}`.$table" : $table;
-
-    if (!isset($columnsOf[$table]) || $force) {
-      $errorScope = CRM_Core_TemporaryErrorScope::ignoreException();
+    if ($force || !isset(\Civi::$statics[__CLASS__]['columnsOf'][$table])) {
+      $from = (substr($table, 0, 4) == 'log_') ? "`{$this->db}`.$table" : $table;
+      CRM_Core_TemporaryErrorScope::ignoreException();
       $dao = CRM_Core_DAO::executeQuery("SHOW COLUMNS FROM $from", CRM_Core_DAO::$_nullArray, TRUE, NULL, FALSE, FALSE);
       if (is_a($dao, 'DB_Error')) {
         return array();
       }
-      $columnsOf[$table] = array();
+      \Civi::$statics[__CLASS__]['columnsOf'][$table] = array();
       while ($dao->fetch()) {
-        $columnsOf[$table][] = $dao->Field;
+        \Civi::$statics[__CLASS__]['columnsOf'][$table][] = $dao->Field;
       }
     }
-
-    return $columnsOf[$table];
+    return \Civi::$statics[__CLASS__]['columnsOf'][$table];
   }
 
   /**
diff --git a/tests/phpunit/api/v3/LoggingTest.php b/tests/phpunit/api/v3/LoggingTest.php
index e7ea73c091..2f470bd8f3 100644
--- a/tests/phpunit/api/v3/LoggingTest.php
+++ b/tests/phpunit/api/v3/LoggingTest.php
@@ -146,6 +146,32 @@ class api_v3_LoggingTest extends CiviUnitTestCase {
     $this->checkINNODBLogTableCreated();
   }
 
+  /**
+   * Check that if a field is added then the trigger is updated on refresh.
+   */
+  public function testRebuildTriggerAfterSchemaChange() {
+    $this->callAPISuccess('Setting', 'create', array('logging' => TRUE));
+    $tables = array('civicrm_acl', 'civicrm_website');
+    foreach ($tables as $table) {
+      CRM_Core_DAO::executeQuery("ALTER TABLE $table ADD column temp_col INT(10)");
+    }
+
+    $schema = new CRM_Logging_Schema();
+    $schema->fixSchemaDifferencesForAll(TRUE);
+
+    foreach ($tables as $table) {
+      $dao = CRM_Core_DAO::executeQuery("SHOW columns FROM log_{$table} WHERE Field = 'temp_col'");
+      $dao->fetch(TRUE);
+      $this->assertEquals(1, $dao->N, "Column temp_col not in $table");
+      $dao = CRM_Core_DAO::executeQuery("SHOW TRIGGERS LIKE '{$table}'");
+      while ($dao->fetch()) {
+        $this->assertContains('temp_col', $dao->Statement);
+      }
+    }
+    CRM_Core_DAO::executeQuery("ALTER TABLE civicrm_acl DROP column temp_col");
+    CRM_Core_DAO::executeQuery("ALTER TABLE civicrm_website DROP column temp_col");
+  }
+
   /**
    * Use a hook to declare an INNODB engine for the contact log table.
    *
-- 
2.25.1