From f38985e2f3efd406301db61c94aceb89a2129d47 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Thu, 27 Oct 2011 21:54:28 +0000
Subject: [PATCH] Refs #2714 Remove idsubtable metadata column from output
being tested since it has different value in build server and local dev
station
git-svn-id: http://dev.piwik.org/svn/trunk@5382 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
core/DataTable/Renderer/Csv.php | 3 +++
...CustomVariables.getCustomVariables_day.csv | Bin 2400 -> 2320 bytes
...CustomVariables.getCustomVariables_day.csv | Bin 3206 -> 3084 bytes
...CustomVariables.getCustomVariables_day.csv | Bin 2400 -> 2320 bytes
...CustomVariables.getCustomVariables_day.csv | Bin 3206 -> 3084 bytes
5 files changed, 3 insertions(+)
diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php
index 9f1f2007db..c613344fa1 100644
--- a/core/DataTable/Renderer/Csv.php
+++ b/core/DataTable/Renderer/Csv.php
@@ -259,6 +259,9 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
$metadata = $row->getMetadata();
foreach($metadata as $name => $value)
{
+ if($name == 'idsubdatatable_in_db') {
+ continue;
+ }
//if a metadata and a column have the same name make sure they dont overwrite
if($this->translateColumnNames)
{
diff --git a/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv b/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv
index da2a5e674dfbc17972d49785f48fe8085f238a7f..10dedec5e4050af832207fa42c20e8ad36554f1b 100644
GIT binary patch
delta 49
zcmaDLG(l)X0n_AlOeH|9HQA5ZYI7I!BF4#jtR0(ouu3pZzQmq4*@+`y@)VA)$qJly
E0Lh{eZU6uP
delta 132
zcmbOr^gw7s0h6r`gD*oWLkUA7LkbXsXe$N<hD;!@n4y#*2`&nfNn*$Ws*MNA<^jnR
zhNQ{)Or?xEKvH`$AF~ys&SrP!#f(6Kmn@w?P9du#6Ohx%o<I2l2g~GN?0#U{i=zWb
JJ22@m000TeA)EjJ
diff --git a/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv
index ecd1db52b42e4f466d0f8f290a79097d78a0c887..8339b5601ce0671da05fe3aa9875bc60b15c4e7e 100644
GIT binary patch
delta 121
zcmZpZ?2*_oi)peQv&7^NOddeG1c<dJ-($9#{D!4(asZp%<~J;h7$;9)OPH*{tuy%;
zx54B$%sP`B*qeaZXLAV08OF&<TxLK?mdR>dB9qIw!r<&@Toyof91uH9KEmxaS%Aj?
Lh=nFc@aO;l1GXn3
delta 222
zcmeB?Xp`J9i^*1p!IvSGp@bokAq9v*v=xH_Lne?{%uvdZ1Q!L#Br)Uw)y4y5^MGUu
zL(=42X35E$m^_$u7>p-pGwV)PVfJFw0g9#q$&1WqS%KmVMnG2oW*t@$#>qn5I+L^5
z%)r9NljpN_0+p>~_nlnA4iPimypmm#2`G4w(;TeG49Jq4EWi~u`5ULgWC>=T$rHHL
hCU4<N0Lz*HjnJL!z#TVv4!03l#BlOiZhIyj1_0pbHXQ%}
diff --git a/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv b/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv
index da2a5e674dfbc17972d49785f48fe8085f238a7f..10dedec5e4050af832207fa42c20e8ad36554f1b 100644
GIT binary patch
delta 49
zcmaDLG(l)X0n_AlOeH|9HQA5ZYI7I!BF4#jtR0(ouu3pZzQmq4*@+`y@)VA)$qJly
E0Lh{eZU6uP
delta 132
zcmbOr^gw7s0h6r`gD*oWLkUA7LkbXsXe$N<hD;!@n4y#*2`&nfNn*$Ws*MNA<^jnR
zhNQ{)Or?xEKvH`$AF~ys&SrP!#f(6Kmn@w?P9du#6Ohx%o<I2l2g~GN?0#U{i=zWb
JJ22@m000TeA)EjJ
diff --git a/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv
index ecd1db52b42e4f466d0f8f290a79097d78a0c887..8339b5601ce0671da05fe3aa9875bc60b15c4e7e 100644
GIT binary patch
delta 121
zcmZpZ?2*_oi)peQv&7^NOddeG1c<dJ-($9#{D!4(asZp%<~J;h7$;9)OPH*{tuy%;
zx54B$%sP`B*qeaZXLAV08OF&<TxLK?mdR>dB9qIw!r<&@Toyof91uH9KEmxaS%Aj?
Lh=nFc@aO;l1GXn3
delta 222
zcmeB?Xp`J9i^*1p!IvSGp@bokAq9v*v=xH_Lne?{%uvdZ1Q!L#Br)Uw)y4y5^MGUu
zL(=42X35E$m^_$u7>p-pGwV)PVfJFw0g9#q$&1WqS%KmVMnG2oW*t@$#>qn5I+L^5
z%)r9NljpN_0+p>~_nlnA4iPimypmm#2`G4w(;TeG49Jq4EWi~u`5ULgWC>=T$rHHL
hCU4<N0Lz*HjnJL!z#TVv4!03l#BlOiZhIyj1_0pbHXQ%}
--
GitLab