Merge branch 'development'

Author: Malte Riesch

lib/TestDbAcle/Psv/PsvParser.php

@@ -105,6 +105,11 @@ public function parsePsv($psvTableContent)
         $psvHeaderLine = $this->extractHeaders($psvRows);
         $headers       = $this->splitByPipe($psvHeaderLine);
 
+        foreach($headers as $index=>$header){
+            
+            $headers[$index] = $this->filterHeader($header);
+        }
+
         $contentTable = array();
 
         foreach ($psvRows as $psvRow) {
@@ -158,6 +163,24 @@ protected function trimArrayElements(array $row)
         }
         return $row;
     }
+   
+    protected function filterHeader($value)
+    {
+        $self = $this;//we need to to do this for PHP 5.3 compatability
+        $filters = array(//@TODO remove duplication 
+            'stripComments' => function(&$value) use($self){
+                if(strpos($value, $self::SYMBOL_COMMENT) !== false && strpos($value, $self::SYMBOL_COMMENT)!==0){
+                    list($valuePart,) = preg_split('/(?<!\\\\)'.$self::SYMBOL_COMMENT.'/', $value);
+                    $value = trim($valuePart);
+                }
+            },
+        );
+            
+        foreach($filters as $filter){
+            $filter($value);
+        }
+        return $value;
+    }
 
     protected function filterColumnValue($value)
     {

lib/TestDbAcle/Psv/Table/Meta.php

@@ -40,7 +40,7 @@ public function isReplaceMode()
 
     public function getIdentifyColumns()
     {
-        return $this->getAttribute('identifiedBy', array());
+        return (array) $this->getAttribute('identifiedBy', array());
     }
 
     public function getTruncateDateColumns()

tests/TestDbAcle/Psv/PsvParserTest.php

@@ -66,6 +66,48 @@ function test_parsePsv_WithEscapedCharacters() {
         $this->assertSame($expectedArray, $psvParser->parsePsv($psvToParse));
     }
 
+    function test_parsePsv_WithNull_AndCommentInLastHeader() {
+
+        $psvParser = new \TestDbAcle\Psv\PsvParser();
+
+        $psvToParse = "
+        id  |first_name  #moo  |last_name    
+        10  |NULL  #nul        |miller       
+        20  |stu               |Smith        
+    	";
+
+        $expectedArray = array(
+            array("id" => "10",
+                "first_name" => NULL,
+                "last_name" => "miller"),
+            array("id" => "20",
+                "first_name" => "stu",
+                "last_name" => "Smith"),
+        );
+        $this->assertSame($expectedArray, $psvParser->parsePsv($psvToParse));
+    }
+    
+    function test_parsePsv_WithNull_AndCommentInHeaders() {
+
+        $psvParser = new \TestDbAcle\Psv\PsvParser();
+
+        $psvToParse = "
+        id  |first_name    |last_name    #comment
+        10  |NULL  #nul    |miller       
+        20  |stu           |Smith        
+    	";
+
+        $expectedArray = array(
+            array("id" => "10",
+                "first_name" => NULL,
+                "last_name" => "miller"),
+            array("id" => "20",
+                "first_name" => "stu",
+                "last_name" => "Smith"),
+        );
+        $this->assertSame($expectedArray, $psvParser->parsePsv($psvToParse));
+    }
+    
     function test_parsePsv_WithNull_AndInlineComment() {
 
         $psvParser = new \TestDbAcle\Psv\PsvParser();

tests/TestDbAcle/Psv/Table/MetaTest.php

@@ -18,6 +18,13 @@ public function test_Replace()
         $this->assertEquals(array('first_name','last_name'), $meta->getIdentifyColumns());
     }
 
+     public function test_Replace_OneIdColumn()
+    {
+        $meta = new \TestDbAcle\Psv\Table\Meta(array( 'mode'=> 'replace', 'identifiedBy' => 'id'));
+        $this->assertTrue($meta->isReplaceMode());
+        $this->assertEquals(array('id'), $meta->getIdentifyColumns());
+    }
+    
     public function test_TruncateDates_none()
     {
         $meta = new \TestDbAcle\Psv\Table\Meta(array());