Skip to content

fix patch libpq with postgresql version 17 and later #1038

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix patch libpq with postgresql version 17 and later #1038

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
9580799
fix patch libpq with postgresql version 17 and later
RayeS2070 Sep 17, 2025
90ebbea
restore pg_portal_funcs.c
RayeS2070 Sep 17, 2025
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
7 changes: 7 additions & 0 deletions postgresql/libpq-version-generator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@ project(userver-impl-libpq-version-generator)

add_executable(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp")
target_link_libraries(${PROJECT_NAME} PRIVATE userver-libpq)

option(USERVER_FORCE_PG17_LIGPQ_PATCH OFF)
if (${USERVER_FORCE_PG17_LIGPQ_PATCH})
target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/fix_pg17.c")
target_link_libraries(${PROJECT_NAME} INTERFACE ssl crypto)
endif()

13 changes: 13 additions & 0 deletions postgresql/libpq-version-generator/fix_pg17.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// hi from postgresql

extern const char * pg_encoding_to_char_private(int);

const char * pg_encoding_to_char(int encode){
return pg_encoding_to_char_private(encode);
}

extern int pg_char_to_encoding_private(const char *name);

int pg_char_to_encoding(const char *name){
return pg_char_to_encoding_private(name);
}
7 changes: 6 additions & 1 deletion postgresql/pq-extra/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ include(SetupPostgresqlDeps)

set(PQ_EXTRA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/pq_portal_funcs.c ${CMAKE_CURRENT_SOURCE_DIR}/pq_workaround.c)

option(USERVER_FORCE_PG17_LIGPQ_PATCH OFF)
if (${USERVER_FORCE_PG17_LIGPQ_PATCH})
list(APPEND ${PQ_EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/fix_pg17.c)
endif()

add_library(${PROJECT_NAME} STATIC ${PQ_EXTRA_SOURCES})

target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
Expand All @@ -18,7 +23,7 @@ cmake_policy(SET CMP0067 NEW)
try_compile(
COMPILE_RESULT ${CMAKE_CURRENT_BINARY_DIR}/require_pq_extra
SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/check_main.c ${PQ_EXTRA_SOURCES}
LINK_LIBRARIES PostgreSQLInternal
LINK_LIBRARIES PostgreSQLInternal ssl crypto
OUTPUT_VARIABLE COMPILE_OUTPUT
)

Expand Down
13 changes: 13 additions & 0 deletions postgresql/pq-extra/fix_pg17.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// hi from postgresql

extern const char * pg_encoding_to_char_private(int);

const char * pg_encoding_to_char(int encode){
return pg_encoding_to_char_private(encode);
}

extern int pg_char_to_encoding_private(const char *name);

int pg_char_to_encoding(const char *name){
return pg_char_to_encoding_private(name);
}
Loading