Merge branch 'main' into divide

nickgerrets · Jun 5, 2024 · 7af4f3a · 7af4f3a
2 parents 6a7962b + d0616c5
commit 7af4f3a
Show file tree

Hide file tree

Showing 766 changed files with 44,695 additions and 45,273 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -20,11 +20,13 @@ body:
             * [Arrow extension](https://github.com/duckdb/duckdb_arrow/issues/new)
             * [AWS extension](https://github.com/duckdb/duckdb_aws/issues/new)
             * [Azure extension](https://github.com/duckdb/duckdb_azure/issues/new)
+            * [Delta extension](https://github.com/duckdb/duckdb_delta/issues/new)
             * [Iceberg extension](https://github.com/duckdb/duckdb_iceberg/issues/new)
             * [MySQL extension](https://github.com/duckdb/duckdb_mysql/issues/new)
             * [Postgres scanner](https://github.com/duckdb/postgres_scanner/issues/new)
             * [Spatial extension](https://github.com/duckdb/duckdb_spatial/issues/new)
             * [SQLite scanner](https://github.com/duckdb/sqlite_scanner/issues/new)
+            * [VSS extension](https://github.com/duckdb/duckdb_vss/issues/new)
           * Connectors:
             * [dbt-duckdb](https://github.com/duckdb/dbt-duckdb)
 

diff --git a/.github/actions/build_extensions/action.yml b/.github/actions/build_extensions/action.yml
@@ -104,7 +104,7 @@ runs:
       run: |
         echo "VCPKG_TOOLCHAIN_PATH=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" >> $GITHUB_ENV
         echo "VCPKG_TARGET_TRIPLET=${{ inputs.vcpkg_target_triplet }}" >> $GITHUB_ENV
-        
+
     - name: workaround for https://github.com/duckdb/duckdb/issues/8360
       if: inputs.vcpkg_target_triplet == 'x64-windows-static-md'
       shell: bash
@@ -120,12 +120,12 @@ runs:
       shell: bash
       if: inputs.deploy_as == 'windows_amd64'
       env:
-        OVERLAY_TRIPLET_SRC:  ${{ github.workspace }}/vcpkg/triplets/community/x64-windows-static-md.cmake
-        OVERLAY_TRIPLET_DST:  ${{ github.workspace }}/overlay_triplets/x64-windows-static-md.cmake
+        OVERLAY_TRIPLET_SRC: ${{ github.workspace }}/vcpkg/triplets/community/x64-windows-static-md.cmake
+        OVERLAY_TRIPLET_DST: ${{ github.workspace }}/overlay_triplets/x64-windows-static-md.cmake
       run: |
         mkdir overlay_triplets
         cp $OVERLAY_TRIPLET_SRC $OVERLAY_TRIPLET_DST
-        echo "set(VCPKG_PLATFORM_TOOLSET_VERSION "14.38")" >> $OVERLAY_TRIPLET_DST
+        echo "set(VCPKG_PLATFORM_TOOLSET_VERSION "14.39")" >> $OVERLAY_TRIPLET_DST
 
     - name: Set Openssl dir
       if: inputs.openssl_path != ''

diff --git a/.github/config/bundled_extensions.cmake b/.github/config/bundled_extensions.cmake
@@ -20,7 +20,6 @@ duckdb_extension_load(tpch)
 duckdb_extension_load(json)
 duckdb_extension_load(fts)
 duckdb_extension_load(parquet)
-duckdb_extension_load(excel)
 duckdb_extension_load(autocomplete)
 
 #

diff --git a/.github/config/extensions.csv b/.github/config/extensions.csv
@@ -15,4 +15,4 @@ aws,https://github.com/duckdb/duckdb_aws,f7b8729f1cce5ada5d4add70e1486de50763fb9
 azure,https://github.com/duckdb/duckdb_azure,09623777a366572bfb8fa53e47acdf72133a360e,
 spatial,https://github.com/duckdb/duckdb_spatial,8ac803e986ccda34f32dee82a7faae95b72b3492,
 iceberg,https://github.com/duckdb/duckdb_iceberg,d89423c2ff90a0b98a093a133c8dfe2a55b9e092,
-vss,https://github.com/duckdb/duckdb_vss,8145f41d97178e82bed3376215eb8d02bcf1eec5,
+vss,https://github.com/duckdb/duckdb_vss,dbf5b74298384a9dc8e78353e628259b020cd4eb,
diff --git a/.github/config/in_tree_extensions.cmake b/.github/config/in_tree_extensions.cmake
@@ -6,7 +6,6 @@
 #
 
 duckdb_extension_load(autocomplete)
-duckdb_extension_load(excel)
 duckdb_extension_load(fts)
 duckdb_extension_load(httpfs)
 duckdb_extension_load(inet)

diff --git a/.github/config/out_of_tree_extensions.cmake b/.github/config/out_of_tree_extensions.cmake
@@ -20,8 +20,7 @@ if (NOT MINGW)
     duckdb_extension_load(arrow
             LOAD_TESTS DONT_LINK
             GIT_URL https://github.com/duckdb/arrow
-            GIT_TAG 9e10240da11f61ea7fbfe3fc9988ffe672ccd40f
-            APPLY_PATCHES
+            GIT_TAG fa40ec56236953aa5978cf1b4c65ed521424ce69
             )
 endif()
 
@@ -30,8 +29,7 @@ if (NOT MINGW)
     duckdb_extension_load(aws
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb_aws
-            GIT_TAG f7b8729f1cce5ada5d4add70e1486de50763fb97
-            APPLY_PATCHES
+            GIT_TAG 42c78d3f99e1a188a2b178ea59e3c17907af4fb2
             )
 endif()
 
@@ -40,11 +38,18 @@ if (NOT MINGW)
     duckdb_extension_load(azure
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb_azure
-            GIT_TAG 09623777a366572bfb8fa53e47acdf72133a360e
-			APPLY_PATCHES
+            GIT_TAG 49b63dc8cd166952a0a34dfd54e6cfe5b823e05e
             )
 endif()
 
+################# EXCEL
+duckdb_extension_load(excel
+    LOAD_TESTS
+    GIT_URL https://github.com/duckdb/duckdb_excel
+    GIT_TAG 391b36dfdcc1c8c187529376efb4f7ddc9f57261
+    INCLUDE_DIR extension/excel/include
+    )
+
 ################# ICEBERG
 # Windows tests for iceberg currently not working
 if (NOT WIN32)
@@ -57,7 +62,7 @@ if (NOT MINGW)
     duckdb_extension_load(iceberg
             ${LOAD_ICEBERG_TESTS}
             GIT_URL https://github.com/duckdb/duckdb_iceberg
-            GIT_TAG d89423c2ff90a0b98a093a133c8dfe2a55b9e092
+            GIT_TAG fe0471671924ce57308924c79f72efd18103e66b
             )
 endif()
 
@@ -68,16 +73,15 @@ if (NOT MINGW)
     duckdb_extension_load(postgres_scanner
             DONT_LINK
             GIT_URL https://github.com/duckdb/postgres_scanner
-            GIT_TAG 96206f41d5ca7015920a66b54e936c986fe0b0f8
-            APPLY_PATCHES
+            GIT_TAG 120c0b12258d27758e240d61f5dc22a4238a14a6
             )
 endif()
 
 ################# SPATIAL
 duckdb_extension_load(spatial
-    DONT_LINK LOAD_TESTS APPLY_PATCHES
+    DONT_LINK LOAD_TESTS
     GIT_URL https://github.com/duckdb/duckdb_spatial.git
-    GIT_TAG 8ac803e986ccda34f32dee82a7faae95b72b3492
+    GIT_TAG 6826755ec32aea77777b136cc81683fa9be4df7b
     INCLUDE_DIR spatial/include
     TEST_DIR test/sql
     )
@@ -93,26 +97,34 @@ endif()
 duckdb_extension_load(sqlite_scanner
         ${STATIC_LINK_SQLITE} LOAD_TESTS
         GIT_URL https://github.com/duckdb/sqlite_scanner
-        GIT_TAG 091197efb34579c7195afa43dfb5925023c915c0
-        APPLY_PATCHES
+        GIT_TAG 50b7870be099186f195bc72bac5e9e11247ee2f9
         )
 
 ################# SUBSTRAIT
 if (NOT WIN32)
     duckdb_extension_load(substrait
             LOAD_TESTS DONT_LINK
             GIT_URL https://github.com/duckdb/substrait
-            GIT_TAG 1116fb580edd3e26e675436dbdbdf4a0aa5e456e
-            APPLY_PATCHES
+            GIT_TAG 237931391ebc7e6aee7aa81052fa1411f6c4128e
             )
 endif()
 
 
 ################# VSS
 duckdb_extension_load(vss
         LOAD_TESTS
+        DONT_LINK
         GIT_URL https://github.com/duckdb/duckdb_vss
-        GIT_TAG 8145f41d97178e82bed3376215eb8d02bcf1eec5
+        GIT_TAG 690bfc56c82b54f4580dabbc2769e2925db61499
         TEST_DIR test/sql
-        APPLY_PATCHES
     )
+
+################# MYSQL
+if (NOT MINGW)
+    duckdb_extension_load(mysql_scanner
+            DONT_LINK
+            LOAD_TESTS
+            GIT_URL https://github.com/duckdb/duckdb_mysql
+            GIT_TAG 4dd5963cc5f7f04f81a0ea308b104e65791d9975
+            )
+endif()