Alternative wire protocols support (RowBinaryWithNamesAndTypes)

.travis.yml

@@ -236,6 +236,7 @@ jobs:
         homebrew:
           packages:
             - libiodbc
+          update: true
 
     - name: "macOS 10.14 - iODBC - RelWithDebInfo - System third-party libs - x86_64 - AppleClang (Xcode 11.2) - Unix Makefiles"
       os: osx
@@ -254,6 +255,7 @@ jobs:
             - openssl
             - poco
             - libiodbc
+          update: true
 
     - name: "macOS 10.14 - UnixODBC - RelWithDebInfo - x86_64 - AppleClang (Xcode 11.2) - Unix Makefiles"
       os: osx
@@ -270,6 +272,7 @@ jobs:
         homebrew:
           packages:
             - unixodbc
+          update: true
 
 before_install: |-
   set -Eeo pipefail
@@ -375,8 +378,9 @@ install: |-
   DebugFile = ${RUN_DIR}/odbc-driver-manager-debug.log
 
   [ODBC Data Sources]
-  ClickHouse DSN (ANSI)    = ClickHouse ODBC Driver (ANSI)
-  ClickHouse DSN (Unicode) = ClickHouse ODBC Driver (Unicode)
+  ClickHouse DSN (ANSI)         = ClickHouse ODBC Driver (ANSI)
+  ClickHouse DSN (Unicode)      = ClickHouse ODBC Driver (Unicode)
+  ClickHouse DSN (ANSI, RBWNAT) = ClickHouse ODBC Driver (ANSI)
 
   [ClickHouse DSN (ANSI)]
   Driver        = ClickHouse ODBC Driver (ANSI)
@@ -391,23 +395,37 @@ install: |-
   Url           = http://${CLICKHOUSE_SERVER_IP}
   DriverLog     = yes
   DriverLogFile = ${RUN_DIR}/clickhouse-odbc-driver-w.log
+
+  [ClickHouse DSN (ANSI, RBWNAT)]
+  Driver        = ClickHouse ODBC Driver (ANSI)
+  Description   = Test DSN for ClickHouse ODBC Driver (ANSI) that uses RowBinaryWithNamesAndTypes as data source communication default format
+  Url           = http://${CLICKHOUSE_SERVER_IP}/query?default_format=RowBinaryWithNamesAndTypes
+  DriverLog     = yes
+  DriverLogFile = ${RUN_DIR}/clickhouse-odbc-driver.log
   EOF
     fi
   fi
 
 .configure: &configure |-
-  CMAKE_CONFIGURE_ARGS="'-DTEST_DSN=ClickHouse DSN (ANSI)' '-DTEST_DSN_W=ClickHouse DSN (Unicode)' $CMAKE_CONFIGURE_EXTRA_ARGS"
+  CMAKE_CONFIGURE_ARGS="-DTEST_DSN_LIST=\"ClickHouse DSN (ANSI);ClickHouse DSN (Unicode);ClickHouse DSN (ANSI, RBWNAT)\" $CMAKE_CONFIGURE_EXTRA_ARGS"
   if [[ "$EXTERNAL_THIRD_PARTY" == "yes" ]]; then
     CMAKE_CONFIGURE_ARGS="-DCH_ODBC_PREFER_BUNDLED_THIRD_PARTIES=OFF $CMAKE_CONFIGURE_ARGS"
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      CMAKE_CONFIGURE_ARGS="-DOPENSSL_ROOT_DIR=$(brew --prefix)/opt/openssl $CMAKE_CONFIGURE_ARGS"
+    fi
   fi
   if [[ ! -z "$ODBC_PROVIDER" ]]; then
     CMAKE_CONFIGURE_ARGS="-DODBC_PROVIDER=$ODBC_PROVIDER $CMAKE_CONFIGURE_ARGS"
   fi
   cd $BUILD_DIR
