Merge branch 'main' into format

nickgerrets · Mar 11, 2024 · f712097 · f712097
2 parents 0ff11e7 + 24e0ada
commit f712097
Show file tree

Hide file tree

Showing 1,085 changed files with 119,070 additions and 32,917 deletions.
diff --git a/.github/actions/build_extensions/action.yml b/.github/actions/build_extensions/action.yml
@@ -116,6 +116,17 @@ runs:
         ls -al
         pwd
 
+    - name: Fix for MSVC issue (see e.g. https://github.com/TileDB-Inc/TileDB/pull/4759)
+      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
+      run: |
+        mkdir overlay_triplets
+        cp $OVERLAY_TRIPLET_SRC $OVERLAY_TRIPLET_DST
+        echo "set(VCPKG_PLATFORM_TOOLSET_VERSION "14.38")" >> $OVERLAY_TRIPLET_DST
+
     - name: Set Openssl dir
       if: inputs.openssl_path != ''
       shell: bash
@@ -144,6 +155,7 @@ runs:
         GEN: ${{ inputs.ninja == 1 && 'ninja' || '' }}
         USE_MERGED_VCPKG_MANIFEST: 1
         DUCKDB_PLATFORM: ${{ inputs.duckdb_arch }}
+        VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/overlay_triplets"
       run: |
         ls
         mkdir -p ~/.ssh

diff --git a/.github/config/extensions.csv b/.github/config/extensions.csv
@@ -7,11 +7,11 @@ json,,,
 parquet,,,
 tpcds,,,
 tpch,,,
-sqlite_scanner,https://github.com/duckdb/sqlite_scanner,3443b2999ae1e68a108568fd32145705237a5760,
-postgres_scanner,https://github.com/duckdb/postgres_scanner,844f46536b5d5f9e65b57b7ff92f4ce3346e2829,
-substrait,https://github.com/duckdb/substrait,5d621b1d7d16fe86f8b1930870c8e6bf05bcb92a,no-windows
-arrow,https://github.com/duckdb/arrow,1b5b9649d28cd7f79496fb3f2e4dd7b03bf90ac5,no-windows
+sqlite_scanner,https://github.com/duckdb/sqlite_scanner,c1343464ef4397665b858db9c193d33fac591b1c,
+postgres_scanner,https://github.com/duckdb/postgres_scanner,883a8f1a8a487264855a5166f7df1f46ad386434,
+substrait,https://github.com/duckdb/substrait,e75ba6a9a43d75d8c72ecc38e6f751fd8e3474a0,no-windows
+arrow,https://github.com/duckdb/arrow,9e10240da11f61ea7fbfe3fc9988ffe672ccd40f,no-windows
 aws,https://github.com/duckdb/duckdb_aws,348ae2625de86ab760f80a43eb76e4441cd01354,
 azure,https://github.com/duckdb/duckdb_azure,1fe568d3eb3c8842118e395ba8031e2a8566daed,
-spatial,https://github.com/duckdb/duckdb_spatial,b9a517f344988658aef57210f3d99c0aef2450f2,
+spatial,https://github.com/duckdb/duckdb_spatial,b9cd1904a2d243b9937294ae94d4c38e7ad289f4,
 iceberg,https://github.com/duckdb/duckdb_iceberg,51ba9564859698c29db4165f17143a2f6af2bb18,
diff --git a/.github/config/out_of_tree_extensions.cmake b/.github/config/out_of_tree_extensions.cmake
@@ -10,8 +10,7 @@ if (NOT WIN32)
     duckdb_extension_load(arrow
             LOAD_TESTS DONT_LINK
             GIT_URL https://github.com/duckdb/arrow
-            GIT_TAG 1b5b9649d28cd7f79496fb3f2e4dd7b03bf90ac5
-            APPLY_PATCHES
+            GIT_TAG 9e10240da11f61ea7fbfe3fc9988ffe672ccd40f
             )
 endif()
 
@@ -20,7 +19,7 @@ if (NOT MINGW)
     duckdb_extension_load(aws
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb_aws
-            GIT_TAG af729d027e57175c5496a2d7dfef68833e6d6cd3
+            GIT_TAG 043890c2ad83c4a1375417e2d5d085a33f79a217
             )
 endif()
 
@@ -29,7 +28,7 @@ if (NOT MINGW)
     duckdb_extension_load(azure
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb_azure
-            GIT_TAG 10d4cf6a0ed00ea8aecb9bf1433fdfff166e6c44
+            GIT_TAG 3ad0348334d2a263e5f19ef08fd02311bdae82f3
             )
 endif()
 
@@ -56,8 +55,7 @@ if (NOT MINGW)
     duckdb_extension_load(postgres_scanner
             DONT_LINK
             GIT_URL https://github.com/duckdb/postgres_scanner
-            GIT_TAG ce22bc41da1b876a8d541e013251712cae886ea8
-            APPLY_PATCHES
+            GIT_TAG 883a8f1a8a487264855a5166f7df1f46ad386434
             )
 endif()
 
@@ -66,10 +64,9 @@ if (NOT MINGW)
     duckdb_extension_load(spatial
             DONT_LINK LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb_spatial.git
-            GIT_TAG b9a517f344988658aef57210f3d99c0aef2450f2
+            GIT_TAG b9cd1904a2d243b9937294ae94d4c38e7ad289f4
             INCLUDE_DIR spatial/include
             TEST_DIR test/sql
-            APPLY_PATCHES
             )
 endif()
 
@@ -84,16 +81,15 @@ endif()
 duckdb_extension_load(sqlite_scanner
         ${STATIC_LINK_SQLITE} LOAD_TESTS
         GIT_URL https://github.com/duckdb/sqlite_scanner
-        GIT_TAG 9b558ed2e933817bff96726fec0868e7411cee65
-        APPLY_PATCHES
+        GIT_TAG c1343464ef4397665b858db9c193d33fac591b1c
         )
 
 ################# SUBSTRAIT
 if (NOT WIN32)
     duckdb_extension_load(substrait
             LOAD_TESTS DONT_LINK
             GIT_URL https://github.com/duckdb/substrait
-            GIT_TAG 52ff1cab21e97053999bfeec83d1da976b94ef57
+            GIT_TAG 870bab8725d1123905296bfb1f35ce737434e0b3
             APPLY_PATCHES
             )
 endif()
diff --git a/.github/patches/extensions/arrow/merged_patch.patch b/.github/patches/extensions/arrow/merged_patch.patch
diff --git a/.github/patches/extensions/postgres_scanner/create_info_refactor.patch b/.github/patches/extensions/postgres_scanner/create_info_refactor.patch
diff --git a/.github/patches/extensions/postgres_scanner/new_attach_param.patch b/.github/patches/extensions/postgres_scanner/new_attach_param.patch
diff --git a/.github/patches/extensions/postgres_scanner/transaction_rework.patch b/.github/patches/extensions/postgres_scanner/transaction_rework.patch