From dd6b278823f13e9126aa4fe39669b5f95dc42930 Mon Sep 17 00:00:00 2001
From: Matthieu Aubry <mattab@users.noreply.github.com>
Date: Fri, 30 Dec 2016 14:24:29 +1300
Subject: [PATCH] Revert #11100 (#11113)
* Revert #11100
* Added new field <generationTimeMilliseconds> from #11095
---
core/DataTable/Filter/ColumnDelete.php | 3 ++-
plugins/CustomDimensions | 2 +-
.../Unit/DataTable/Filter/ColumnDeleteTest.php | 14 +++++++-------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/core/DataTable/Filter/ColumnDelete.php b/core/DataTable/Filter/ColumnDelete.php
index 37f0b1bf97..18ba41a4b2 100644
--- a/core/DataTable/Filter/ColumnDelete.php
+++ b/core/DataTable/Filter/ColumnDelete.php
@@ -175,7 +175,8 @@ class ColumnDelete extends BaseFilter
unset($table[$index][$column]);
}
- $this->removeColumnsFromTable($row);
+ // Restore me in Piwik 4
+ //$this->removeColumnsFromTable($row);
}
}
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
index 79dc4a9434..d74be369cc 160000
--- a/plugins/CustomDimensions
+++ b/plugins/CustomDimensions
@@ -1 +1 @@
-Subproject commit 79dc4a9434bc137b75319be7f6f074aa224ac14a
+Subproject commit d74be369cc456fe9a7956dbb1e742588738d4152
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
index 79fe1619cc..773482d603 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
@@ -35,14 +35,14 @@ class ColumnDeleteTest extends \PHPUnit_Framework_TestCase
protected function makeDataTable_withoutVisitsColumn($appendRowWithSubtable = true)
{
$table = new DataTable();
- $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row1', 'arrayColumn' => array('columnWithin' => 10))));
- $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row2', 'arrayColumn' => array('columnWithin' => 11))));
- $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row3', 'arrayColumn' => array('columnWithin' => 12))));
+ $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row1', 'arrayColumn' => array('visits' => 0, 'columnWithin' => 10))));
+ $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row2', 'arrayColumn' => array('visits' => 1, 'columnWithin' => 11))));
+ $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row3', 'arrayColumn' => array('visits' => 2, 'columnWithin' => 12))));
if($appendRowWithSubtable) {
$subTable = $this->makeDataTable_withoutVisitsColumn( $appendRowWithSubtable = false );
$table->addRowFromArray(array(
- Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('columnWithin' => 13)),
+ Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('visits' => 3, 'columnWithin' => 13)),
Row::DATATABLE_ASSOCIATED => $subTable
));
}
@@ -140,9 +140,9 @@ class ColumnDeleteTest extends \PHPUnit_Framework_TestCase
protected function makeArray_withoutVisitsColumns()
{
$array = array(
- array('label' => 'row1', 'arrayColumn' => array( 'columnWithin' => 10)),
- array('label' => 'row2', 'arrayColumn' => array( 'columnWithin' => 11)),
- array('label' => 'row3', 'arrayColumn' => array( 'columnWithin' => 12)),
+ array('label' => 'row1', 'arrayColumn' => array('visits' => 0, 'columnWithin' => 10)),
+ array('label' => 'row2', 'arrayColumn' => array('visits' => 1, 'columnWithin' => 11)),
+ array('label' => 'row3', 'arrayColumn' => array('visits' => 2, 'columnWithin' => 12)),
);
return $array;
}
--
GitLab