From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 25 Apr 2016 22:36:43 +0000 (+1200)
Subject: CRM-18193 logging schema: fix mismatch between comment & code convention
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=08a50e27bfbe5846de8153e5a923264f19d8d519;p=civicrm-core.git

CRM-18193 logging schema: fix mismatch between comment & code convention

Comment suggests 'c_' to identify a non-CRM connection + timestamp to the hour + connection_id but code used 'con_'

I think the shorter version in comment is better as there is more real information space
---

diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php
index 99dcc2d645..402a77df52 100644
--- a/CRM/Logging/Schema.php
+++ b/CRM/Logging/Schema.php
@@ -874,7 +874,7 @@ COLS;
         // We tried setting the @uniqueID in the trigger but it was unreliable.
         // An external interaction could split over 2 connections & it seems worth blocking the revert on
         // these reports & adding extra permissioning to the api for this.
-        $connectionSQLString = "COALESCE(@uniqueID, LEFT(CONCAT('con_', unix_timestamp()/3600, CONNECTION_ID()), 17))";
+        $connectionSQLString = "COALESCE(@uniqueID, LEFT(CONCAT('c_', unix_timestamp()/3600, CONNECTION_ID()), 17))";
       }
       else {
         // The log tables have not yet been converted to have varchar(17) fields for log_conn_id.