@@ -30,8 +30,10 @@ AlterPlan::AlterPlan(
30
30
database_name (database_name),
31
31
dropped_columns(dropped_columns),
32
32
type(a_type) {
33
- this ->added_columns = std::unique_ptr<catalog::Schema>(new catalog::Schema (*added_columns));
34
- this ->changed_type_columns = std::unique_ptr<catalog::Schema>(new catalog::Schema (*changed_type_columns));
33
+ this ->added_columns =
34
+ std::unique_ptr<catalog::Schema>(new catalog::Schema (*added_columns));
35
+ this ->changed_type_columns = std::unique_ptr<catalog::Schema>(
36
+ new catalog::Schema (*changed_type_columns));
35
37
}
36
38
37
39
AlterPlan::AlterPlan (const std::string &database_name,
@@ -85,25 +87,26 @@ AlterPlan::AlterPlan(parser::AlterTableStatement *parse_tree) {
85
87
}
86
88
columns.emplace_back (column);
87
89
}
88
- added_columns = std::unique_ptr<catalog::Schema>(new catalog::Schema (columns));
90
+ added_columns =
91
+ std::unique_ptr<catalog::Schema>(new catalog::Schema (columns));
89
92
columns.clear ();
90
93
// deal with change column types
91
94
for (size_t i = 0 ; i < (*parse_tree->changed_type_columns ).size (); i++) {
92
95
auto &tmp = (*parse_tree->changed_type_columns )[i];
93
- type::TypeId val = parser::ColumnDefinition::GetValueType (tmp. get ()-> type );
94
- bool is_inline = (val == type::TypeId::VARCHAR) ? false : true ;
96
+ type::TypeId val =
97
+ parser::ColumnDefinition::GetValueType (tmp. get ()-> type ) ;
95
98
auto column = catalog::Column (
96
99
val, type::Type::GetTypeSize (val),
97
- std::string ((*parse_tree->changed_type_columns )[i].get ()->name ),
98
- is_inline);
100
+ std::string ((*parse_tree->changed_type_columns )[i].get ()->name ));
99
101
if ((*parse_tree->changed_type_columns )[i].get ()->not_null ) {
100
102
catalog::Constraint constraint (ConstraintType::NOTNULL,
101
103
" con_not_null" );
102
104
column.AddConstraint (constraint);
103
105
}
104
106
columns.emplace_back (column);
105
107
}
106
- changed_type_columns = std::unique_ptr<catalog::Schema>(new catalog::Schema (columns));
108
+ changed_type_columns =
109
+ std::unique_ptr<catalog::Schema>(new catalog::Schema (columns));
107
110
break ;
108
111
}
109
112
default :
0 commit comments