thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into auto_format_by_file_extension

Browse Source
This commit is contained in:
mergify[bot] 2022-01-11 17:21:14 +00:00 committed by GitHub
commit 7999d90900
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 202 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Parsers/IAST.h
View File

@ -245,9 +245,9 @@ public:
void cloneChildren();
enum QueryKind
enum class QueryKind : uint8_t
{
None,
None = 0,
Alter,
Create,
Drop,

20
src/Parsers/ParserInsertQuery.cpp
View File

@ -113,10 +113,13 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
return false;
}
/// Check if file is a source of data.
Pos before_values = pos;
String format_str;
/// VALUES or FROM INFILE or FORMAT or SELECT
if (s_from_infile.ignore(pos, expected))
{
/// Read its name to process it later
/// Read file name to process it later
if (!infile_name_p.parse(pos, infile, expected))
return false;
@ -128,13 +131,14 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
if (!compression_p.parse(pos, compression, expected))
return false;
}
/// Read format name
if (!s_format.ignore(pos, expected) || !name_p.parse(pos, format, expected))
return false;
tryGetIdentifierNameInto(format, format_str);
}
Pos before_values = pos;
String format_str;
/// VALUES or FROM INFILE or FORMAT or SELECT
if (!infile && s_values.ignore(pos, expected))
else if (s_values.ignore(pos, expected))
{
/// If VALUES is defined in query, everything except setting will be parsed as data
data = pos->begin;

0
tests/queries/0_stateless/02165_insert_from_infile.reference Normal file
View File

4
tests/queries/0_stateless/02165_insert_from_infile.sql Normal file
View File

@ -0,0 +1,4 @@
EXPLAIN SYNTAX INSERT INTO test FROM INFILE 'data.file' SELECT 1; -- { clientError SYNTAX_ERROR }
EXPLAIN SYNTAX INSERT INTO test FROM INFILE 'data.file' WATCH view; -- { clientError SYNTAX_ERROR }
EXPLAIN SYNTAX INSERT INTO test FROM INFILE 'data.file' VALUES (1) -- { clientError SYNTAX_ERROR }
EXPLAIN SYNTAX INSERT INTO test FROM INFILE 'data.file' WITH number AS x SELECT number FROM numbers(10); -- { clientError SYNTAX_ERROR }

BIN
website/images/photos/anne-carlhoff.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
website/images/photos/baird-garrett.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
website/images/photos/dale-mcdiarmid.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
website/images/photos/geoffrey-genz.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
website/images/photos/marcel-birkner.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
website/images/photos/melvyn-peignon.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
website/images/photos/michael-lex.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
website/images/photos/nihat-hosgur.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
website/images/photos/nikolay-degterinsky.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
website/images/photos/nir-peled.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
website/images/photos/sergei-trifonov.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
website/images/photos/tanya-bragin.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
website/images/photos/tom-schreiber.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
website/images/photos/yuko-takagi.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

184
website/templates/company/team.html
View File

@ -19,6 +19,20 @@
{{ _('Principal Sofware Engineer') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/marcelbirkner/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/marcel-birkner.jpg">
</a>
<h3 class="display-4">
{{ _('Marcel Birkner') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('
Cloud SWE') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -32,6 +46,33 @@
{{ _('VP, Product') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/tbragin/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/tanya-bragin.jpg">
</a>
<h3 class="display-4">
{{ _('Tanya Bragin') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('VP, Product') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/anne-carlhoff/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/anne-carlhoff.jpg">
</a>
<h3 class="display-4">
{{ _('Anne Carlhoff') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('
Sr Recruiter') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -58,6 +99,19 @@
{{ _('Software Engineer') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/nikolay-degterinsky/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/nikolay-degterinsky.jpg">
</a>
<h3 class="display-4">
{{ _('Nikolay Degterinsky') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Core SWE') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -71,6 +125,32 @@
{{ _('Senior Director, Business Technology') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/wh-baird-garrett-89338812/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/baird-garrett.jpg">
</a>
<h3 class="display-4">
{{ _('Baird Garrett') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('General Counsel') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/geoff-genz-a8a6275/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/geoffrey-genz.jpg">
</a>
<h3 class="display-4">
{{ _('Geoffrey Genz') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Principal Support Engineer') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -97,6 +177,19 @@
{{ _('VP, Sales') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/nhosgur/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/nihat-hosgur.jpg">
</a>
<h3 class="display-4">
{{ _('Nihat Hosgur') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Principal Cloud SWE') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -162,6 +255,19 @@
{{ _('Software Engineer') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/michael-lex-a84a9b1b8/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/michael-lex.jpg">
</a>
<h3 class="display-4">
{{ _('Michael Lex') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Cloud SWE') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -201,6 +307,19 @@
{{ _('Executive Assistant') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/dalemcdiarmid/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/dale-mcdiarmid.jpg">
</a>
<h3 class="display-4">
{{ _('Dale McDiarmid') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Consulting Architect') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -240,6 +359,32 @@
{{ _('VP, Support &amp; Services') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/melvyn-peignon-a56b2890/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/melvyn-peignon.jpg">
</a>
<h3 class="display-4">
{{ _('Melvyn Peignon') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Manager, Support Services – EMEA') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/nir-peled-b2b15120/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/nir-peled.jpg">
</a>
<h3 class="display-4">
{{ _('Nir Peled') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Principal UX/UI Engineer') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -279,6 +424,19 @@
{{ _('Engineering Team Lead') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/schreibertom1/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/tom-schreiber.jpg">
</a>
<h3 class="display-4">
{{ _('Tom Schreiber') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Consulting Architect – EMEA') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -318,6 +476,19 @@
{{ _('VP, Operations') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<a href="https://www.linkedin.com/in/salesforcemaster/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
<img src="/images/photos/yuko-takagi.jpg">
</a>
<h3 class="display-4">
{{ _('Yuko Takagi') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Director, Go To Market Technology') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
@ -344,6 +515,19 @@
{{ _('Software Engineer') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
<div class="photo-frame mx-auto">
<img src="/images/photos/sergei-trifonov.jpg">
</div>
<h3 class="display-4">
{{ _('Sergei Trifonov') }}
</h3>
<p class="font-lg text-muted mb-0 mx-auto w-75">
{{ _('Principal Core SWE') }}
</p>
</div>
<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">