mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-28 02:21:59 +00:00
fix conflict
This commit is contained in:
parent
f2c22408da
commit
0b151bbe8f
@ -324,7 +324,20 @@ void InterpreterCreateUserQuery::updateUserFromQuery(User & user, const ASTCreat
|
|||||||
if (query.valid_until)
|
if (query.valid_until)
|
||||||
valid_until = getValidUntilFromAST(query.valid_until, {});
|
valid_until = getValidUntilFromAST(query.valid_until, {});
|
||||||
|
|
||||||
updateUserFromQueryImpl(user, query, auth_data, {}, {}, {}, {}, valid_until, query.reset_authentication_methods_to_new, query.replace_authentication_methods, allow_no_password, allow_plaintext_password, true);
|
updateUserFromQueryImpl(
|
||||||
|
user,
|
||||||
|
query,
|
||||||
|
authentication_methods,
|
||||||
|
{},
|
||||||
|
{},
|
||||||
|
{},
|
||||||
|
{},
|
||||||
|
valid_until,
|
||||||
|
query.reset_authentication_methods_to_new,
|
||||||
|
query.replace_authentication_methods,
|
||||||
|
allow_no_password,
|
||||||
|
allow_plaintext_password,
|
||||||
|
true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void registerInterpreterCreateUserQuery(InterpreterFactory & factory)
|
void registerInterpreterCreateUserQuery(InterpreterFactory & factory)
|
||||||
|
Loading…
Reference in New Issue
Block a user