Skip to content

Switch to C++17, compile and test fixes #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
staticlibs merged 2 commits into from
Mar 23, 2026
+8 −4
Merged

Switch to C++17, compile and test fixes #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d289aa
Switch to C++17, compile and test fixes
staticlibs Mar 23, 2026
2a0fcf5
Struct vector API change fix
staticlibs Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(JAVA_JVM_LIBRARY NotNeeded)
find_package(JNI)

cmake_minimum_required(VERSION 3.5...3.29)
set(CMAKE_CXX_STANDARD "11" CACHE STRING "C++ standard to enforce")
set(CMAKE_CXX_STANDARD "17" CACHE STRING "C++ standard to enforce")
set(CMAKE_VERBOSE_MAKEFILE OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(JAVA_JVM_LIBRARY NotNeeded)
find_package(JNI)

cmake_minimum_required(VERSION 3.5...3.29)
set(CMAKE_CXX_STANDARD "11" CACHE STRING "C++ standard to enforce")
set(CMAKE_CXX_STANDARD "17" CACHE STRING "C++ standard to enforce")
set(CMAKE_VERBOSE_MAKEFILE OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
Expand Down
5 changes: 4 additions & 1 deletion src/jni/duckdb_java.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ extern "C" {
#include "duckdb/common/arrow/result_arrow_wrapper.hpp"
#include "duckdb/common/operator/cast_operators.hpp"
#include "duckdb/common/shared_ptr.hpp"
#include "duckdb/common/vector/array_vector.hpp"
#include "duckdb/common/vector/list_vector.hpp"
#include "duckdb/common/vector/struct_vector.hpp"
#include "duckdb/function/scalar/variant_utils.hpp"
#include "duckdb/function/table/arrow.hpp"
#include "duckdb/main/appender.hpp"
Expand Down Expand Up @@ -608,7 +611,7 @@ jobject ProcessVector(JNIEnv *env, Connection *conn_ref, Vector &vec, idx_t row_
auto names = env->NewObjectArray(entries.size(), J_String, nullptr);

for (idx_t entry_i = 0; entry_i < entries.size(); entry_i++) {
auto j_vec = ProcessVector(env, conn_ref, *entries[entry_i], row_count);
auto j_vec = ProcessVector(env, conn_ref, entries[entry_i], row_count);
env->SetObjectArrayElement(columns, entry_i, j_vec);
env->SetObjectArrayElement(names, entry_i,
env->NewStringUTF(StructType::GetChildName(vec.GetType(), entry_i).c_str()));
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/duckdb/TestDuckDBJDBC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,8 @@ public static void test_valid_but_local_config_throws_exception() throws Excepti

String message = assertThrows(() -> DriverManager.getConnection(JDBC_URL, info), SQLException.class);

assertTrue(message.contains("Could not set option \"custom_profiling_settings\" as a global option"));
assertTrue(message.contains("Could not set option "));
assertTrue(message.contains(" as a global option"));
}

private static String getSetting(Connection conn, String settingName) throws Exception {
Expand Down
Loading