thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-13 19:14:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yandex/ClickHouse

Browse Source
This commit is contained in:
Alexey Milovidov 2017-07-10 21:28:11 +03:00
commit 2f866cf18f
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/cmake/version.cmake
View File

@ -1,6 +1,6 @@
# This strings autochanged from release_lib.sh: # This strings autochanged from release_lib.sh:
set(VERSION_DESCRIBE v1.1.54249-testing) set(VERSION_DESCRIBE v1.1.54250-testing)
set(VERSION_REVISION 54249) set(VERSION_REVISION 54250)
# end of autochange # end of autochange
set (VERSION_MAJOR 1) set (VERSION_MAJOR 1)

5
dbms/src/Interpreters/InterpreterSetQuery.cpp
View File

@ -1,7 +1,7 @@
#include <Parsers/ASTSetQuery.h> #include <Parsers/ASTSetQuery.h>
#include <Interpreters/Context.h> #include <Interpreters/Context.h>
#include <Interpreters/InterpreterSetQuery.h> #include <Interpreters/InterpreterSetQuery.h>
#include <Core/FieldVisitors.h>
namespace DB namespace DB
{ {
@ -25,7 +25,6 @@ BlockIO InterpreterSetQuery::execute()
return {}; return {};
} }
void InterpreterSetQuery::checkAccess(const ASTSetQuery & ast) void InterpreterSetQuery::checkAccess(const ASTSetQuery & ast)
{ {
/** The `readonly` value is understood as follows: /** The `readonly` value is understood as follows:
@ -41,7 +40,7 @@ void InterpreterSetQuery::checkAccess(const ASTSetQuery & ast)
{ {
String value; String value;
/// Setting isn't checked if value wasn't changed. /// Setting isn't checked if value wasn't changed.
if (!settings.tryGet(change.name, value) || change.value != value) if (!settings.tryGet(change.name, value) || applyVisitor(FieldVisitorToString(), change.value) != value)
{ {
if (readonly == 1) if (readonly == 1)
throw Exception("Cannot execute SET query in readonly mode", ErrorCodes::READONLY); throw Exception("Cannot execute SET query in readonly mode", ErrorCodes::READONLY);

14
dbms/tests/queries/0_stateless/00474_readonly_settings.reference Normal file
View File

@ -0,0 +1,14 @@
"name": "value",
"value": 4611686018427387904
"name": "value",
"value": "4611686018427387904"
value
value
Cannot execute SET query in readonly mode.
"name": "value",
"value": "9223372036854775808"
"name": "value",
"value": 9223372036854775808
value
value
Cannot override setting

13
dbms/tests/queries/0_stateless/00474_readonly_settings.sh Executable file
View File

@ -0,0 +1,13 @@
#!/usr/bin/env bash
clickhouse-client --query="select toUInt64(pow(2, 62)) as value format JSON" --output_format_json_quote_64bit_integers=0 | grep value
clickhouse-client --query="select toUInt64(pow(2, 62)) as value format JSON" --output_format_json_quote_64bit_integers=1 | grep value
clickhouse-client --user readonly --multiquery --query="set output_format_json_quote_64bit_integers=1 ; select toUInt64(pow(2, 63)) as value format JSON" 2>&1 | grep -o 'value\|Cannot execute SET query in readonly mode.'
clickhouse-client --user readonly --multiquery --query="set output_format_json_quote_64bit_integers=0 ; select toUInt64(pow(2, 63)) as value format JSON" 2>&1 | grep -o 'value\|Cannot execute SET query in readonly mode.'
curl -sS 'http://localhost:8123/?query=SELECT+toUInt64(pow(2,+63))+as+value+format+JSON&output_format_json_quote_64bit_integers=1' | grep value
curl -sS 'http://localhost:8123/?query=SELECT+toUInt64(pow(2,+63))+as+value+format+JSON&output_format_json_quote_64bit_integers=0' | grep value
curl -sS 'http://localhost:8123/?user=readonly&query=SELECT+toUInt64(pow(2,+63))+as+value+format+JSON&output_format_json_quote_64bit_integers=1' 2>&1 | grep -o 'value\|Cannot override setting'
curl -sS 'http://localhost:8123/?user=readonly&query=SELECT+toUInt64(pow(2,+63))+as+value+format+JSON&output_format_json_quote_64bit_integers=0' 2>&1 | grep -o 'value\|Cannot override setting'