TableIdentifier schema parameter to allow arrays for use in quoteIdentifierChain to express full object path.

doc/book/sql.md

@@ -151,6 +151,11 @@ $select->from(['t' => 'table']);
 // Using a Sql\TableIdentifier:
 // (same output as above)
 $select->from(['t' => new TableIdentifier('table')]);
+
+// If your database engine requires full path to get to the table object,
+// for example SQL Server uses database name as part of the table name,
+// pass the schema path to the second parameter
+$select->from(new TableIdentifier('table', ['dbo', 'schema']));
 ```
 
 ### columns()

src/Sql/AbstractSql.php

@@ -1,19 +1,17 @@
 <?php
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       http://github.com/zendframework/zend-db for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://github.com/zendframework/zend-db/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Db\Sql;
 
 use Zend\Db\Adapter\Driver\DriverInterface;
 use Zend\Db\Adapter\ParameterContainer;
 use Zend\Db\Adapter\Platform\PlatformInterface;
-use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
 use Zend\Db\Adapter\Platform\Sql92 as DefaultAdapterPlatform;
+use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
 
 abstract class AbstractSql implements SqlInterface
 {
@@ -435,7 +433,7 @@ protected function resolveTable(
         }
 
         if ($schema && $table) {
-            $table = $platform->quoteIdentifier($schema) . $platform->getIdentifierSeparator() . $table;
+            $table = $platform->quoteIdentifierChain($schema) . $platform->getIdentifierSeparator() . $table;
         }
         return $table;
     }

src/Sql/TableIdentifier.php

@@ -1,10 +1,8 @@
 <?php
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       http://github.com/zendframework/zend-db for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://github.com/zendframework/zend-db/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Db\Sql;
@@ -19,13 +17,13 @@ class TableIdentifier
     protected $table;
 
     /**
-     * @var null|string
+     * @var null|string|array
      */
     protected $schema;
 
     /**
-     * @param string      $table
-     * @param null|string $schema
+     * @param string            $table
+     * @param null|string|array $schema
      */
     public function __construct($table, $schema = null)
     {
@@ -45,14 +43,17 @@ public function __construct($table, $schema = null)
         if (null === $schema) {
             $this->schema = null;
         } else {
-            if (! (is_string($schema) || is_callable([$schema, '__toString']))) {
+            if (! (is_string($schema) || is_array($schema) || is_callable([$schema, '__toString']))) {
                 throw new Exception\InvalidArgumentException(sprintf(
-                    '$schema must be a valid schema name, parameter of type %s given',
+                    '$schema must be a valid schema name or path in form of array, parameter of type %s given',
                     is_object($schema) ? get_class($schema) : gettype($schema)
                 ));
             }
 
-            $this->schema = (string) $schema;
+            if (! is_array($schema)) {
+                $schema = (string) $schema;
+            }
+            $this->schema = $schema;
 
             if ('' === $this->schema) {
                 throw new Exception\InvalidArgumentException(

test/Sql/TableIdentifierTest.php

@@ -1,16 +1,16 @@
 <?php
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       http://github.com/zendframework/zend-db for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://github.com/zendframework/zend-db/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Db\Sql;
 
 use stdClass;
+use Zend\Db\Sql\Select;
 use Zend\Db\Sql\TableIdentifier;
+use ZendTest\Db\TestAsset\TrustingSql92Platform;
 
 /**
  * Tests for {@see \Zend\Db\Sql\TableIdentifier}
@@ -88,6 +88,16 @@ public function testRejectsInvalidSchema($invalidSchema)
         new TableIdentifier('foo', $invalidSchema);
     }
 
+    public function testSchemaPath()
+    {
+        $select = new Select(new TableIdentifier('table', ['db', 'schema']));
+
+        $this->assertEquals(
+            'SELECT "db"."schema"."table".* FROM "db"."schema"."table"',
+            $select->getSqlString(new TrustingSql92Platform())
+        );
+    }
+
     /**
      * Data provider
      *
@@ -111,7 +121,6 @@ public function invalidSchemaProvider()
         return [
             [''],
             [new stdClass()],
-            [[]],
         ];
     }
 }