thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Evgeniy Gatov 2014-05-16 17:05:37 +04:00
commit 7e48baf58b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Interpreters/InterpreterCreateQuery.cpp
View File

@ -76,7 +76,8 @@ StoragePtr InterpreterCreateQuery::execute(bool assume_metadata_exists)
SharedPtr<InterpreterSelectQuery> interpreter_select; SharedPtr<InterpreterSelectQuery> interpreter_select;
Block select_sample; Block select_sample;
if (create.select && !create.attach) /// Для таблиц типа вью, чтобы получить столбцы, может понадобиться sample block.
if (create.select && (!create.attach || (!create.columns && (create.is_view || create.is_materialized_view))))
{ {
interpreter_select = new InterpreterSelectQuery(create.select, context); interpreter_select = new InterpreterSelectQuery(create.select, context);
select_sample = interpreter_select->getSampleBlock(); select_sample = interpreter_select->getSampleBlock();

4
libs/libcommon/src/create_revision.sh.cmake
View File

@ -8,8 +8,10 @@ cd ${CMAKE_CURRENT_SOURCE_DIR};
if (git rev-parse --is-inside-work-tree &> /dev/null) if (git rev-parse --is-inside-work-tree &> /dev/null)
then then
# GIT # GIT
# git describe --tags находит ближайщий tag к текущему комиту с учетом веток.
# Если несколько тэгов относятся к одному коммиту, то вернется первый. Поэтому ревизия пакета иногда может отличаться от той версии, что пишет демон
git fetch --tags; git fetch --tags;
( git tag || echo 1 ) | tail -1 >> ${CMAKE_CURRENT_BINARY_DIR}/src/revision.h; ( git describe --tags || echo 1 ) | cut -d "-" -f 1 >> ${CMAKE_CURRENT_BINARY_DIR}/src/revision.h;
else else
#SVN #SVN
echo && (LC_ALL=C svn info ${PROJECT_SOURCE_DIR}/ 2>/dev/null || echo Revision 1) | grep Revision | cut -d " " -f 2 >> ${CMAKE_CURRENT_BINARY_DIR}/src/revision.h; echo && (LC_ALL=C svn info ${PROJECT_SOURCE_DIR}/ 2>/dev/null || echo Revision 1) | grep Revision | cut -d " " -f 2 >> ${CMAKE_CURRENT_BINARY_DIR}/src/revision.h;