letting database handle default values that are not specified

Author: Malte Riesch

lib/TestDbAcle/Filter/AddDefaultValuesRowFilter.php

@@ -18,9 +18,8 @@ public function filter($tableName, array $row)
         $table = $this->tableList->getTable($tableName);
         foreach ($table->getNonNullableColumns() as $columnName) {
             $column = $table->getColumn($columnName);
-            if (($default = $column->getDefault()) && $this->isRedefineable($row,$columnName)){
-                $row[$columnName] = $default;
-            } elseif ($this->isUndefined($row, $columnName) && !$column->isAutoIncrement()) {
+            if($column->getDefault()){continue;}
+            if ($this->isUndefined($row, $columnName) && !$column->isAutoIncrement()) {
                 $row[$columnName] = $column->generateDefaultNullValue();
             }
         }

tests/Functional/tests/Php5_3/SmokeTest.php

@@ -283,6 +283,44 @@ function test_Setup_Bug_ReplaceModeOverwritesNonNullColumns()
             ");
     }
 
+    /**
+     * @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_2()
+    {
+
+        $this->setupTables("
+            [address]
+            address_id  |address2       |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  |address2       |postcode
+            1           |val 1          |foo1
+            3           |val 2          |foo2
+            1000        |val3           |foo3
+
+            ");
+    }
+
+
     /**
      * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::execute()
      * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::FilterTableStateByPsvCommand() with placeholders
@@ -576,7 +614,36 @@ function test_assertArrayContainsPsv()
 
     }
 
-   
+    /**
+     * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::execute()
+     * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::FilterArrayByPsvCommand()
+     * @covers \TestDbAcle::getDefaultFactories()
+     */
+    function test_StandradDefaults()
+    {
+
+        $this->getPdo()->query('CREATE TEMPORARY TABLE `time_stuff` (
+                                `time_stuff_id` int(11) NOT NULL AUTO_INCREMENT,
+                                `last_updated` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                PRIMARY KEY (`time_stuff_id`)
+                              ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8');
+
+        $this->setupTables("
+            [time_stuff]
+            time_stuff_id    
+            10
+            
+        ");
+
+        $this->assertTableStateContains("
+            [time_stuff]
+            time_stuff_id       |last_updated
+            10                  |NOW
+            
+        ",array('NOW'=>date("Y-m-d")));
+    }
+
+
 }
 
 class ExampleService

tests/TestDbAcle/Filter/AddDefaultValuesRowFilterTest.php

@@ -37,10 +37,9 @@ public function teardown() {
 
     function test_filter_addsNonNullableDefaultValues()
     {
-        $this->assertEquals( array('col4'=>'2012-01-01','col1'=>'1','col9'=>'foo'), $this->filter->filter("my_table", array('col9'=>'','col4'=>'2012-01-01')));
+        $this->assertEquals( array('col4'=>'2012-01-01','col1'=>'1'), $this->filter->filter("my_table", array('col4'=>'2012-01-01')));
+        $this->assertEquals( array('col4'=>'2012-01-01','col1'=>'1','col9'=>''), $this->filter->filter("my_table", array('col9'=>'','col4'=>'2012-01-01')));
         $this->assertEquals( array('col9'=>'moo','col4'=>'2012-01-01','col1'=>'1'), $this->filter->filter("my_table", array('col9'=>'moo','col4'=>'2012-01-01')));
-        
-        
     }
 }