Merge branch 'master' into master

docs/en/sql-reference/statements/create/table.md

@@ -254,7 +254,6 @@ CREATE TABLE codec_example
 ENGINE = MergeTree()
 ```
 
-<!--
 ### Encryption Codecs {#create-query-encryption-codecs}
 
 These codecs don't actually compress data, but instead encrypt data on disk. These are only available when an encryption key is specified by [encryption](../../../operations/server-configuration-parameters/settings.md#server-settings-encryption) settings. Note that encryption only makes sense at the end of codec pipelines, because encrypted data usually can't be compressed in any meaningful way.
@@ -268,7 +267,7 @@ Encryption codecs:
 
 !!! attention "Attention"
     If you perform a SELECT query mentioning a specific value in an encrypted column (such as in its WHERE clause), the value may appear in [system.query_log](../../../operations/system-tables/query_log.md). You may want to disable the logging.
--->
+
 ## Temporary Tables {#temporary-tables}
 
 ClickHouse supports temporary tables which have the following characteristics:

programs/client/Client.cpp

@@ -62,6 +62,7 @@
 #include <IO/Operators.h>
 #include <IO/UseSSL.h>
 #include <IO/WriteBufferFromOStream.h>
+#include <IO/ReadBufferFromFile.h>
 #include <Processors/Transforms/AddingDefaultsTransform.h>
 #include <DataStreams/InternalTextLogsRowOutputStream.h>
 #include <DataStreams/NullBlockOutputStream.h>

src/Parsers/ParserInsertQuery.cpp

@@ -111,6 +111,11 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     {
         data = pos->begin;
     }
+    else if (s_from_infile.ignore(pos, expected))
+    {
+        if (!infile_name_p.parse(pos, infile, expected))
+            return false;
+    }
     else if (s_format.ignore(pos, expected))
     {
         if (!name_p.parse(pos, format, expected))

tests/queries/0_stateless/02009_from_infile.sh

@@ -9,12 +9,14 @@ set -e
 [ -e "${CLICKHOUSE_TMP}"/test_infile.gz ] && rm "${CLICKHOUSE_TMP}"/test_infile.gz
 [ -e "${CLICKHOUSE_TMP}"/test_infile ] && rm "${CLICKHOUSE_TMP}"/test_infile
 
+
 echo "Hello" > "${CLICKHOUSE_TMP}"/test_infile
 
 gzip "${CLICKHOUSE_TMP}"/test_infile
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_infile;"
 ${CLICKHOUSE_CLIENT} --query "CREATE TABLE test_infile (word String) ENGINE=Memory();"
+
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO test_infile FROM INFILE '${CLICKHOUSE_TMP}/test_infile.gz' FORMAT CSV;"
 ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_infile;"
 
@@ -26,3 +28,4 @@ ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=CREATE" -d 'TABLE test_infile_ur
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "INSERT INTO test_infile_url FROM INFILE '${CLICKHOUSE_TMP}/test_infile.gz' FORMAT CSV" 2>&1 | grep -q "UNKNOWN_TYPE_OF_QUERY" && echo "Correct URL" || echo 'Fail'
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d 'SELECT x FROM test_infile_url'
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=DROP+TABLE" -d 'test_infile_url'
+