Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/plugins/Transitions
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2019-10-10 00:36:19 +0300
committerGitHub <noreply@github.com>2019-10-10 00:36:19 +0300
commit42f9f8cbcc350f9cbcd8a085c38f2ae9155c42d3 (patch)
treea9ddfc6e8a98eea2d92dcd03e34c284ecbd37a27 /plugins/Transitions
parente5b034d46ff3a793837944c4f6445c694007ce5f (diff)
Smaller varchar size for log_action.name (#14859)
Diffstat (limited to 'plugins/Transitions')
-rw-r--r--plugins/Transitions/API.php20
-rw-r--r--plugins/Transitions/tests/System/TransitionsTest.php2
-rw-r--r--plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml4
-rw-r--r--plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml2
-rw-r--r--plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml12
-rw-r--r--plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml12
-rw-r--r--plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml4
-rw-r--r--plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml4
-rw-r--r--plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageTitle_day.xml12
-rw-r--r--plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml4
10 files changed, 46 insertions, 30 deletions
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 33c330f999..88bca868ef 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -283,7 +283,15 @@ class API extends \Piwik\Plugin\API
}
$metrics = array(Metrics::INDEX_NB_ACTIONS);
- $data = $logAggregator->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionColumn);
+ $data = $logAggregator->queryActionsByDimension(
+ array($dimension),
+ $where,
+ $selects,
+ $metrics,
+ $rankingQuery,
+ $joinLogActionColumn,
+ $secondaryOrderBy = "`name`"
+ );
$dataTables = $this->makeDataTablesFollowingActions($types, $data);
@@ -418,7 +426,15 @@ class API extends \Piwik\Plugin\API
$joinLogActionOn = $dimension;
}
$metrics = array(Metrics::INDEX_NB_ACTIONS);
- $data = $logAggregator->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionOn);
+ $data = $logAggregator->queryActionsByDimension(
+ array($dimension),
+ $where,
+ $selects,
+ $metrics,
+ $rankingQuery,
+ $joinLogActionOn,
+ $secondaryOrderBy = "`name`"
+ );
$loops = 0;
$nbPageviews = 0;
diff --git a/plugins/Transitions/tests/System/TransitionsTest.php b/plugins/Transitions/tests/System/TransitionsTest.php
index f0e3eaffe9..86251c253e 100644
--- a/plugins/Transitions/tests/System/TransitionsTest.php
+++ b/plugins/Transitions/tests/System/TransitionsTest.php
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\SomeVisitsManyPageviewsWithTransitions;
* @group Plugins
*/
class TransitionsTest extends SystemTestCase
-{
+{
public static $fixture = null; // initialized below class definition
/**
diff --git a/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
index 27a3ba1abe..c55c93b599 100644
--- a/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
+++ b/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
@@ -49,11 +49,11 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>http://www.anothersite.com/to/outlink/page.html</label>
+ <label>http://anothersite.com/to/outlink/page2.html</label>
<referrals>1</referrals>
</row>
<row>
- <label>http://anothersite.com/to/outlink/page2.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
</outlinks>
diff --git a/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml b/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
index a73d7d39dd..13964a9734 100644
--- a/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
+++ b/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
@@ -49,7 +49,7 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>http://www.anothersite.com/to/outlink/page.html</label>
+ <label>http://anothersite.com/to/another/outlink.html</label>
<referrals>1</referrals>
</row>
<row>
diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
index 26c278c975..3441e72fef 100644
--- a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
+++ b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
@@ -21,11 +21,11 @@
</previousPages>
<previousSiteSearches>
<row>
- <label>mykwd</label>
+ <label>anotherkwd</label>
<referrals>1</referrals>
</row>
<row>
- <label>anotherkwd</label>
+ <label>mykwd</label>
<referrals>1</referrals>
</row>
</previousSiteSearches>
@@ -49,11 +49,11 @@
<referrals>2</referrals>
</row>
<row>
- <label>page title - the/third_page.html?foo=baz#anchor2</label>
+ <label>page title - page3.html</label>
<referrals>1</referrals>
</row>
<row>
- <label>page title - page3.html</label>
+ <label>page title - the/third_page.html?foo=baz#anchor2</label>
<referrals>1</referrals>
</row>
</followingPages>
@@ -65,11 +65,11 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>http://www.anothersite.com/to/outlink/page.html</label>
+ <label>http://anothersite.com/to/outlink/page2.html</label>
<referrals>1</referrals>
</row>
<row>
- <label>http://anothersite.com/to/outlink/page2.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
</outlinks>
diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
index caaf8b0db3..f85e1a7544 100644
--- a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
+++ b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
@@ -21,11 +21,11 @@
</previousPages>
<previousSiteSearches>
<row>
- <label>mykwd</label>
+ <label>anotherkwd</label>
<referrals>1</referrals>
</row>
<row>
- <label>anotherkwd</label>
+ <label>mykwd</label>
<referrals>1</referrals>
</row>
<row>
@@ -53,11 +53,11 @@
<referrals>2</referrals>
</row>
<row>
- <label>page title - the/third_page.html?foo=baz#anchor2</label>
+ <label>page title - page3.html</label>
<referrals>1</referrals>
</row>
<row>
- <label>page title - page3.html</label>
+ <label>page title - the/third_page.html?foo=baz#anchor2</label>
<referrals>1</referrals>
</row>
</followingPages>
@@ -69,7 +69,7 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>http://www.anothersite.com/to/outlink/page.html</label>
+ <label>http://anothersite.com/to/another/outlink.html</label>
<referrals>1</referrals>
</row>
<row>
@@ -77,7 +77,7 @@
<referrals>1</referrals>
</row>
<row>
- <label>http://anothersite.com/to/another/outlink.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
</outlinks>
diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
index 9e13a4a0ba..de3d8abf61 100644
--- a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
+++ b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
@@ -53,11 +53,11 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>http://www.anothersite.com/to/outlink/page.html</label>
+ <label>http://anothersite.com/to/outlink/page2.html</label>
<referrals>1</referrals>
</row>
<row>
- <label>http://anothersite.com/to/outlink/page2.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
</outlinks>
diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
index ea8dfddac4..9f154d1c25 100644
--- a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
+++ b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
@@ -53,7 +53,7 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>http://www.anothersite.com/to/outlink/page.html</label>
+ <label>http://anothersite.com/to/another/outlink.html</label>
<referrals>1</referrals>
</row>
<row>
@@ -61,7 +61,7 @@
<referrals>1</referrals>
</row>
<row>
- <label>http://anothersite.com/to/another/outlink.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
</outlinks>
diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageTitle_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageTitle_day.xml
index 26c278c975..3441e72fef 100644
--- a/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageTitle_day.xml
+++ b/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageTitle_day.xml
@@ -21,11 +21,11 @@
</previousPages>
<previousSiteSearches>
<row>
- <label>mykwd</label>
+ <label>anotherkwd</label>
<referrals>1</referrals>
</row>
<row>
- <label>anotherkwd</label>
+ <label>mykwd</label>
<referrals>1</referrals>
</row>
</previousSiteSearches>
@@ -49,11 +49,11 @@
<referrals>2</referrals>
</row>
<row>
- <label>page title - the/third_page.html?foo=baz#anchor2</label>
+ <label>page title - page3.html</label>
<referrals>1</referrals>
</row>
<row>
- <label>page title - page3.html</label>
+ <label>page title - the/third_page.html?foo=baz#anchor2</label>
<referrals>1</referrals>
</row>
</followingPages>
@@ -65,11 +65,11 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>http://www.anothersite.com/to/outlink/page.html</label>
+ <label>http://anothersite.com/to/outlink/page2.html</label>
<referrals>1</referrals>
</row>
<row>
- <label>http://anothersite.com/to/outlink/page2.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
</outlinks>
diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml
index 27a3ba1abe..c55c93b599 100644
--- a/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml
+++ b/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml
@@ -49,11 +49,11 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>http://www.anothersite.com/to/outlink/page.html</label>
+ <label>http://anothersite.com/to/outlink/page2.html</label>
<referrals>1</referrals>
</row>
<row>
- <label>http://anothersite.com/to/outlink/page2.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
</outlinks>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 11:30:36 +0300