Skip to content

Commit 389d597

Browse files
pufitnikitamikhaylov
authored andcommitted
Fix build
1 parent 180dcf0 commit 389d597

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/Access/Common/AccessFlags.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ namespace
304304
collectAllFlags(child.get());
305305

306306
all_flags_grantable_on_table_level = all_flags_for_target[TABLE] | all_flags_for_target[DICTIONARY] | all_flags_for_target[COLUMN];
307-
all_flags_grantable_on_global_with_parameter_level = all_flags_for_target[NAMED_COLLECTION] | all_flags_for_target[USER_NAME] | all_flags_for_target[TABLE_ENGINE];
307+
all_flags_grantable_on_global_with_parameter_level = all_flags_for_target[NAMED_COLLECTION] | all_flags_for_target[USER_NAME] | all_flags_for_target[TABLE_ENGINE] | all_flags_for_target[DEFINER];
308308
all_flags_grantable_on_database_level = all_flags_for_target[DATABASE] | all_flags_grantable_on_table_level;
309309
}
310310

@@ -379,6 +379,10 @@ std::unordered_map<AccessFlags::ParameterType, AccessFlags> AccessFlags::splitIn
379379
if (user_flags)
380380
result.emplace(ParameterType::USER_NAME, user_flags);
381381

382+
auto definer_flags = AccessFlags::allDefinerFlags() & *this;
383+
if (definer_flags)
384+
result.emplace(ParameterType::DEFINER, user_flags);
385+
382386
auto table_engine_flags = AccessFlags::allTableEngineFlags() & *this;
383387
if (table_engine_flags)
384388
result.emplace(ParameterType::TABLE_ENGINE, table_engine_flags);

src/Storages/System/StorageSystemPrivileges.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ namespace
3131
NAMED_COLLECTION,
3232
USER_NAME,
3333
TABLE_ENGINE,
34+
DEFINER,
3435
};
3536

3637
DataTypeEnum8::Values getLevelEnumValues()
@@ -45,6 +46,7 @@ namespace
4546
enum_values.emplace_back("NAMED_COLLECTION", static_cast<Int8>(NAMED_COLLECTION));
4647
enum_values.emplace_back("USER_NAME", static_cast<Int8>(USER_NAME));
4748
enum_values.emplace_back("TABLE_ENGINE", static_cast<Int8>(TABLE_ENGINE));
49+
enum_values.emplace_back("DEFINER", static_cast<Int8>(DEFINER));
4850
return enum_values;
4951
}
5052
}

tests/queries/0_stateless/01271_show_privileges.reference

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ SHOW NAMED COLLECTIONS ['SHOW NAMED COLLECTIONS'] NAMED_COLLECTION NAMED COLLECT
110110
SHOW NAMED COLLECTIONS SECRETS ['SHOW NAMED COLLECTIONS SECRETS'] NAMED_COLLECTION NAMED COLLECTION ADMIN
111111
NAMED COLLECTION ['NAMED COLLECTION USAGE','USE NAMED COLLECTION'] NAMED_COLLECTION NAMED COLLECTION ADMIN
112112
NAMED COLLECTION ADMIN ['NAMED COLLECTION CONTROL'] NAMED_COLLECTION ALL
113-
SET DEFINER [] USER_NAME ALL
113+
SET DEFINER [] DEFINER ALL
114114
TABLE ENGINE ['TABLE ENGINE'] TABLE_ENGINE ALL
115115
SYSTEM SHUTDOWN ['SYSTEM KILL','SHUTDOWN'] GLOBAL SYSTEM
116116
SYSTEM DROP DNS CACHE ['SYSTEM DROP DNS','DROP DNS CACHE','DROP DNS'] GLOBAL SYSTEM DROP CACHE

0 commit comments

Comments
 (0)