From 7bb0eb641114c120adcb4b1a0f2307f751d7a893 Mon Sep 17 00:00:00 2001
From: "deb.monish" <monish.deb@jmaconsulting.biz>
Date: Sat, 28 Oct 2017 12:51:56 +0530
Subject: [PATCH] CRM-21363: Revert _supportFullGroupBy usage

---
 tests/phpunit/CRM/Core/DAOTest.php          | 2 +-
 tests/phpunit/CiviTest/CiviUnitTestCase.php | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/tests/phpunit/CRM/Core/DAOTest.php b/tests/phpunit/CRM/Core/DAOTest.php
index b569237928..b381daf215 100644
--- a/tests/phpunit/CRM/Core/DAOTest.php
+++ b/tests/phpunit/CRM/Core/DAOTest.php
@@ -387,7 +387,7 @@ class CRM_Core_DAOTest extends CiviUnitTestCase {
     $sqlModes = CRM_Utils_SQL::getSqlModes();
     // assert we have strict trans
     $this->assertContains('STRICT_TRANS_TABLES', $sqlModes);
-    if ($this->_supportFullGroupBy) {
+    if (CRM_Utils_SQL::supportsFullGroupBy()) {
       $this->assertContains('ONLY_FULL_GROUP_BY', $sqlModes);
     }
   }
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 324bb4ac2e..24922f270f 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -64,11 +64,6 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
    */
   private static $dbInit = FALSE;
 
-  /**
-   * Does the current setup support ONLY_FULL_GROUP_BY mode
-   */
-  protected $_supportFullGroupBy;
-
   /**
    *  Database connection.
    *
@@ -296,8 +291,6 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
     //  Get and save a connection to the database
     $this->_dbconn = $this->getConnection();
 
-    $this->_supportFullGroupBy = CRM_Utils_SQL::supportsFullGroupBy();
-
     // reload database before each test
     //        $this->_populateDB();
 
-- 
2.25.1