From a0a4858e0060082a467cf4463d794860f3bc11d9 Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Thu, 12 Sep 2024 18:55:35 +0000 Subject: [PATCH 1/3] Scratch build of libpqxx at 7.5.3 + patches --- contrib/libpqxx | 2 +- contrib/libpqxx-cmake/CMakeLists.txt | 39 +--------------------------- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/contrib/libpqxx b/contrib/libpqxx index c995193a3a1..36c49cac91b 160000 --- a/contrib/libpqxx +++ b/contrib/libpqxx @@ -1 +1 @@ -Subproject commit c995193a3a14d71f4711f1f421f65a1a1db64640 +Subproject commit 36c49cac91bf22ac6b85952f630ae75ba7883f68 diff --git a/contrib/libpqxx-cmake/CMakeLists.txt b/contrib/libpqxx-cmake/CMakeLists.txt index a3317404f95..c9c4368763b 100644 --- a/contrib/libpqxx-cmake/CMakeLists.txt +++ b/contrib/libpqxx-cmake/CMakeLists.txt @@ -34,44 +34,7 @@ set (SRCS "${LIBRARY_DIR}/src/version.cxx" ) -# Need to explicitly include each header file, because in the directory include/pqxx there are also files -# like just 'array'. So if including the whole directory with `target_include_directories`, it will make -# conflicts with all includes of . -set (HDRS - "${LIBRARY_DIR}/include/pqxx/array.hxx" - "${LIBRARY_DIR}/include/pqxx/params.hxx" - "${LIBRARY_DIR}/include/pqxx/binarystring.hxx" - "${LIBRARY_DIR}/include/pqxx/composite.hxx" - "${LIBRARY_DIR}/include/pqxx/connection.hxx" - "${LIBRARY_DIR}/include/pqxx/cursor.hxx" - "${LIBRARY_DIR}/include/pqxx/dbtransaction.hxx" - "${LIBRARY_DIR}/include/pqxx/errorhandler.hxx" - "${LIBRARY_DIR}/include/pqxx/except.hxx" - "${LIBRARY_DIR}/include/pqxx/field.hxx" - "${LIBRARY_DIR}/include/pqxx/isolation.hxx" - "${LIBRARY_DIR}/include/pqxx/largeobject.hxx" - "${LIBRARY_DIR}/include/pqxx/nontransaction.hxx" - "${LIBRARY_DIR}/include/pqxx/notification.hxx" - "${LIBRARY_DIR}/include/pqxx/pipeline.hxx" - "${LIBRARY_DIR}/include/pqxx/prepared_statement.hxx" - "${LIBRARY_DIR}/include/pqxx/result.hxx" - "${LIBRARY_DIR}/include/pqxx/robusttransaction.hxx" - "${LIBRARY_DIR}/include/pqxx/row.hxx" - "${LIBRARY_DIR}/include/pqxx/separated_list.hxx" - "${LIBRARY_DIR}/include/pqxx/strconv.hxx" - "${LIBRARY_DIR}/include/pqxx/stream_from.hxx" - "${LIBRARY_DIR}/include/pqxx/stream_to.hxx" - "${LIBRARY_DIR}/include/pqxx/subtransaction.hxx" - "${LIBRARY_DIR}/include/pqxx/transaction.hxx" - "${LIBRARY_DIR}/include/pqxx/transaction_base.hxx" - "${LIBRARY_DIR}/include/pqxx/types.hxx" - "${LIBRARY_DIR}/include/pqxx/util.hxx" - "${LIBRARY_DIR}/include/pqxx/version.hxx" - "${LIBRARY_DIR}/include/pqxx/zview.hxx" -) - -add_library(_libpqxx ${SRCS} ${HDRS}) - +add_library(_libpqxx ${SRCS}) target_link_libraries(_libpqxx PUBLIC ch_contrib::libpq) target_include_directories (_libpqxx SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include") From 5a34b9f24ec5d2a04a9693ac2b392e81cc702d04 Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Thu, 12 Sep 2024 19:04:04 +0000 Subject: [PATCH 2/3] Bump to 7.6.1 --- contrib/libpqxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libpqxx b/contrib/libpqxx index 36c49cac91b..12b5c232c4e 160000 --- a/contrib/libpqxx +++ b/contrib/libpqxx @@ -1 +1 @@ -Subproject commit 36c49cac91bf22ac6b85952f630ae75ba7883f68 +Subproject commit 12b5c232c4e046da3dd70ae23bdd20983ccaa137 From aab0d3dd9ea4290f955946a806fe2fd7c4f21f02 Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Thu, 12 Sep 2024 19:24:27 +0000 Subject: [PATCH 3/3] Bump to 7.7.5 --- contrib/libpqxx | 2 +- contrib/libpqxx-cmake/CMakeLists.txt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/contrib/libpqxx b/contrib/libpqxx index 12b5c232c4e..41e4c331564 160000 --- a/contrib/libpqxx +++ b/contrib/libpqxx @@ -1 +1 @@ -Subproject commit 12b5c232c4e046da3dd70ae23bdd20983ccaa137 +Subproject commit 41e4c331564167cca97ad6eccbd5b8879c2ca044 diff --git a/contrib/libpqxx-cmake/CMakeLists.txt b/contrib/libpqxx-cmake/CMakeLists.txt index c9c4368763b..fbee4d0a94e 100644 --- a/contrib/libpqxx-cmake/CMakeLists.txt +++ b/contrib/libpqxx-cmake/CMakeLists.txt @@ -8,9 +8,9 @@ endif() set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpqxx") set (SRCS - "${LIBRARY_DIR}/src/strconv.cxx" "${LIBRARY_DIR}/src/array.cxx" "${LIBRARY_DIR}/src/binarystring.cxx" + "${LIBRARY_DIR}/src/blob.cxx" "${LIBRARY_DIR}/src/connection.cxx" "${LIBRARY_DIR}/src/cursor.cxx" "${LIBRARY_DIR}/src/encodings.cxx" @@ -19,19 +19,22 @@ set (SRCS "${LIBRARY_DIR}/src/field.cxx" "${LIBRARY_DIR}/src/largeobject.cxx" "${LIBRARY_DIR}/src/notification.cxx" + "${LIBRARY_DIR}/src/params.cxx" "${LIBRARY_DIR}/src/pipeline.cxx" "${LIBRARY_DIR}/src/result.cxx" "${LIBRARY_DIR}/src/robusttransaction.cxx" + "${LIBRARY_DIR}/src/row.cxx" "${LIBRARY_DIR}/src/sql_cursor.cxx" + "${LIBRARY_DIR}/src/strconv.cxx" "${LIBRARY_DIR}/src/stream_from.cxx" "${LIBRARY_DIR}/src/stream_to.cxx" "${LIBRARY_DIR}/src/subtransaction.cxx" + "${LIBRARY_DIR}/src/time.cxx" "${LIBRARY_DIR}/src/transaction.cxx" "${LIBRARY_DIR}/src/transaction_base.cxx" - "${LIBRARY_DIR}/src/row.cxx" - "${LIBRARY_DIR}/src/params.cxx" "${LIBRARY_DIR}/src/util.cxx" "${LIBRARY_DIR}/src/version.cxx" + "${LIBRARY_DIR}/src/wait.cxx" ) add_library(_libpqxx ${SRCS})