Merge branch 'Xerkus-hotfix/315'

zendframework · Dec 6, 2018 · d72dd8e · d72dd8e
2 parents ea8a913 + d0a3c9f
commit d72dd8e
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 5 deletions.
diff --git a/src/TableGateway/Feature/MetadataFeature.php b/src/TableGateway/Feature/MetadataFeature.php
@@ -73,11 +73,11 @@ public function postInitialize()
             throw new Exception\RuntimeException('A primary key for this column could not be found in the metadata.');
         }
 
-        $pkck = $pkck->getColumns();
-        if (count($pkc) === 1) {
-            $primaryKey = $pkck[0];
+        $pkcColumns = $pkc->getColumns();
+        if (count($pkcColumns) === 1) {
+            $primaryKey = $pkcColumns[0];
         } else {
-            $primaryKey = $pkc;
+            $primaryKey = $pkcColumns;
         }
 
         $this->sharedData['metadata']['primaryKey'] = $primaryKey;

diff --git a/test/unit/TableGateway/Feature/MetadataFeatureTest.php b/test/unit/TableGateway/Feature/MetadataFeatureTest.php
@@ -10,7 +10,12 @@
 namespace ZendTest\Db\TableGateway\Feature;
 
 use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
+use Zend\Db\Metadata\MetadataInterface;
 use Zend\Db\Metadata\Object\ConstraintObject;
+use Zend\Db\Metadata\Object\TableObject;
+use Zend\Db\Metadata\Object\ViewObject;
+use Zend\Db\TableGateway\AbstractTableGateway;
 use Zend\Db\TableGateway\Feature\MetadataFeature;
 
 class MetadataFeatureTest extends TestCase
@@ -21,7 +26,6 @@ class MetadataFeatureTest extends TestCase
     public function testPostInitialize()
     {
         $tableGatewayMock = $this->getMockForAbstractClass('Zend\Db\TableGateway\AbstractTableGateway');
-
         $metadataMock = $this->getMockBuilder('Zend\Db\Metadata\MetadataInterface')->getMock();
         $metadataMock->expects($this->any())->method('getColumnNames')->will($this->returnValue(['id', 'name']));
 
@@ -37,4 +41,85 @@ public function testPostInitialize()
 
         self::assertEquals(['id', 'name'], $tableGatewayMock->getColumns());
     }
+
+    public function testPostInitializeRecordsPrimaryKeyColumnToSharedMetadata()
+    {
+        /** @var AbstractTableGateway $tableGatewayMock */
+        $tableGatewayMock = $this->getMockForAbstractClass(AbstractTableGateway::class);
+        $metadataMock = $this->getMockBuilder(MetadataInterface::class)->getMock();
+        $metadataMock->expects($this->any())->method('getColumnNames')->will($this->returnValue(['id', 'name']));
+        $metadataMock->expects($this->any())
+            ->method('getTable')
+            ->will($this->returnValue(new TableObject('foo')));
+
+
+        $constraintObject = new ConstraintObject('id_pk', 'table');
+        $constraintObject->setColumns(['id']);
+        $constraintObject->setType('PRIMARY KEY');
+
+        $metadataMock->expects($this->any())->method('getConstraints')->will($this->returnValue([$constraintObject]));
+
+        $feature = new MetadataFeature($metadataMock);
+        $feature->setTableGateway($tableGatewayMock);
+        $feature->postInitialize();
+
+        $r = new ReflectionProperty(MetadataFeature::class, 'sharedData');
+        $r->setAccessible(true);
+        $sharedData = $r->getValue($feature);
+
+        self::assertTrue(
+            isset($sharedData['metadata']['primaryKey']),
+            'Shared data must have metadata entry for primary key'
+        );
+        self::assertSame($sharedData['metadata']['primaryKey'], 'id');
+    }
+
+    public function testPostInitializeRecordsListOfColumnsInPrimaryKeyToSharedMetadata()
+    {
+        /** @var AbstractTableGateway $tableGatewayMock */
+        $tableGatewayMock = $this->getMockForAbstractClass(AbstractTableGateway::class);
+        $metadataMock = $this->getMockBuilder(MetadataInterface::class)->getMock();
+        $metadataMock->expects($this->any())->method('getColumnNames')->will($this->returnValue(['id', 'name']));
+        $metadataMock->expects($this->any())
+            ->method('getTable')
+            ->will($this->returnValue(new TableObject('foo')));
+
+
+        $constraintObject = new ConstraintObject('id_pk', 'table');
+        $constraintObject->setColumns(['composite', 'id']);
+        $constraintObject->setType('PRIMARY KEY');
+
+        $metadataMock->expects($this->any())->method('getConstraints')->will($this->returnValue([$constraintObject]));
+
+        $feature = new MetadataFeature($metadataMock);
+        $feature->setTableGateway($tableGatewayMock);
+        $feature->postInitialize();
+
+        $r = new ReflectionProperty(MetadataFeature::class, 'sharedData');
+        $r->setAccessible(true);
+        $sharedData = $r->getValue($feature);
+
+        self::assertTrue(
+            isset($sharedData['metadata']['primaryKey']),
+            'Shared data must have metadata entry for primary key'
+        );
+        self::assertEquals($sharedData['metadata']['primaryKey'], ['composite', 'id']);
+    }
+
+    public function testPostInitializeSkipsPrimaryKeyCheckIfNotTable()
+    {
+        /** @var AbstractTableGateway $tableGatewayMock */
+        $tableGatewayMock = $this->getMockForAbstractClass(AbstractTableGateway::class);
+        $metadataMock = $this->getMockBuilder(MetadataInterface::class)->getMock();
+        $metadataMock->expects($this->any())->method('getColumnNames')->will($this->returnValue(['id', 'name']));
+        $metadataMock->expects($this->any())
+            ->method('getTable')
+            ->will($this->returnValue(new ViewObject('foo')));
+
+        $metadataMock->expects($this->never())->method('getConstraints');
+
+        $feature = new MetadataFeature($metadataMock);
+        $feature->setTableGateway($tableGatewayMock);
+        $feature->postInitialize();
+    }
 }