Merge branch 'hotfix/392'

Close #392 Fix #391
zendframework · Dec 31, 2019 · 1f83419 · 1f83419
2 parents f76db34 + 8879204
commit 1f83419
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#395](https://github.com/zendframework/zend-db/pull/395) fixes PHP 7.4 compatibility.
 
+- [#392](https://github.com/zendframework/zend-db/pull/392) fixes `MetadataFeature` to work with `TableIdentifier`.
+
 ## 2.10.0 - 2019-02-25
 
 ### Added

diff --git a/src/TableGateway/Feature/MetadataFeature.php b/src/TableGateway/Feature/MetadataFeature.php
@@ -13,6 +13,7 @@
 use Zend\Db\TableGateway\Exception;
 use Zend\Db\Metadata\Object\TableObject;
 use Zend\Db\Metadata\Source\Factory as SourceFactory;
+use Zend\Db\Sql\TableIdentifier;
 
 class MetadataFeature extends AbstractFeature
 {
@@ -47,21 +48,31 @@ public function postInitialize()
         $t = $this->tableGateway;
         $m = $this->metadata;
 
+        $tableGatewayTable = is_array($t->table) ? current($t->table) : $t->table;
+
+        if ($tableGatewayTable instanceof TableIdentifier) {
+            $table = $tableGatewayTable->getTable();
+            $schema = $tableGatewayTable->getSchema();
+        } else {
+            $table = $tableGatewayTable;
+            $schema = null;
+        }
+
         // get column named
-        $columns = $m->getColumnNames($t->table);
+        $columns = $m->getColumnNames($table, $schema);
         $t->columns = $columns;
 
         // set locally
         $this->sharedData['metadata']['columns'] = $columns;
 
         // process primary key only if table is a table; there are no PK constraints on views
-        if (! ($m->getTable($t->table) instanceof TableObject)) {
+        if (! ($m->getTable($table, $schema) instanceof TableObject)) {
             return;
         }
 
         $pkc = null;
 
-        foreach ($m->getConstraints($t->table) as $constraint) {
+        foreach ($m->getConstraints($table, $schema) as $constraint) {
             /** @var $constraint \Zend\Db\Metadata\Object\ConstraintObject */
             if ($constraint->getType() == 'PRIMARY KEY') {
                 $pkc = $constraint;

diff --git a/test/integration/Adapter/Driver/Pdo/Mysql/TableGatewayTest.php b/test/integration/Adapter/Driver/Pdo/Mysql/TableGatewayTest.php
@@ -3,6 +3,8 @@
 namespace ZendIntegrationTest\Db\Adapter\Driver\Pdo\Mysql;
 
 use PHPUnit\Framework\TestCase;
+use Zend\Db\Sql\TableIdentifier;
+use Zend\Db\TableGateway\Feature\MetadataFeature;
 use Zend\Db\TableGateway\TableGateway;
 
 class TableGatewayTest extends TestCase
@@ -95,4 +97,26 @@ public function testUpdateWithExtendedCharsetFieldName($id)
             $this->assertEquals($row->$key, $value);
         }
     }
+
+    /**
+     * @dataProvider tableProvider
+     * @param string|TableIdentifier|array $table
+     */
+    public function testTableGatewayWithMetadataFeature($table)
+    {
+        $tableGateway = new TableGateway($table, $this->adapter, new MetadataFeature());
+
+        self::assertInstanceOf(TableGateway::class, $tableGateway);
+        self::assertSame($table, $tableGateway->getTable());
+    }
+
+    public function tableProvider()
+    {
+        return [
+            'string'                  => ['test'],
+            'aliased string'          => [['foo' => 'test']],
+            'TableIdentifier'         => [new TableIdentifier('test')],
+            'aliased TableIdentifier' => [['foo' => new TableIdentifier('test')]],
+        ];
+    }
 }