Merge v1.2.1 into main (#157)

* changes to use 1.2.1 version of duckdb and extension-ci-tools. (#154)

* fix zero column virtual_table handling to check expressions also (#155)

---------

Co-authored-by: Chandra Sanapala <chandra@sundeck.io>

Author: EpsilonPrime

.github/workflows/distribution.yml

@@ -26,8 +26,8 @@ jobs:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: main
-      ci_tools_version: 8262e6fafa6b62a82f9d671d33d311b9b578127e
+      duckdb_version: 8e52ec43959ab363643d63cb78ee214577111da4
+      ci_tools_version: 58970c538d35919db875096460c05806056f4de0
       exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw"
       extension_name: substrait
 
@@ -37,8 +37,8 @@ jobs:
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: main
-      ci_tools_version: 8262e6fafa6b62a82f9d671d33d311b9b578127e
+      duckdb_version: 8e52ec43959ab363643d63cb78ee214577111da4
+      ci_tools_version: 58970c538d35919db875096460c05806056f4de0
       exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw"
       extension_name: substrait
       deploy_latest: true

.github/workflows/main_distribution.yml

@@ -21,8 +21,8 @@ jobs:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: c009b4ea62f9fcf6ffed6aad51c8f1833121bbfb
-      ci_tools_version: 8262e6fafa6b62a82f9d671d33d311b9b578127e
+      duckdb_version: 8e52ec43959ab363643d63cb78ee214577111da4
+      ci_tools_version: 58970c538d35919db875096460c05806056f4de0
       exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw;windows_amd64_rtools"
       extension_name: substrait
 

duckdb

@@ -575,9 +575,13 @@ SubstraitToDuckDB::TransformProjectOp(const substrait::Rel &sop,
 	size_t num_input_columns = 0;
 	if (sop.project().input().rel_type_case() == substrait::Rel::RelTypeCase::kRead) {
 		auto &sget = sop.project().input().read();
-		if (sget.has_virtual_table() && sget.virtual_table().values().empty()) {
-			hasZeroColumnVirtualTable = true;
-			input_rel = GetValueRelationWithSingleBoolColumn();
+		if (sget.has_virtual_table()) {
+			auto virtual_table = sget.virtual_table();
+			if ((virtual_table.values().empty() && virtual_table.expressions().empty()) ||
+			    (virtual_table.expressions().size() > 0 && virtual_table.expressions(0).fields().empty())) {
+				hasZeroColumnVirtualTable = true;
+				input_rel = GetValueRelationWithSingleBoolColumn();
+			}
 		}
 	}
 	if (!hasZeroColumnVirtualTable) {
@@ -900,11 +904,11 @@ shared_ptr<Relation> SubstraitToDuckDB::TransformWriteOp(const substrait::Rel &s
 		case RelationType::PROJECTION_RELATION: {
 			auto project = std::move(input.get()->Cast<ProjectionRelation>());
 			auto filter = std::move(project.child->Cast<FilterRelation>());
-        	return make_shared_ptr<DeleteRelation>(filter.context, std::move(filter.condition), catalog_name, schema_name, table_name);
+        	return make_shared_ptr<DeleteRelation>(filter.context, std::move(filter.condition), schema_name, table_name);
 		}
 		case RelationType::FILTER_RELATION: {
 			auto filter = std::move(input.get()->Cast<FilterRelation>());
-			return make_shared_ptr<DeleteRelation>(filter.context, std::move(filter.condition), catalog_name, schema_name, table_name);
+			return make_shared_ptr<DeleteRelation>(filter.context, std::move(filter.condition), schema_name, table_name);
 		}
 		default:
 			throw NotImplementedException("Unsupported relation type for delete operation");

extension-ci-tools

@@ -658,4 +658,13 @@ TEST_CASE("Test C VirtualTable with bad input Literal", "[substrait-api]") {
 
 	auto json_plan = R"({"version":{"minorNumber":29, "producer":"substrait-go"}, "relations":[{"root":{"input":{"project":{"common":{"direct":{}}, "input":{"read":{"common":{"direct":{}}, "baseSchema":{"struct":{"nullability":"NULLABILITY_REQUIRED"}}, "virtualTable":{"expressions":[{}]}}}, "expressions":[{"literal":{"decimal":{"value":"AQ==", "precision":1}, "nullable":true}}]}}, "names":["?column?"]}}]})";
 	REQUIRE_THROWS(FromSubstraitJSON(con,json_plan));
+}
+
+TEST_CASE("Test C Project with VirtualTable", "[substrait-api]") {
+	DuckDB db(nullptr);
+	Connection con(db);
+
+	auto json_plan = R"({"version":{"minorNumber":29, "producer":"substrait-go darwin/arm64"}, "relations":[{"root":{"input":{"project":{"common":{"emit":{"outputMapping":[2]}}, "input":{"read":{"common":{"direct":{}}, "baseSchema":{"names":["c1", "c2"], "struct":{"types":[{"fp64":{"nullability":"NULLABILITY_NULLABLE"}}, {"fp64":{"nullability":"NULLABILITY_NULLABLE"}}], "nullability":"NULLABILITY_REQUIRED"}}, "virtualTable":{"expressions":[{"fields":[{"literal":{"fp64":1, "nullable":true}}, {"literal":{"fp64":2, "nullable":true}}]}]}}}, "expressions":[{"literal":{"fp64":42}}]}}, "names":["p1"]}}]})";
+	auto result = FromSubstraitJSON(con,json_plan);
+	REQUIRE(CHECK_COLUMN(result, 0, {42}));
 }