From ef636b6994847311255c52dc365b809a2a587b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dr=2E=20Patrick=20Urbanke=20=28=E5=8A=89=E8=87=AA=E6=88=90?= =?UTF-8?q?=29?= Date: Mon, 7 Sep 2026 23:23:14 +0200 Subject: [PATCH 1/2] Update vcpkg --- vcpkg | 2 +- vcpkg-configuration.json | 2 +- vcpkg.json | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/vcpkg b/vcpkg index 7213cf81..04a9d8e5 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 7213cf8135c329c37c7e2778e40774489a0583a8 +Subproject commit 04a9d8e5212d01ee1dd9478eadd9caade4f8b0d4 diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index c05bfd1f..63e0f965 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,7 +1,7 @@ { "default-registry": { "kind": "git", - "baseline": "043abf2fa419c288d594a6b96b98a811457bd9b5", + "baseline": "04a9d8e5212d01ee1dd9478eadd9caade4f8b0d4", "repository": "https://github.com/microsoft/vcpkg" }, "registries": [ diff --git a/vcpkg.json b/vcpkg.json index 59aa5c2e..dced4a46 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -13,10 +13,10 @@ "name": "duckdb", "version>=": "1.4.2" }, - { - "name":"icu", - "version>=":"78.1" - } + { + "name": "icu", + "version>=": "78.1" + } ] }, "mysql": { @@ -43,7 +43,9 @@ { "name": "sqlite3", "version>=": "3.49.1", - "features": ["math"] + "features": [ + "math" + ] } ] }, From 66e61d934710138fbaa732bf6372295655a155b2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 14 Sep 2026 21:18:55 +0000 Subject: [PATCH 2/2] Fix Windows MySQL test runtime DLLs Co-authored-by: liuzicheng1987 <19538706+liuzicheng1987@users.noreply.github.com> --- tests/mysql/CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/mysql/CMakeLists.txt b/tests/mysql/CMakeLists.txt index 47396a13..dc76a161 100644 --- a/tests/mysql/CMakeLists.txt +++ b/tests/mysql/CMakeLists.txt @@ -15,5 +15,18 @@ add_custom_command(TARGET sqlgen-mysql-tests POST_BUILD COMMAND_EXPAND_LISTS ) +if (WIN32 AND DEFINED VCPKG_TARGET_TRIPLET) + file(GLOB VCPKG_RUNTIME_DLLS + "${CMAKE_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/bin/*.dll" + ) + + if (VCPKG_RUNTIME_DLLS) + add_custom_command(TARGET sqlgen-mysql-tests POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${VCPKG_RUNTIME_DLLS} $ + COMMAND_EXPAND_LISTS + ) + endif() +endif() + find_package(GTest) gtest_discover_tests(sqlgen-mysql-tests)