diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-12-05 09:45:31 +0300 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-12-05 09:45:31 +0300 |
| commit | 3980f9eeed4535032c1e563f39adf8efa4520914 (patch) | |
| tree | 991feaebf786ccac07621ce0e447afa00107680a | |
| parent | 5c14cf8e5bff649230f91ef7e90dc3d3dd89f9a9 (diff) | |
Renamed method to have distinct name
| -rw-r--r-- | core/RankingQuery.php | 4 | ||||
| -rw-r--r-- | plugins/Actions/Archiver.php | 4 | ||||
| -rw-r--r-- | plugins/Contents/Archiver.php | 2 | ||||
| -rw-r--r-- | plugins/Events/Archiver.php | 2 | ||||
| -rw-r--r-- | tests/PHPUnit/Unit/RankingQueryTest.php | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/core/RankingQuery.php b/core/RankingQuery.php index f44845f075..cd4f830669 100644 --- a/core/RankingQuery.php +++ b/core/RankingQuery.php @@ -214,7 +214,7 @@ class RankingQuery */ public function execute($innerQuery, $bind = array()) { - $query = $this->generateQuery($innerQuery); + $query = $this->generateRankingQuery($innerQuery); $data = Db::fetchAll($query, $bind); if ($this->columnToMarkExcludedRows !== false) { @@ -268,7 +268,7 @@ class RankingQuery * itself. * @return string The entire ranking query SQL. */ - public function generateQuery($innerQuery) + public function generateRankingQuery($innerQuery) { // +1 to include "Others" $limit = $this->limit + 1; diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index 67408ced64..ab5fea8739 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -254,7 +254,7 @@ class Archiver extends \Piwik\Plugin\Archiver return $this->isSiteSearchEnabled; } - protected function archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, $sprintfField, $rankingQuery = false) + protected function archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, $sprintfField, RankingQuery $rankingQuery = null) { $select = sprintf($select, $sprintfField); @@ -266,7 +266,7 @@ class Archiver extends \Piwik\Plugin\Archiver // apply ranking query if ($rankingQuery) { - $querySql = $rankingQuery->generateQuery($querySql); + $querySql = $rankingQuery->generateRankingQuery($querySql); } // get result diff --git a/plugins/Contents/Archiver.php b/plugins/Contents/Archiver.php index 55668b4c3a..45607bd7b7 100644 --- a/plugins/Contents/Archiver.php +++ b/plugins/Contents/Archiver.php @@ -188,7 +188,7 @@ class Archiver extends \Piwik\Plugin\Archiver // apply ranking query if ($rankingQuery) { - $query['sql'] = $rankingQuery->generateQuery($query['sql']); + $query['sql'] = $rankingQuery->generateRankingQuery($query['sql']); } // get result diff --git a/plugins/Events/Archiver.php b/plugins/Events/Archiver.php index eb33d4899f..b396401de0 100644 --- a/plugins/Events/Archiver.php +++ b/plugins/Events/Archiver.php @@ -189,7 +189,7 @@ class Archiver extends \Piwik\Plugin\Archiver // apply ranking query if ($rankingQuery) { - $query['sql'] = $rankingQuery->generateQuery($query['sql']); + $query['sql'] = $rankingQuery->generateRankingQuery($query['sql']); } // get result diff --git a/tests/PHPUnit/Unit/RankingQueryTest.php b/tests/PHPUnit/Unit/RankingQueryTest.php index 49c24e56be..c242732ee7 100644 --- a/tests/PHPUnit/Unit/RankingQueryTest.php +++ b/tests/PHPUnit/Unit/RankingQueryTest.php @@ -139,7 +139,7 @@ class RankingQueryTest extends \PHPUnit_Framework_TestCase */ private function checkQuery($rankingQuery, $innerQuerySql, $expected) { - $query = $rankingQuery->generateQuery($innerQuerySql); + $query = $rankingQuery->generateRankingQuery($innerQuerySql); $queryNoWhitespace = preg_replace("/\s+/", "", $query); $expectedNoWhitespace = preg_replace("/\s+/", "", $expected); |