Merge remote-tracking branch 'origin/master' into better-union-all-try2

This commit is contained in:
Alexey Milovidov 2018-02-26 03:39:45 +03:00
commit 7093979336
6 changed files with 15 additions and 4 deletions

1
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1 @@
- [ ] I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

View File

@ -85,6 +85,10 @@ Note: If you need to round a date with time to any other number of seconds, minu
Rounds down a date with time to the start of the hour.
## toStartOfDay
Rounds down a date with time to the start of the day.
## toTime
Converts a date with time to a certain fixed date, while preserving the time.

View File

@ -74,6 +74,9 @@ SELECT
## toStartOfHour
Округляет дату-с-временем вниз до начала часа.
## toStartOfDay
Округляет дату-с-временем вниз до начала дня.
## toTime
Переводит дату-с-временем на некоторую фиксированную дату, сохраняя при этом время.

View File

@ -111,10 +111,13 @@ target_link_libraries (
${Boost_FILESYSTEM_LIBRARY}
${MALLOC_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${RT_LIBRARY}
${GLIBC_COMPATIBILITY_LIBRARIES}
${MEMCPY_LIBRARIES})
if (RT_LIBRARY)
target_link_libraries (common ${RT_LIBRARY})
endif ()
if (ENABLE_TESTS)
add_subdirectory (src/tests)
endif ()

View File

@ -14,8 +14,8 @@ target_link_libraries (date_lut2 common ${PLATFORM_LIBS})
target_link_libraries (date_lut3 common ${PLATFORM_LIBS})
target_link_libraries (date_lut4 common ${PLATFORM_LIBS})
target_link_libraries (date_lut_default_timezone common ${PLATFORM_LIBS})
target_link_libraries (multi_version common ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${RT_LIBRARY})
target_link_libraries (multi_version common)
add_executable (unit_tests_libcommon gtest_json_test.cpp gtest_strong_typedef.cpp)
target_link_libraries (unit_tests_libcommon gtest_main common ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${RT_LIBRARY})
target_link_libraries (unit_tests_libcommon gtest_main common)
add_check(unit_tests_libcommon)

View File

@ -2,6 +2,6 @@
add_executable (mysqlxx_test mysqlxx_test.cpp)
add_executable (failover failover.cpp)
target_link_libraries (mysqlxx_test mysqlxx ${RT_LIBRARY})
target_link_libraries (mysqlxx_test mysqlxx)
target_link_libraries (failover mysqlxx ${Poco_Util_LIBRARY} ${Poco_Foundation_LIBRARY})
target_link_rt_by_force (failover)