When no columns are bound in USING clause of ALTER TYPE, bind rowid i…

…nstead (fixes #629)
duckdb · May 5, 2020 · ea6cd82 · ea6cd82
1 parent 5624a82
commit ea6cd82
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/catalog/catalog_entry/table_catalog_entry.cpp b/src/catalog/catalog_entry/table_catalog_entry.cpp
@@ -350,6 +350,9 @@ unique_ptr<CatalogEntry> TableCatalogEntry::ChangeColumnType(ClientContext &cont
 	auto expression = info.expression->Copy();
 	auto bound_expression = expr_binder.Bind(expression);
 	auto bound_create_info = binder.BindCreateTableInfo(move(create_info));
+	if (bound_columns.size() == 0) {
+		bound_columns.push_back(COLUMN_IDENTIFIER_ROW_ID);
+	}
 
 	auto new_storage =
 	    make_shared<DataTable>(context, *storage, change_idx, info.target_type, move(bound_columns), *bound_expression);

diff --git a/src/storage/data_table.cpp b/src/storage/data_table.cpp
@@ -145,7 +145,11 @@ DataTable::DataTable(ClientContext &context, DataTable &parent, idx_t changed_id
 
 	vector<TypeId> types;
 	for (idx_t i = 0; i < bound_columns.size(); i++) {
-		types.push_back(parent.types[bound_columns[i]]);
+		if (bound_columns[i] == COLUMN_IDENTIFIER_ROW_ID) {
+			types.push_back(ROW_TYPE);
+		} else {
+			types.push_back(parent.types[bound_columns[i]]);
+		}
 	}
 
 	DataChunk scan_chunk;