CRM-21363: Revert _supportFullGroupBy usage
authordeb.monish <monish.deb@jmaconsulting.biz>
Sat, 28 Oct 2017 07:21:56 +0000 (12:51 +0530)
committerdeb.monish <monish.deb@jmaconsulting.biz>
Sat, 28 Oct 2017 07:21:56 +0000 (12:51 +0530)
tests/phpunit/CRM/Core/DAOTest.php
tests/phpunit/CiviTest/CiviUnitTestCase.php

index b569237928febed099f4512e875ab3321ee5565f..b381daf2157a154ec2fd988b90a990d463102a80 100644 (file)
@@ -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);
     }
   }
index 324bb4ac2ebde36f03463cef41312b3f1fb12381..24922f270fd2694d57ca502c800898ce4ca1dc27 100644 (file)
@@ -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();