Merge remote-tracking branch 'upstream/main' into chore/add-ext-identifier

Author: hello-world-bfree

.github/config/extensions/avro.cmake

@@ -1,6 +1,6 @@
 if (NOT MINGW)
     duckdb_extension_load(avro
-            LOAD_TESTS DONT_LINK
+            LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb-avro
             GIT_TAG 93da8a19b41eb577add83d0552c6946a16e97c83
             APPLY_PATCHES

.github/config/extensions/ducklake.cmake

@@ -1,6 +1,4 @@
 duckdb_extension_load(ducklake
-    DONT_LINK
-    LOAD_TESTS
     GIT_URL https://github.com/duckdb/ducklake
-    GIT_TAG f45f41aa345f2b9afee5058f0cead72a4d06beb8
+    GIT_TAG 1fb50273e4abfebb6b78cdfe35989b1c66792839
 )

.github/config/extensions/httpfs.cmake

@@ -1,5 +1,5 @@
 duckdb_extension_load(httpfs
     LOAD_TESTS
     GIT_URL https://github.com/duckdb/duckdb-httpfs
-    GIT_TAG add35a03c1adfe530bb4ef69133b94fe8ec8ea35
+    GIT_TAG fdf3d6fccdfd8b9633b59026f7885dda8dc9c444
 )

.github/config/extensions/iceberg.cmake

@@ -8,7 +8,6 @@ if (NOT MINGW AND NOT ${WASM_ENABLED})
     duckdb_extension_load(iceberg
 	    #FIXME: restore autoloading tests ${LOAD_ICEBERG_TESTS}
             GIT_URL https://github.com/duckdb/duckdb-iceberg
-            GIT_TAG b3e54a56436d6385c6820ec6843d3e927431f565
-            APPLY_PATCHES
+            GIT_TAG a7b58bf9f46941ca7f3dc72b349694496a260f16
             )
 endif()

.github/patches/extensions/iceberg/file.patch

@@ -26,7 +26,7 @@ index dfc5e22..07ec473 100644
  class OrderModifier;
  class UpdateSetInfo;
 diff --git a/src/statement_generator.cpp b/src/statement_generator.cpp
-index fc34c7c..5defc4e 100644
+index fc34c7c..61476f2 100644
 --- a/src/statement_generator.cpp
 +++ b/src/statement_generator.cpp
 @@ -373,8 +373,9 @@ unique_ptr<QueryNode> StatementGenerator::GenerateQueryNode() {
@@ -41,6 +41,17 @@ index fc34c7c..5defc4e 100644
  		switch (setop->setop_type) {
  		case SetOperationType::EXCEPT:
  		case SetOperationType::INTERSECT:
+@@ -467,7 +468,9 @@ unique_ptr<TableRef> StatementGenerator::GenerateBaseTableRef() {
+ 	}
+ 	case CatalogType::VIEW_ENTRY: {
+ 		auto &view = entry.Cast<ViewCatalogEntry>();
+-		column_count = view.types.size();
++		view.BindView(context);
++		auto view_columns = view.GetColumnInfo();
++		column_count = view_columns->types.size();
+ 		break;
+ 	}
+ 	default:
 diff --git a/src/statement_simplifier.cpp b/src/statement_simplifier.cpp
 index 2cd7f06..4602928 100644
 --- a/src/statement_simplifier.cpp

.github/patches/extensions/sqlsmith/fix.patch

@@ -467,19 +467,27 @@ jobs:
       if: (success() || failure()) && steps.build.conclusion == 'success'
       shell: bash
       run: |
-        python3 scripts/test_storage_compatibility.py --versions "1.2.1|1.3.2" --new-unittest build/release/test/unittest
+        python3 scripts/test_storage_compatibility.py --versions "1.2.1|1.3.2|1.4.3" --new-unittest build/release/test/unittest
+
 
     # TODO: clean this up: we should probably be able to run this whole test suite with httpfs
     # We want to run the remainder of tests with httpfs
+    - name: Setup vcpkg
+      uses: lukka/run-vcpkg@v11.1
+      with:
+        vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
+
     - name: Build with httpfs extension
       id: build-httpfs
       shell: bash
       if: (success() || failure()) && steps.build.conclusion == 'success'
       env:
         CORE_EXTENSIONS: "json;parquet;icu;tpch;tpcds;httpfs"
         GEN: ninja
+        VCPKG_TOOLCHAIN_PATH: ${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
+        USE_MERGED_VCPKG_MANIFEST: 1
       run:
-        make
+        make clean && make
 
     - name: test/configs/encryption.json
       if: (success() || failure()) && steps.build.conclusion == 'success'

.github/workflows/Main.yml

@@ -534,10 +534,16 @@ bundle-setup:
 	mkdir -p bundle && \
 	cp src/libduckdb_static.a bundle/. && \
 	cp third_party/*/libduckdb_*.a bundle/. && \
-	cp extension/lib*_extension_loader.a bundle/. && \
+	cp extension/libduckdb_generated_extension_loader.a bundle/. && \
 	cp extension/*/lib*_extension.a bundle/. && \
 	mkdir -p vcpkg_installed && \
 	find vcpkg_installed -name '*.a' -exec cp {} bundle/. \; && \
+	mkdir -p _deps && \
+	if [ -f linked_libs.txt ]; then \
+		while IFS= read -r libline || [ -n "$$libline" ]; do \
+			find _deps -path "*/$$libline" -exec cp {} bundle/. \; 2>/dev/null || true; \
+		done < linked_libs.txt; \
+	fi && \
 	cd bundle && \
 	find . -name '*.a' -exec mkdir -p {}.objects \; -exec mv {} {}.objects \; && \
 	find . -name '*.a' -execdir ${AR} -x {} \;
@@ -559,5 +565,5 @@ gather-libs: release
 	mkdir -p libs && \
 	cp src/libduckdb_static.a libs/. && \
 	cp third_party/*/libduckdb_*.a libs/. && \
-	cp extension/lib*_extension_loader.a libs/. && \
+	cp extension/libduckdb_generated_extension_loader.a libs/. && \
 	cp extension/*/lib*_extension.a libs/.

Makefile

@@ -0,0 +1,14 @@
+# name: benchmark/micro/list/list_comprehension_if.benchmark
+# description: List comprehension without tuple indices
+# group: [list]
+
+name List Comprehension with If
+group micro
+subgroup list
+
+load
+CREATE TABLE t AS SELECT range(1, 100) AS values FROM range(1, 10001) t(i);
+
+run
+SELECT [ v * 2 FOR v IN values IF v % 7 = 0 ] FROM t;
+

benchmark/micro/list/list_comprehension_if.benchmark

@@ -9,7 +9,7 @@
 # include generated includes
 include_directories("${PROJECT_BINARY_DIR}/codegen/include/")
 
-add_library(dummy_static_extension_loader
+add_library(dummy_static_extension_loader STATIC
             loader/dummy_static_extension_loader.cpp)
 
 install(
@@ -101,7 +101,7 @@ add_definitions(-DDUCKDB_MAJOR_VERSION=${DUCKDB_MAJOR_VERSION})
 add_definitions(-DDUCKDB_MINOR_VERSION=${DUCKDB_MINOR_VERSION})
 add_definitions(-DDUCKDB_PATCH_VERSION=${DUCKDB_PATCH_VERSION})
 
-add_library(duckdb_generated_extension_loader OBJECT ${GENERATED_CPP_FILE})
+add_library(duckdb_generated_extension_loader STATIC ${GENERATED_CPP_FILE})
 
 set(ALL_OBJECT_FILES
     ${ALL_OBJECT_FILES} $<TARGET_OBJECTS:duckdb_generated_extension_loader>