+  echo "#!/usr/bin/env bash" > cmake_configure.sh
+  echo "set -Eeuo pipefail" >> cmake_configure.sh
+  echo "cmake $CMAKE_CONFIGURE_ARGS $SOURCE_DIR" >> cmake_configure.sh
+  chmod u+x cmake_configure.sh
   if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-    $SOURCE_DIR/test/vcvars_enabled_bash.sh cmake $CMAKE_CONFIGURE_ARGS $SOURCE_DIR
+    $SOURCE_DIR/test/vcvars_enabled_bash.sh ./cmake_configure.sh
   else
-    cmake $CMAKE_CONFIGURE_ARGS $SOURCE_DIR
+    ./cmake_configure.sh
   fi
 
 .build: &build |-

CMakeLists.txt

@@ -66,16 +66,18 @@ endif ()
 # Make sure that all optimized builds have NDEBUG macro set.
 foreach (config Release RelWithDebInfo MinSizeRel)
     foreach (lang CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
-        set (var "${lang}_${config}")
+        string (TOUPPER "${config}" config_uc)
+        set (var "${lang}_${config_uc}")
         set (${var} "${${var}} -DNDEBUG")
     endforeach ()
 endforeach ()
 
 # Set BUILD_TYPE_* macro for each of build types.
 foreach (config Debug Release RelWithDebInfo MinSizeRel)
     foreach (lang CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
-        set (var "${lang}_${config}")
-        set (${var} "${${var}} -DBUILD_TYPE_${config}")
+        string (TOUPPER "${config}" config_uc)
+        set (var "${lang}_${config_uc}")
+        set (${var} "${${var}} -DBUILD_TYPE_${config_uc}")
     endforeach ()
 endforeach ()
 
@@ -149,12 +151,8 @@ if (CH_ODBC_ENABLE_TESTING)
     enable_testing ()
     include (GoogleTest)
 
-    if (NOT TEST_DSN)
-        set (TEST_DSN "${CH_ODBC_DEFAULT_DSN_ANSI}")
-    endif ()
-
-    if (NOT TEST_DSN_W)
-        set (TEST_DSN_W "${CH_ODBC_DEFAULT_DSN_UNICODE}")
+    if (NOT TEST_DSN_LIST)
+        set (TEST_DSN_LIST "${CH_ODBC_DEFAULT_DSN_ANSI};${CH_ODBC_DEFAULT_DSN_UNICODE}")
     endif ()
 endif ()
 

driver/CMakeLists.txt

@@ -46,14 +46,17 @@ unset (WORKAROUND_ENABLE_NO_UNICODE_CHARS_IN_COLUMN_NAMES_IN_TESTS)
 
 # In order to enable testing, put every non-public symbol to a static library (which is then used by shared library and unit-test binary).
 add_library (${libname}-impl STATIC
-    utils/read_helpers.cpp
     utils/type_parser.cpp
+    utils/type_info.cpp
 
     config/config.cpp
 
     escaping/escape_sequences.cpp
     escaping/lexer.cpp
 
+    format/ODBCDriver2.cpp
+    format/RowBinaryWithNamesAndTypes.cpp
+
     api/impl/impl.cpp
 
     attributes.cpp
@@ -66,7 +69,6 @@ add_library (${libname}-impl STATIC
     object.cpp
     result_set.cpp
     statement.cpp
-    type_info.cpp
 
 
     ${CMAKE_CURRENT_BINARY_DIR}/platform/config_cmake${WIDECHAR_SUFFIX}.h
@@ -75,9 +77,8 @@ add_library (${libname}-impl STATIC
     utils/utils.h
     utils/unicode_conv.h
     utils/iostream_debug_helpers.h
-    utils/read_helpers.h
     utils/type_parser.h
-    utils/scope_guard.h
+    utils/type_info.h
 
     config/config.h
     config/ini_defines.h
@@ -89,6 +90,9 @@ add_library (${libname}-impl STATIC
 
     api/impl/impl.h
 
+    format/ODBCDriver2.h
+    format/RowBinaryWithNamesAndTypes.h
+
     attributes.h
     connection.h
     descriptor.h
@@ -99,7 +103,6 @@ add_library (${libname}-impl STATIC
     object.h
     result_set.h
     statement.h
-    type_info.h
 )
 
 set (WIN_SOURCES)