From a11bc2caf8edcdd1b30508f3a1d80b3508e83e51 Mon Sep 17 00:00:00 2001
From: Sam Ansmink <samansmink@hotmail.com>
Date: Wed, 14 Feb 2024 12:44:28 +0100
Subject: [PATCH] fixes related to bumping duckdb to v0.10.0

---
 Makefile                        |  1 +
 scripts/start-rest-catalog.sh   | 14 +++++++++-----
 test/sql/iceberg_snapshots.test |  2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b3202da..9d2c2c6 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,7 @@ EXTENSION_FLAGS=\
 -DDUCKDB_EXTENSION_NAMES="iceberg" \
 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_PATH="$(PROJ_DIR)" \
 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_LOAD_TESTS=1 \
+-DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=1 \
 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_INCLUDE_PATH="$(PROJ_DIR)src/include" \
 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_TEST_PATH="$(PROJ_DIR)test/sql"
 
diff --git a/scripts/start-rest-catalog.sh b/scripts/start-rest-catalog.sh
index 393caca..ba8fca8 100755
--- a/scripts/start-rest-catalog.sh
+++ b/scripts/start-rest-catalog.sh
@@ -14,11 +14,15 @@ python3 provision.py
 UNPARTITIONED_TABLE_PATH=$(curl -s http://127.0.0.1:8181/v1/namespaces/default/tables/table_unpartitioned | jq -r '."metadata-location"')
 
 SQL=$(cat <<-END
-SET s3_access_key_id='admin';
-SET s3_secret_access_key='password';
-SET s3_endpoint='127.0.0.1:9000';
-SET s3_url_style='path';
-SET s3_use_ssl=false;
+
+CREATE SECRET (
+  TYPE S3,
+  KEY_ID 'admin',
+  SECRET 'password',
+  ENDPOINT '127.0.0.1:9000',
+  URL_STYLE 'path',
+  USE_SSL 0
+);
 
 SELECT * FROM iceberg_scan('${UNPARTITIONED_TABLE_PATH}');
 END
diff --git a/test/sql/iceberg_snapshots.test b/test/sql/iceberg_snapshots.test
index 943f68b..6b93f12 100644
--- a/test/sql/iceberg_snapshots.test
+++ b/test/sql/iceberg_snapshots.test
@@ -8,6 +8,8 @@ SELECT * FROM ICEBERG_SNAPSHOTS('data/iceberg/lineitem_iceberg');
 ----
 Catalog Error
 
+require notwindows
+
 require iceberg
 
 query IIII