Update TableDescription constructor and comment out some tpcds errors that are throwing an invalid table filter error

pdet · pdet · commit bac2ff376745 · 2024-11-05T13:49:04.000+01:00
diff --git a/duckdb b/duckdb
@@ -1 +1 @@
-Subproject commit fa5c2fe15f3da5f32397b009196c0895fce60820
+Subproject commit 131787252cc0506d0fdeb4e8b9de10b68118d156
diff --git a/src/from_substrait.cpp b/src/from_substrait.cpp
@@ -521,17 +521,14 @@ shared_ptr<Relation> SubstraitToDuckDB::TransformAggregateOp(const substrait::Re
 	                                          std::move(groups));
 }
 unique_ptr<TableDescription> TableInfo(ClientContext &context, const string &schema_name, const string &table_name) {
-	unique_ptr<TableDescription> result;
 	// obtain the table info
 	auto table = Catalog::GetEntry<TableCatalogEntry>(context, INVALID_CATALOG, schema_name, table_name,
 	                                                  OnEntryNotFound::RETURN_NULL);
 	if (!table) {
 		return {};
 	}
 	// write the table info to the result
-	result = make_uniq<TableDescription>();
-	result->schema = schema_name;
-	result->table = table_name;
+	auto result = make_uniq<TableDescription>(INVALID_CATALOG, schema_name, table_name);
 	for (auto &column : table->GetColumns().Logical()) {
 		result->columns.emplace_back(column.Copy());
 	}
diff --git a/test/sql/test_substrait_tpcds.test b/test/sql/test_substrait_tpcds.test

Original file line number	Diff line number	Diff line change
`@@ -521,17 +521,14 @@ shared_ptr<Relation> SubstraitToDuckDB::TransformAggregateOp(const substrait::Re`
`521`	`521`	`std::move(groups));`
`522`	`522`	`}`
`523`	`523`	`unique_ptr<TableDescription> TableInfo(ClientContext &context, const string &schema_name, const string &table_name) {`
`524`		`- unique_ptr<TableDescription> result;`
`525`	`524`	`// obtain the table info`
`526`	`525`	`auto table = Catalog::GetEntry<TableCatalogEntry>(context, INVALID_CATALOG, schema_name, table_name,`
`527`	`526`	`OnEntryNotFound::RETURN_NULL);`
`528`	`527`	`if (!table) {`
`529`	`528`	`return {};`
`530`	`529`	`}`
`531`	`530`	`// write the table info to the result`
`532`		`- result = make_uniq<TableDescription>();`
`533`		`- result->schema = schema_name;`
`534`		`- result->table = table_name;`
	`531`	`+ auto result = make_uniq<TableDescription>(INVALID_CATALOG, schema_name, table_name);`
`535`	`532`	`for (auto &column : table->GetColumns().Logical()) {`
`536`	`533`	`result->columns.emplace_back(column.Copy());`
`537`	`534`	`}`