Structure: added columns analyze for views

Author: Unlink

src/Database/Structure.php

@@ -167,10 +167,6 @@ public function loadStructure()
 		$structure['tables'] = $driver->getTables();
 
 		foreach ($structure['tables'] as $tablePair) {
-			if ($tablePair['view']) {
-				continue;
-			}
-
 			if (isset($tablePair['fullName'])) {
 				$table = $tablePair['fullName'];
 				$structure['aliases'][strtolower($tablePair['name'])] = strtolower($table);
@@ -179,8 +175,11 @@ public function loadStructure()
 			}
 
 			$structure['columns'][strtolower($table)] = $columns = $driver->getColumns($table);
-			$structure['primary'][strtolower($table)] = $this->analyzePrimaryKey($columns);
-			$this->analyzeForeignKeys($structure, $table);
+
+			if (!$tablePair['view']) {
+				$structure['primary'][strtolower($table)] = $this->analyzePrimaryKey($columns);
+				$this->analyzeForeignKeys($structure, $table);
+			}
 		}
 
 		if (isset($structure['hasMany'])) {

tests/Database/Structure.phpt

@@ -73,6 +73,10 @@ class StructureTestCase extends TestCase
 			['name' => 'book_id', 'primary' => TRUE, 'vendor' => []],
 			['name' => 'tag_id', 'primary' => TRUE, 'vendor' => []],
 		]);
+		$this->driver->shouldReceive('getColumns')->with('books_view')->once()->andReturn([
+			['name' => 'id', 'primary' => FALSE, 'vendor' => []],
+			['name' => 'title', 'primary' => FALSE, 'vendor' => []],
+		]);
 		$this->connection->shouldReceive('getSupplementalDriver')->times(4)->andReturn($this->driver);
 		$this->driver->shouldReceive('getForeignKeys')->with('authors')->once()->andReturn([]);
 		$this->driver->shouldReceive('getForeignKeys')->with('Books')->once()->andReturn([

tests/Database/Table/bugs/view.bug.phpt

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @dataProvider? ../../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/../../connect.inc.php'; // create $connection
+
+Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/../../files/{$driverName}-nette_test1.sql");
+
+$context->query('CREATE VIEW books_view AS SELECT * FROM book');
+
+test(function () use ($context) {
+	$selection = $context->table('books_view')->where('id', 1);
+	Assert::same(1, $selection->count());
+});
+
+test(function () use ($connection) {
+	$driver = $connection->getSupplementalDriver();
+	$columns = $driver->getColumns('books_view');
+	$columnsNames = array_map(function ($item) {
+		return $item['name'];
+	}, $columns);
+	Assert::same(['id', 'author_id', 'translator_id', 'title', 'next_volume'], $columnsNames);
+});
+
+$context->query('DROP VIEW books_view');