Skip to content
Extraits de code Groupes Projets
Valider 2dcb245f rédigé par BeezyT's avatar BeezyT
Parcourir les fichiers

Refs #2633 fixed table prefix in Segment.php unit tests. This should also fix the webtests. 

git-svn-id: http://dev.piwik.org/svn/trunk@5140 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent e1762655
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 20 ajouts et 20 suppressions
tests/core/Segment.test.php
+ 20
− 20
Voir le fichier @ 2dcb245f
...@@ -58,7 +58,7 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -58,7 +58,7 @@ class Test_Piwik_Segment extends UnitTestCase
SELECT SELECT
log_visit.idvisit log_visit.idvisit
FROM FROM
piwiktests_log_visit AS log_visit '.Piwik_Common::prefixTable('log_visit').' AS log_visit
WHERE WHERE
'.$expected['where'], '.$expected['where'],
'bind' => $expected['bind'] 'bind' => $expected['bind']
...@@ -93,7 +93,7 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -93,7 +93,7 @@ class Test_Piwik_Segment extends UnitTestCase
SELECT SELECT
* *
FROM FROM
piwiktests_log_visit AS log_visit ".Piwik_Common::prefixTable('log_visit')." AS log_visit
WHERE WHERE
( idsite = ? ) ( idsite = ? )
AND AND
...@@ -120,8 +120,8 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -120,8 +120,8 @@ class Test_Piwik_Segment extends UnitTestCase
SELECT SELECT
* *
FROM FROM
piwiktests_log_link_visit_action AS log_link_visit_action ".Piwik_Common::prefixTable('log_link_visit_action')." AS log_link_visit_action
LEFT JOIN piwiktests_log_visit AS log_visit ON log_visit.idvisit = log_link_visit_action.idvisit LEFT JOIN ".Piwik_Common::prefixTable('log_visit')." AS log_visit ON log_visit.idvisit = log_link_visit_action.idvisit
WHERE WHERE
( log_link_visit_action.idvisit = ? ) ( log_link_visit_action.idvisit = ? )
AND AND
...@@ -153,8 +153,8 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -153,8 +153,8 @@ class Test_Piwik_Segment extends UnitTestCase
log_visit.visit_total_actions, log_visit.visit_total_actions,
log_visit.visit_total_time log_visit.visit_total_time
FROM FROM
piwiktests_log_visit AS log_visit ".Piwik_Common::prefixTable('log_visit')." AS log_visit
LEFT JOIN piwiktests_log_link_visit_action AS log_link_visit_action ON log_link_visit_action.idvisit = log_visit.idvisit LEFT JOIN ".Piwik_Common::prefixTable('log_link_visit_action')." AS log_link_visit_action ON log_link_visit_action.idvisit = log_visit.idvisit
WHERE WHERE
( log_visit.idvisit = ? ) ( log_visit.idvisit = ? )
AND AND
...@@ -183,8 +183,8 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -183,8 +183,8 @@ class Test_Piwik_Segment extends UnitTestCase
SELECT SELECT
* *
FROM FROM
piwiktests_log_link_visit_action AS log_link_visit_action ".Piwik_Common::prefixTable('log_link_visit_action')." AS log_link_visit_action
LEFT JOIN piwiktests_log_conversion AS log_conversion ON log_conversion.idlink_va = log_link_visit_action.idlink_va AND log_conversion.idsite = log_link_visit_action.idsite LEFT JOIN ".Piwik_Common::prefixTable('log_conversion')." AS log_conversion ON log_conversion.idlink_va = log_link_visit_action.idlink_va AND log_conversion.idsite = log_link_visit_action.idsite
WHERE WHERE
( log_link_visit_action.idvisit = ? ) ( log_link_visit_action.idvisit = ? )
AND AND
...@@ -211,8 +211,8 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -211,8 +211,8 @@ class Test_Piwik_Segment extends UnitTestCase
SELECT SELECT
* *
FROM FROM
piwiktests_log_conversion AS log_conversion ".Piwik_Common::prefixTable('log_conversion')." AS log_conversion
LEFT JOIN piwiktests_log_link_visit_action AS log_link_visit_action ON log_conversion.idlink_va = log_link_visit_action.idlink_va LEFT JOIN ".Piwik_Common::prefixTable('log_link_visit_action')." AS log_link_visit_action ON log_conversion.idlink_va = log_link_visit_action.idlink_va
WHERE WHERE
( log_conversion.idvisit = ? ) ( log_conversion.idvisit = ? )
AND AND
...@@ -243,8 +243,8 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -243,8 +243,8 @@ class Test_Piwik_Segment extends UnitTestCase
SELECT SELECT
log_visit.* log_visit.*
FROM FROM
piwiktests_log_visit AS log_visit ".Piwik_Common::prefixTable('log_visit')." AS log_visit
LEFT JOIN piwiktests_log_conversion AS log_conversion ON log_conversion.idvisit = log_visit.idvisit LEFT JOIN ".Piwik_Common::prefixTable('log_conversion')." AS log_conversion ON log_conversion.idvisit = log_visit.idvisit
WHERE WHERE
( log_visit.idvisit = ? ) ( log_visit.idvisit = ? )
AND AND
...@@ -273,8 +273,8 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -273,8 +273,8 @@ class Test_Piwik_Segment extends UnitTestCase
SELECT SELECT
* *
FROM FROM
piwiktests_log_conversion AS log_conversion ".Piwik_Common::prefixTable('log_conversion')." AS log_conversion
LEFT JOIN piwiktests_log_visit AS log_visit ON log_conversion.idvisit = log_visit.idvisit LEFT JOIN ".Piwik_Common::prefixTable('log_visit')." AS log_visit ON log_conversion.idvisit = log_visit.idvisit
WHERE WHERE
( log_conversion.idvisit = ? ) ( log_conversion.idvisit = ? )
AND AND
...@@ -303,9 +303,9 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -303,9 +303,9 @@ class Test_Piwik_Segment extends UnitTestCase
SELECT SELECT
* *
FROM FROM
piwiktests_log_link_visit_action AS log_link_visit_action ".Piwik_Common::prefixTable('log_link_visit_action')." AS log_link_visit_action
LEFT JOIN piwiktests_log_visit AS log_visit ON log_visit.idvisit = log_link_visit_action.idvisit LEFT JOIN ".Piwik_Common::prefixTable('log_visit')." AS log_visit ON log_visit.idvisit = log_link_visit_action.idvisit
LEFT JOIN piwiktests_log_conversion AS log_conversion ON log_conversion.idlink_va = log_link_visit_action.idlink_va AND log_conversion.idsite = log_link_visit_action.idsite LEFT JOIN ".Piwik_Common::prefixTable('log_conversion')." AS log_conversion ON log_conversion.idlink_va = log_link_visit_action.idlink_va AND log_conversion.idsite = log_link_visit_action.idsite
WHERE WHERE
HOUR(log_visit.visit_last_action_time) = ? AND log_conversion.idgoal = ? ", HOUR(log_visit.visit_last_action_time) = ? AND log_conversion.idgoal = ? ",
"bind" => array(12, 1)); "bind" => array(12, 1));
...@@ -336,9 +336,9 @@ class Test_Piwik_Segment extends UnitTestCase ...@@ -336,9 +336,9 @@ class Test_Piwik_Segment extends UnitTestCase
SELECT SELECT
log_visit.* log_visit.*
FROM FROM
piwiktests_log_visit AS log_visit ".Piwik_Common::prefixTable('log_visit')." AS log_visit
LEFT JOIN piwiktests_log_link_visit_action AS log_link_visit_action ON log_link_visit_action.idvisit = log_visit.idvisit LEFT JOIN ".Piwik_Common::prefixTable('log_link_visit_action')." AS log_link_visit_action ON log_link_visit_action.idvisit = log_visit.idvisit
LEFT JOIN piwiktests_log_conversion AS log_conversion ON log_conversion.idlink_va = log_link_visit_action.idlink_va AND log_conversion.idsite = log_link_visit_action.idsite LEFT JOIN ".Piwik_Common::prefixTable('log_conversion')." AS log_conversion ON log_conversion.idlink_va = log_link_visit_action.idlink_va AND log_conversion.idsite = log_link_visit_action.idsite
WHERE WHERE
log_conversion.idgoal = ? AND HOUR(log_visit.visit_last_action_time) = ? AND log_link_visit_action.custom_var_k1 = ? log_conversion.idgoal = ? AND HOUR(log_visit.visit_last_action_time) = ? AND log_link_visit_action.custom_var_k1 = ?
GROUP BY log_visit.idvisit GROUP BY log_visit.idvisit
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter