Added Support for Fetch Modes

config.m4

@@ -79,6 +79,9 @@ if test "$PHP_SEASCLICK" != "no"; then
         lib/clickhouse-cpp/clickhouse/columns/string.cpp \
         lib/clickhouse-cpp/clickhouse/columns/tuple.cpp \
         lib/clickhouse-cpp/clickhouse/columns/uuid.cpp \
+        lib/clickhouse-cpp/clickhouse/columns/decimal.cpp \
+        lib/clickhouse-cpp/clickhouse/columns/ip4.cpp \
+        lib/clickhouse-cpp/clickhouse/columns/ip6.cpp \
         lib/clickhouse-cpp/clickhouse/types/type_parser.cpp \
         lib/clickhouse-cpp/clickhouse/types/types.cpp \
         lib/clickhouse-cpp/contrib/cityhash/city.cc \

lib/clickhouse-cpp/CMakeLists.txt

@@ -1,21 +1,26 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)
 
-INCLUDE (cmake/cpp11.cmake)
+INCLUDE (cmake/cpp17.cmake)
 INCLUDE (cmake/subdirs.cmake)
 
 OPTION(BUILD_BENCHMARK "Build benchmark" OFF)
+OPTION(BUILD_TESTS "Build tests" OFF)
 
 PROJECT (CLICKHOUSE-CLIENT)
 
-    USE_CXX11()
+    USE_CXX17()
+
+	IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+		set(CMAKE_BUILD_TYPE "Debug")
+	ENDIF()
 
     IF (UNIX)
         IF (APPLE)
-            SET (CMAKE_CXX_FLAGS "-O2 -Wall -Wextra -Werror")
+            SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall -Wextra -Werror")
         ELSE ()
-            SET (CMAKE_CXX_FLAGS "-O2 -pthread -Wall -Wextra -Werror")
+            SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -pthread -Wall -Wextra -Werror")
         ENDIF ()
-        SET (CMAKE_EXE_LINKER_FLAGS, "-lpthread")
+        SET (CMAKE_EXE_LINKER_FLAGS, "${CMAKE_EXE_LINKER_FLAGS} -lpthread")
     ENDIF ()
 
     INCLUDE_DIRECTORIES(.)
@@ -24,12 +29,17 @@ PROJECT (CLICKHOUSE-CLIENT)
     SUBDIRS (
         clickhouse
         contrib/cityhash
-        contrib/gtest
         contrib/lz4
-        tests/simple
-        ut
     )
 
     IF (BUILD_BENCHMARK)
         SUBDIRS(bench)
     ENDIF (BUILD_BENCHMARK)
+
+    IF (BUILD_TESTS)
+        SUBDIRS(
+            contrib/gtest
+            tests/simple
+            ut
+        )
+	ENDIF (BUILD_TESTS)

lib/clickhouse-cpp/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Pavel Artemkin
+Copyright 2017 - 2020 Pavel Artemkin
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

lib/clickhouse-cpp/README.md

