Merge pull request #23 from yandex/escaping

process CONVERT function
ClickHouse · Jul 12, 2017 · 8468866 · 8468866
2 parents 21aab1f + 0b560ea
commit 8468866
Show file tree

Hide file tree

Showing 27 changed files with 32,168 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,4 +35,4 @@ install:
 script:
   - mkdir build
   - cd build
-  - cmake .. -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=`which $CXX` -DCMAKE_C_COMPILER=`which $CC` && make -j `nproc || grep -c ^processor /proc/cpuinfo`
+  - cmake .. -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=`which $CXX` -DCMAKE_C_COMPILER=`which $CC` && make -j `nproc || grep -c ^processor /proc/cpuinfo` && ./driver/ut/clickhouse-odbc-ut
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,4 +74,8 @@ if (USE_INTERNAL_POCO_LIBRARY)
     set_property(TARGET Foundation PROPERTY INTERFACE_LINK_LIBRARIES "")
 endif ()
 
+include_directories(contrib)
+include_directories(driver)
+
 add_subdirectory (driver)
+add_subdirectory (driver/ut)
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory (gtest)
+
 if (USE_INTERNAL_POCO_LIBRARY)
     add_subdirectory (poco)
 endif ()
diff --git a/contrib/gtest/CMakeLists.txt b/contrib/gtest/CMakeLists.txt
@@ -0,0 +1,3 @@
+ADD_LIBRARY (gtest-lib STATIC
+    gtest-all.cc
+)