@@ -30,8 +30,10 @@ AlterPlan::AlterPlan(
3030 database_name (database_name),
3131 dropped_columns(dropped_columns),
3232 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));
3537}
3638
3739AlterPlan::AlterPlan (const std::string &database_name,
@@ -85,25 +87,26 @@ AlterPlan::AlterPlan(parser::AlterTableStatement *parse_tree) {
8587 }
8688 columns.emplace_back (column);
8789 }
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));
8992 columns.clear ();
9093 // deal with change column types
9194 for (size_t i = 0 ; i < (*parse_tree->changed_type_columns ).size (); i++) {
9295 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 ) ;
9598 auto column = catalog::Column (
9699 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 ));
99101 if ((*parse_tree->changed_type_columns )[i].get ()->not_null ) {
100102 catalog::Constraint constraint (ConstraintType::NOTNULL,
101103 " con_not_null" );
102104 column.AddConstraint (constraint);
103105 }
104106 columns.emplace_back (column);
105107 }
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));
107110 break ;
108111 }
109112 default :
0 commit comments