@@ -1,19 +1,18 @@
 ClickHouse C++ client [![Build Status](https://travis-ci.org/artpaul/clickhouse-cpp.svg?branch=master)](https://travis-ci.org/artpaul/clickhouse-cpp)
 =====
 
-C++ client for [Yandex ClickHouse](https://clickhouse.yandex/)
-
-## This repositorie change
-* [Add InsertQuery and InsertData methods](https://github.com/aiwhj/clickhouse-cpp/commit/bab28bcb5a509d80b8e2e0c7e89512446283dde5)
+C++ client for [ClickHouse](https://clickhouse.tech/)
 
 ## Supported data types
 
 * Array(T)
 * Date
 * DateTime
+* Decimal32, Decimal64, Decimal128
 * Enum8, Enum16
 * FixedString(N)
 * Float32, Float64
+* IPv4, IPv6
 * Nullable(T)
 * String
 * Tuple
@@ -24,7 +23,7 @@ C++ client for [Yandex ClickHouse](https://clickhouse.yandex/)
 ```sh
 $ mkdir build .
 $ cd build
-$ cmake ..
+$ cmake .. [-DBUILD_TESTS=ON]
 $ make
 ```
 

lib/clickhouse-cpp/clickhouse/CMakeLists.txt

@@ -1,4 +1,4 @@
-ADD_LIBRARY (clickhouse-cpp-lib
+SET ( clickhouse-cpp-lib-src
     base/coded.cpp
     base/compressed.cpp
     base/input.cpp
@@ -8,8 +8,11 @@ ADD_LIBRARY (clickhouse-cpp-lib
 
     columns/array.cpp
     columns/date.cpp
+    columns/decimal.cpp
     columns/enum.cpp
     columns/factory.cpp
+    columns/ip4.cpp
+    columns/ip6.cpp
     columns/nullable.cpp
     columns/numeric.cpp
     columns/string.cpp
@@ -24,10 +27,18 @@ ADD_LIBRARY (clickhouse-cpp-lib
     query.cpp
 )
 
+ADD_LIBRARY (clickhouse-cpp-lib SHARED ${clickhouse-cpp-lib-src})
+
 SET_TARGET_PROPERTIES(clickhouse-cpp-lib
     PROPERTIES LINKER_LANGUAGE CXX)
 
 TARGET_LINK_LIBRARIES (clickhouse-cpp-lib
     cityhash-lib
     lz4-lib
 )
+
+ADD_LIBRARY (clickhouse-cpp-lib-static STATIC ${clickhouse-cpp-lib-src})
+TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static
+    cityhash-lib
+    lz4-lib
+)

lib/clickhouse-cpp/clickhouse/base/coded.cpp

@@ -45,13 +45,13 @@ bool CodedInputStream::Skip(size_t count) {
 bool CodedInputStream::ReadVarint64(uint64_t* value) {
     *value = 0;
 
-    for (size_t i = 0; i < 9; ++i) {
+    for (size_t i = 0; i < MAX_VARINT_BYTES; ++i) {
         uint8_t byte;
 
         if (!input_->ReadByte(&byte)) {
             return false;
         } else {
-            *value |= (byte & 0x7F) << (7 * i);
+            *value |= uint64_t(byte & 0x7F) << (7 * i);
 
             if (!(byte & 0x80)) {
                 return true;
@@ -81,7 +81,7 @@ void CodedOutputStream::WriteVarint64(uint64_t value) {
     uint8_t bytes[MAX_VARINT_BYTES];
     int size = 0;
 
-    for (size_t i = 0; i < 9; ++i) {
+    for (size_t i = 0; i < MAX_VARINT_BYTES; ++i) {
         uint8_t byte = value & 0x7F;
         if (value > 0x7F)
             byte |= 0x80;

lib/clickhouse-cpp/clickhouse/base/compressed.cpp

@@ -15,14 +15,6 @@ CompressedInput::CompressedInput(CodedInputStream* input)
 {
 }
 
-CompressedInput::~CompressedInput() {
-    if (!mem_.Exhausted()) {
-        if (!std::uncaught_exception()) {
-            throw std::runtime_error("some data was not readed");
-        }
-    }
-}
-
 size_t CompressedInput::DoNext(const void** ptr, size_t len) {
     if (mem_.Exhausted()) {
         if (!Decompress()) {

lib/clickhouse-cpp/clickhouse/base/compressed.h

@@ -7,7 +7,6 @@ namespace clickhouse {
 class CompressedInput : public ZeroCopyInput {
 public:
      CompressedInput(CodedInputStream* input);
-    ~CompressedInput();
 
 protected:
     size_t DoNext(const void** ptr, size_t len) override;

lib/clickhouse-cpp/clickhouse/base/platform.h

@@ -15,7 +15,7 @@
 #   define _win_
 #endif
 
-#if defined(_linux_)
+#if defined(_linux_) || defined (_darwin_)
 #   define _unix_
 #endif