Initialize chunk with correct vector types in ALTER TYPE scan (fixes #…

…624)
duckdb · May 5, 2020 · b6a065d · b6a065d
1 parent 289b2ea
commit b6a065d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/storage/data_table.cpp b/src/storage/data_table.cpp
@@ -145,7 +145,7 @@ 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[i]);
+		types.push_back(parent.types[bound_columns[i]]);
 	}
 
 	DataChunk scan_chunk;

diff --git a/test/rigger/test_rigger.cpp b/test/rigger/test_rigger.cpp
@@ -696,11 +696,18 @@ TEST_CASE("Tests found by Rigger", "[rigger]") {
 		REQUIRE(CHECK_COLUMN(result, 1, {Value()}));
 	}
 	SECTION("622") {
+		// UPDATE on altered table results in an error "Could not find node in column segment tree"
 		REQUIRE_NO_FAIL(con.Query("CREATE TABLE t0(c0 TIMESTAMP);"));
 		REQUIRE_NO_FAIL(con.Query("INSERT INTO t0 VALUES(NULL);"));
 		REQUIRE_NO_FAIL(con.Query("DELETE FROM t0;"));
 		REQUIRE_NO_FAIL(con.Query("ALTER TABLE t0 ALTER c0 TYPE DATE;"));
 		REQUIRE_NO_FAIL(con.Query("INSERT INTO t0 VALUES(NULL);"));
 		REQUIRE_NO_FAIL(con.Query("UPDATE t0 SET c0 = '1969-12-18'; "));
 	}
+	SECTION("624") {
+		// ALTER TABLE results in an assertion failure "Assertion `expr.return_type == vector.type' failed"
+		REQUIRE_NO_FAIL(con.Query("CREATE TABLE t0(c0 INT, c1 VARCHAR);"));
+		REQUIRE_NO_FAIL(con.Query("INSERT INTO t0(c1) VALUES(NULL);"));
+		REQUIRE_NO_FAIL(con.Query("ALTER TABLE t0 ALTER c1 TYPE TIMESTAMP;"));
+	}
 }