From 6ae6557bf9427faba90c7fc5ccff2eb8b422f1e1 Mon Sep 17 00:00:00 2001
From: anshuldata <anshul@sundeck.io>
Date: Wed, 13 Nov 2024 22:53:11 +0530
Subject: [PATCH] Fix: Update duckdb to get Latest Relation Definition (#122)

* Update duckdb to get Latest Relation
* Update Workflow definition to use fix commit for duckdb submodule
* Fix extension code required because of update of duckdb

* Exclude "windows_amd64_rtools" from archs
---
 .github/workflows/main_distribution.yml | 6 +++---
 duckdb                                  | 2 +-
 extension-ci-tools                      | 2 +-
 src/to_substrait.cpp                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main_distribution.yml b/.github/workflows/main_distribution.yml
index b821e810..4efc77af 100644
--- a/.github/workflows/main_distribution.yml
+++ b/.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: main
-      ci_tools_version: main
-      exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw"
+      duckdb_version: ca5af32c331f9d5ea49f7158d5c83a47f25b8b79
+      ci_tools_version: 5bdbe4d606d78dbd749f9578ba8ca639feece023
+      exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw;windows_amd64_rtools"
       extension_name: substrait
 
diff --git a/duckdb b/duckdb
index 13178725..ca5af32c 160000
--- a/duckdb
+++ b/duckdb
@@ -1 +1 @@
-Subproject commit 131787252cc0506d0fdeb4e8b9de10b68118d156
+Subproject commit ca5af32c331f9d5ea49f7158d5c83a47f25b8b79
diff --git a/extension-ci-tools b/extension-ci-tools
index 2c849c7a..5bdbe4d6 160000
--- a/extension-ci-tools
+++ b/extension-ci-tools
@@ -1 +1 @@
-Subproject commit 2c849c7a016eaf911d07ecb8eb9f6aed3d602e00
+Subproject commit 5bdbe4d606d78dbd749f9578ba8ca639feece023
diff --git a/src/to_substrait.cpp b/src/to_substrait.cpp
index a466fb21..bd38b19e 100644
--- a/src/to_substrait.cpp
+++ b/src/to_substrait.cpp
@@ -1317,7 +1317,7 @@ substrait::Rel *DuckDBToSubstrait::TransformGet(LogicalOperator &dop) {
 		auto &column_ids = dget.GetColumnIds();
 		for (auto col_idx : dget.projection_ids) {
 			auto struct_item = select->add_struct_items();
-			struct_item->set_field(static_cast<int32_t>(column_ids[col_idx]));
+			struct_item->set_field(static_cast<int32_t>(column_ids[col_idx].GetPrimaryIndex()));
 			// FIXME do we need to set the child? if yes, to what?
 		}
 		projection->set_allocated_select(select);