fixed issue #10

Author: Malte Riesch

lib/TestDbAcle/Commands/FilterTableStateByPsvCommand.php

@@ -1,17 +1,45 @@
 <?php
 namespace TestDbAcle\Commands;
 
+use TestDbAcle\Db\AbstractPdoFacade;
+use TestDbAcle\Db\AbstractTableFactory;
+use TestDbAcle\Db\Mysql\Pdo\PdoFacade;
+use TestDbAcle\Db\TableList;
+use TestDbAcle\Filter\FilterQueue;
+use TestDbAcle\Psv\PsvParser;
+use TestDbAcle\Psv\Table\Table;
+
 /**
  * @TODO this is currently covered only by the functional tests. 
  */
 class FilterTableStateByPsvCommand implements CommandInterface
 {
+    /**
+     * @var PsvParser $parser
+     */
     protected $parser;
+
+    /**
+     * @var FilterQueue $filterQueue
+     */
     protected $filterQueue;
+
+    /**
+     * @var TableList
+     */
     protected $tableList;
+
+    /** @var  AbstractPdoFacade */
     protected $pdoFacade;
+
+    /**
+     * @var AbstractTableFactory $tableFactory
+     */
     protected $tableFactory;
-    
+
+    /**
+     * @var array $placeHolders
+     */
     protected $placeHolders;
     protected $sourcePsv;
 
@@ -36,7 +64,9 @@ public function execute()
         $this->tableFactory->populateTableList(array_keys($filteredParsedTree->getTables()),$this->tableList);
 
         foreach($filteredParsedTree->getTables() as $table){
+            /** @var Table $table */
             $tableName = $table->getName();
+
             $expectedData[$tableName]=$table->toArray();
 
             if(isset($expectedData[$tableName][0])) {

lib/TestDbAcle/Commands/SetupTablesCommand.php

@@ -1,14 +1,40 @@
 <?php
 namespace TestDbAcle\Commands;
+
+use TestDbAcle\Db\AbstractTableFactory;
+use TestDbAcle\Db\DataInserter\DataInserter;
+use TestDbAcle\Db\TableList;
+use TestDbAcle\Filter\FilterQueue;
+use TestDbAcle\Psv\PsvParser;
+
 /**
  * @TODO this is currently covered only by the functional tests. 
  */
 class SetupTablesCommand implements CommandInterface
 {
+    /**
+     * @var PsvParser
+     */
     protected $parser;
+
+    /**
+     * @var DataInserter
+     */
     protected $dataInserter;
+
+    /**
+     * @var FilterQueue
+     */
     protected $filterQueue;
+
+    /**
+     * @var TableList
+     */
     protected $tableList;
+
+    /**
+     * @var AbstractTableFactory
+     */
     protected $tableFactory;
 
     protected $placeHolders;
@@ -25,7 +51,7 @@ public function execute()
     {
         $parsedTree = $this->parser->parsePsvTree($this->sourcePsv);
         $this->tableFactory->populateTableList(array_keys($parsedTree->getTables()),$this->tableList);
-        return $this->dataInserter->process($this->filterQueue->filterDataTree($parsedTree));
+        $this->dataInserter->process($this->filterQueue->filterDataTree($parsedTree));
     }
 
     public function initialise(\TestDbAcle\ServiceLocator $serviceLocator)

lib/TestDbAcle/Filter/AddDefaultValuesRowFilter.php

@@ -1,7 +1,10 @@
 <?php
 namespace TestDbAcle\Filter;
 
-class AddDefaultValuesRowFilter implements RowFilter {
+use TestDbAcle\Psv\Table\Table;
+
+class AddDefaultValuesRowFilter extends AbstractRowFilter
+{
 
     protected $tableList;
 
@@ -38,6 +41,11 @@ public function getDecorateWithNullPlaceHolders(array $tableRow)
 
 
     }
+
+    public function skip(Table $table)
+    {
+        return $table->getMeta()->isReplaceMode();
+    }
 
 }
 

lib/TestDbAcle/Filter/FilterQueue.php

@@ -2,6 +2,8 @@
 
 namespace TestDbAcle\Filter;
 
+use TestDbAcle\Psv\Table\Table;
+
 class FilterQueue
 {
 
@@ -20,18 +22,22 @@ function filterDataTree(\TestDbAcle\Psv\PsvTree $dataTree)
         return $dataTree;
     }
 
-    protected function filterTable(\TestDbAcle\Filter\RowFilter $filter, $table, array $tableData)
+    protected function filterTable(\TestDbAcle\Filter\RowFilter $filter, Table $table)
     {
+        $tableName = $table->getName();
+        $tableData = $table->toArray();
         foreach ($tableData as $index => $tableRow) {
-            $tableData[$index] = $filter->filter($table, $tableRow);
+            if (!$filter->skip($table)) {
+                $tableData[$index] = $filter->filter($tableName, $tableRow);
+            }
         }
         return $tableData;
     }
 
     protected function applyRowFilter($filter, \TestDbAcle\Psv\PsvTree $dataTree)
     {
         foreach ($dataTree->getTables() as $table) {
-            $table->setData( $this->filterTable($filter, $table->getName(), $table->toArray()));
+            $table->setData( $this->filterTable($filter, $table));
         }
         return $dataTree;
     }

lib/TestDbAcle/Filter/PlaceholderRowFilter.php

@@ -1,7 +1,8 @@
 <?php
 namespace TestDbAcle\Filter;
 
-class PlaceholderRowFilter implements RowFilter {
+class PlaceholderRowFilter extends AbstractRowFilter
+{
 
     protected $replace;
 

lib/TestDbAcle/Filter/RowFilter.php

@@ -1,6 +1,9 @@
 <?php
 
 namespace TestDbAcle\Filter;
+use TestDbAcle\Psv\Table\Table;
+
 interface RowFilter{
     public function filter($tableName, array $row);
+    public function skip(Table $table);
 }

tests/Functional/tests/Php5_3/SmokeTest.php

@@ -245,7 +245,44 @@ function test_SetupAndAssertWithNullColumn()
         $countResult = $this->pdo->query("select count(*) n from address where address2 is NULL")->fetch(\PDO::FETCH_ASSOC);
         $this->assertEquals(1, $countResult['n']);
     }
-    
+
+    /**
+     * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::execute()
+     * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::FilterTableStateByPsvCommand() with placeholders
+     * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::SetAutoIncrementCommand()
+     * @covers \TestDbAcle::getDefaultFactories()
+     *
+     * @link https://github.com/malteriesch/test-db-acle/issues/10
+     */
+
+    function test_Setup_Bug_ReplaceModeOverwritesNonNullColumns()
+    {
+
+        $this->setupTables("
+            [address]
+            address_id  |address1       |postcode
+            1           |val 1          |foo1
+            3           |val 2          |foo2
+            1000        |val3           |foo3
+
+        ");
+
+        $this->setupTables("
+            [address|mode:replace;identifiedBy:address_id]
+            address_id  |address1   
+            3           |val 2 amended       
+        ");
+
+        $this->assertTableStateContains("
+            [address]
+           address_id   |address1           |postcode
+            1           |val 1              |foo1
+            3           |val 2 amended      |foo2
+            1000        |val3               |foo3
+
+            ");
+    }
+
      /**
      * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::execute()
      * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::FilterTableStateByPsvCommand() with placeholders

tests/TestDbAcle/Filter/FilterQueueTest.php

@@ -37,6 +37,8 @@ function test_filterDataTree_withOneRowFilter()
 
 
         $mockRowFilter1 = \Mockery::mock('\TestDbAcle\Filter\RowFilter');
+
+        $mockRowFilter1->shouldReceive('skip')->andReturn(false);
 
         $mockRowFilter1->shouldReceive('filter')->once()->with('user', array("user.row1"))->ordered()
                        ->andReturn(array('user.filtered_filter1_row1'));
@@ -84,11 +86,12 @@ function test_filterDataTree_withTwoRowFilters()
 
         $dataTree->addTable(
                     new \TestDbAcle\Psv\Table\Table('emptyTable'));
-        
-       
-        
+
+
         $mockRowFilter1 = \Mockery::mock('\TestDbAcle\Filter\RowFilter');
-        
+
+        $mockRowFilter1->shouldReceive('skip')->andReturn(false);
+
         $mockRowFilter1->shouldReceive('filter')->once()->with('user', array("user.row1"))->ordered()
                        ->andReturn(array('user.filtered_filter1_row1'));
         $mockRowFilter1->shouldReceive('filter')->once()->with('user', array("user.row2"))->ordered()
@@ -101,6 +104,8 @@ function test_filterDataTree_withTwoRowFilters()
 
         $mockRowFilter2 = \Mockery::mock('\TestDbAcle\Filter\RowFilter');
 
+        $mockRowFilter2->shouldReceive('skip')->andReturn(false);
+
         $mockRowFilter2->shouldReceive('filter')->once()->with('user', array("user.filtered_filter1_row1"))->ordered()
                         ->andReturn(array('user.filtered_filter2_row1'));
         $mockRowFilter2->shouldReceive('filter')->once()->with('user', array("user.filtered_filter1_row2"))->ordered()