From 983950d4ec79cc07c945424d687e72a97b0c979c Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 13 Apr 2020 00:07:11 +0300
Subject: [PATCH] Convert types in Views

---
 src/Storages/StorageView.cpp                           | 10 ++++++++--
 .../queries/0_stateless/01124_view_bad_types.reference | 10 ++++++++++
 .../01124_view_bad_types.sql}                          |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 tests/queries/0_stateless/01124_view_bad_types.reference
 rename tests/queries/{bugs/view_bad_types.sql => 0_stateless/01124_view_bad_types.sql} (84%)

diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 05feeb7d786..78e3c50a879 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -12,13 +12,12 @@
 #include <Storages/StorageView.h>
 #include <Storages/StorageFactory.h>
 
-#include <DataStreams/MaterializingBlockInputStream.h>
-
 #include <Common/typeid_cast.h>
 
 #include <Processors/Pipe.h>
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Transforms/MaterializingTransform.h>
+#include <Processors/Transforms/ConvertingTransform.h>
 
 
 namespace DB
@@ -78,8 +77,15 @@ Pipes StorageView::read(
     /// It's expected that the columns read from storage are not constant.
     /// Because method 'getSampleBlockForColumns' is used to obtain a structure of result in InterpreterSelectQuery.
     for (auto & pipe : pipes)
+    {
         pipe.addSimpleTransform(std::make_shared<MaterializingTransform>(pipe.getHeader()));
 
+        /// And also convert to expected structure.
+        pipe.addSimpleTransform(std::make_shared<ConvertingTransform>(
+            pipe.getHeader(), getSampleBlockForColumns(column_names),
+            ConvertingTransform::MatchColumnsMode::Name, context));
+    }
+
     return pipes;
 }
 
diff --git a/tests/queries/0_stateless/01124_view_bad_types.reference b/tests/queries/0_stateless/01124_view_bad_types.reference
new file mode 100644
index 00000000000..af98bcd6397
--- /dev/null
+++ b/tests/queries/0_stateless/01124_view_bad_types.reference
@@ -0,0 +1,10 @@
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
diff --git a/tests/queries/bugs/view_bad_types.sql b/tests/queries/0_stateless/01124_view_bad_types.sql
similarity index 84%
rename from tests/queries/bugs/view_bad_types.sql
rename to tests/queries/0_stateless/01124_view_bad_types.sql
index 38daabfd6b8..81fc53930c1 100644
--- a/tests/queries/bugs/view_bad_types.sql
+++ b/tests/queries/0_stateless/01124_view_bad_types.sql
@@ -5,7 +5,7 @@ INSERT INTO test.table SELECT * FROM system.numbers LIMIT 10;
 DROP TABLE IF EXISTS test.view;
 CREATE VIEW test.view (x UInt64) AS SELECT * FROM test.table;
 
-SELECT x, any(x) FROM test.view GROUP BY x;
+SELECT x, any(x) FROM test.view GROUP BY x ORDER BY x;
 
 DROP TABLE test.view;
 DROP TABLE test.table;