From 62b06de97eaca9e88f6843e96ce58b902e04b04b Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Wed, 30 Dec 2020 16:00:05 +0000
Subject: [PATCH] Try fix build

---
 cmake/find/libpqxx.cmake                      | 8 +++++---
 contrib/libpq                                 | 2 +-
 contrib/libpq-cmake/CMakeLists.txt            | 1 +
 src/Databases/PostgreSQL/DatabasePostgreSQL.h | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cmake/find/libpqxx.cmake b/cmake/find/libpqxx.cmake
index 8bfb48a0e54..b641f114d05 100644
--- a/cmake/find/libpqxx.cmake
+++ b/cmake/find/libpqxx.cmake
@@ -18,13 +18,15 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libpq/include")
     return()
 endif()
 
+if (NOT USE_INTERNAL_SSL_LIBRARY)
+    set (USE_LIBPQXX 0)
+    message (STATUS "Using libpqxx=${USE_LIBPQXX}. (Internal ssl library is missing)")
+else ()
 set (USE_LIBPQXX 1)
 set (LIBPQXX_LIBRARY libpqxx)
 set (LIBPQ_LIBRARY libpq)
-
 set (LIBPQXX_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpqxx/include")
 set (LIBPQ_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpq")
-
 message (STATUS "Using libpqxx=${USE_LIBPQXX}: ${LIBPQXX_INCLUDE_DIR} : ${LIBPQXX_LIBRARY}")
 message (STATUS "Using libpq: ${LIBPQ_ROOT_DIR} : ${LIBPQ_INCLUDE_DIR} : ${LIBPQ_LIBRARY}")
-
+endif()
diff --git a/contrib/libpq b/contrib/libpq
index e2d1a14f079..8e7e9058547 160000
--- a/contrib/libpq
+++ b/contrib/libpq
@@ -1 +1 @@
-Subproject commit e2d1a14f079bda7b4bebc203f41355bb433fc145
+Subproject commit 8e7e905854714a7fbb49c124dbc45c7bd4b98e07
diff --git a/contrib/libpq-cmake/CMakeLists.txt b/contrib/libpq-cmake/CMakeLists.txt
index e538e4f4d93..34c57799a8a 100644
--- a/contrib/libpq-cmake/CMakeLists.txt
+++ b/contrib/libpq-cmake/CMakeLists.txt
@@ -46,6 +46,7 @@ set(SRCS
         ${LIBPQ_SOURCE_DIR}/port/pgstrcasecmp.c
         ${LIBPQ_SOURCE_DIR}/port/thread.c
         ${LIBPQ_SOURCE_DIR}/port/path.c
+        ${LIBPQ_SOURCE_DIR}/port/explicit_bzero.c
         )
 
 add_library(libpq ${SRCS})
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.h b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
index 7a10b1cb319..a80b90086c2 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
@@ -31,7 +31,7 @@ public:
         const bool cache_tables_);
 
     String getEngineName() const override { return "PostgreSQL"; }
-    String getMetadataPath() const override { return metadata_path; };
+    String getMetadataPath() const override { return metadata_path; }
 
     bool canContainMergeTreeTables() const override { return false; }
     bool canContainDistributedTables() const override { return false; }