From fe2da8a2c70a6d978bf13382a02dc02c7a78c900 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 1 Mar 2018 07:23:32 +0300
Subject: [PATCH] Added method rename for StorageView [#CLICKHOUSE-2]

---
 dbms/src/Storages/StorageView.cpp | 15 +++------------
 dbms/src/Storages/StorageView.h   | 14 ++++++--------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/dbms/src/Storages/StorageView.cpp b/dbms/src/Storages/StorageView.cpp
index 4103c4fed3..9351873c75 100644
--- a/dbms/src/Storages/StorageView.cpp
+++ b/dbms/src/Storages/StorageView.cpp
@@ -1,7 +1,5 @@
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Common/typeid_cast.h>
 
 #include <Storages/StorageView.h>
 #include <Storages/StorageFactory.h>
@@ -20,14 +18,9 @@ namespace ErrorCodes
 
 StorageView::StorageView(
     const String & table_name_,
-    const String & database_name_,
     const ASTCreateQuery & query,
-    const NamesAndTypesList & columns_,
-    const NamesAndTypesList & materialized_columns_,
-    const NamesAndTypesList & alias_columns_,
-    const ColumnDefaults & column_defaults_)
-    : IStorage{columns_, materialized_columns_, alias_columns_, column_defaults_}, table_name(table_name_),
-    database_name(database_name_)
+    const NamesAndTypesList & columns_)
+    : IStorage{columns_, {}, {}, {}}, table_name(table_name_)
 {
     if (!query.select)
         throw Exception("SELECT query is not specified for " + getName(), ErrorCodes::INCORRECT_QUERY);
@@ -63,9 +56,7 @@ void registerStorageView(StorageFactory & factory)
         if (args.query.storage)
             throw Exception("Specifying ENGINE is not allowed for a View", ErrorCodes::INCORRECT_QUERY);
 
-        return StorageView::create(
-            args.table_name, args.database_name, args.query, args.columns,
-            args.materialized_columns, args.alias_columns, args.column_defaults);
+        return StorageView::create(args.table_name, args.query, args.columns);
     });
 }
 
diff --git a/dbms/src/Storages/StorageView.h b/dbms/src/Storages/StorageView.h
index 8544202068..6a16e0d16e 100644
--- a/dbms/src/Storages/StorageView.h
+++ b/dbms/src/Storages/StorageView.h
@@ -29,22 +29,20 @@ public:
         size_t max_block_size,
         unsigned num_streams) override;
 
+    void rename(const String & /*new_path_to_db*/, const String & /*new_database_name*/, const String & new_table_name) override
+    {
+        table_name = new_table_name;
+    }
+
 private:
-    String select_database_name;
-    String select_table_name;
     String table_name;
-    String database_name;
     ASTPtr inner_query;
 
 protected:
     StorageView(
         const String & table_name_,
-        const String & database_name_,
         const ASTCreateQuery & query,
-        const NamesAndTypesList & columns_,
-        const NamesAndTypesList & materialized_columns_,
-        const NamesAndTypesList & alias_columns_,
-        const ColumnDefaults & column_defaults_);
+        const NamesAndTypesList & columns_);
 };
 
 }
-- 
GitLab