From: monishdeb <monish.deb@webaccessglobal.com>
Date: Fri, 15 Jan 2016 14:12:01 +0000 (+0530)
Subject: CRM-17685 fix - CiviCRM DB Syntax Error when enabling logging
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1f4627e9aa92b17d2757b11c96c973a10e545dc2;p=civicrm-core.git

CRM-17685 fix - CiviCRM DB Syntax Error when enabling logging

https://issues.civicrm.org/jira/browse/CRM-17685
---

diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php
index 0861dd4689..52c82160b2 100644
--- a/CRM/Logging/Schema.php
+++ b/CRM/Logging/Schema.php
@@ -567,6 +567,7 @@ WHERE  table_schema IN ('{$this->db}', '{$civiDB}')";
 
     // rewrite the queries into CREATE TABLE queries for log tables:
     $cols = <<<COLS
+            ,
             log_date    TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
             log_conn_id INTEGER,
             log_user_id INTEGER,
@@ -587,7 +588,7 @@ COLS;
     // so there's no need for a default timestamp and therefore we remove such default timestamps
     // also eliminate the NOT NULL constraint, since we always copy and schema can change down the road)
     $query = self::fixTimeStampAndNotNullSQL($query);
-    $query = preg_replace("/^\) /m", "$cols\n) ", $query);
+    $query = preg_replace("/(,*\n*\) )ENGINE/m", "$cols\n) ENGINE", $query);
 
     CRM_Core_DAO::executeQuery($query, CRM_Core_DAO::$_nullArray, TRUE, NULL, FALSE, FALSE);