Skip to content

Commit 82c0ef1

Browse files
committed
Fix typo in function name - thanks Dmitry.
1 parent 6b73fa8 commit 82c0ef1

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

src/dsql/DdlNodes.epp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13754,7 +13754,7 @@ void CreateAlterSchemaNode::executeCreate(thread_db* tdbb, DsqlCompilerScratch*
1375413754
X IN RDB$USER_PRIVILEGES
1375513755
{
1375613756
strcpy(X.RDB$RELATION_SCHEMA_NAME, name.c_str());
13757-
strcpy(X.RDB$RELATION_NAME, getDllSecurityName(obj));
13757+
strcpy(X.RDB$RELATION_NAME, getDdlSecurityName(obj));
1375813758

1375913759
strcpy(X.RDB$USER, ownerName.c_str());
1376013760
X.RDB$USER_TYPE = obj_user;

src/dsql/parse.y

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ grant0($node)
10531053
| ddl_privileges(NOTRIAL(&$node->privileges)) schema_object on_schema_opt
10541054
TO non_role_grantee_list(NOTRIAL(&$node->users)) grant_option granted_by
10551055
{
1056-
$node->object = newNode<GranteeClause>($2, QualifiedName(getDllSecurityName($2), ($3 ? *$3 : "")));
1056+
$node->object = newNode<GranteeClause>($2, QualifiedName(getDdlSecurityName($2), ($3 ? *$3 : "")));
10571057
$node->grantAdminOption = $6;
10581058
$node->grantor = $7;
10591059
$node->isDdl = true;
@@ -1069,7 +1069,7 @@ grant0($node)
10691069
| db_ddl_privileges(NOTRIAL(&$node->privileges)) DATABASE
10701070
TO non_role_grantee_list(NOTRIAL(&$node->users)) grant_option granted_by
10711071
{
1072-
$node->object = newNode<GranteeClause>(obj_database, QualifiedName(getDllSecurityName(obj_database)));
1072+
$node->object = newNode<GranteeClause>(obj_database, QualifiedName(getDdlSecurityName(obj_database)));
10731073
$node->grantAdminOption = $5;
10741074
$node->grantor = $6;
10751075
$node->isDdl = true;
@@ -1106,11 +1106,11 @@ schema_object
11061106
%type <granteeClause> schemaless_object
11071107
schemaless_object
11081108
: ROLE
1109-
{ $$ = newNode<GranteeClause>(obj_roles, QualifiedName(getDllSecurityName(obj_roles))); }
1109+
{ $$ = newNode<GranteeClause>(obj_roles, QualifiedName(getDdlSecurityName(obj_roles))); }
11101110
| FILTER
1111-
{ $$ = newNode<GranteeClause>(obj_filters, QualifiedName(getDllSecurityName(obj_filters))); }
1111+
{ $$ = newNode<GranteeClause>(obj_filters, QualifiedName(getDdlSecurityName(obj_filters))); }
11121112
| SCHEMA
1113-
{ $$ = newNode<GranteeClause>(obj_schemas, QualifiedName(getDllSecurityName(obj_schemas))); }
1113+
{ $$ = newNode<GranteeClause>(obj_schemas, QualifiedName(getDdlSecurityName(obj_schemas))); }
11141114
;
11151115

11161116
table_noise
@@ -1347,7 +1347,7 @@ revoke0($node)
13471347
| rev_grant_option ddl_privileges(NOTRIAL(&$node->privileges)) schema_object on_schema_opt
13481348
FROM non_role_grantee_list(NOTRIAL(&$node->users)) granted_by
13491349
{
1350-
$node->object = newNode<GranteeClause>($3, QualifiedName(getDllSecurityName($3), ($4 ? *$4 : "")));
1350+
$node->object = newNode<GranteeClause>($3, QualifiedName(getDdlSecurityName($3), ($4 ? *$4 : "")));
13511351
$node->grantAdminOption = $1;
13521352
$node->grantor = $7;
13531353
$node->isDdl = true;
@@ -1363,7 +1363,7 @@ revoke0($node)
13631363
| rev_grant_option db_ddl_privileges(NOTRIAL(&$node->privileges)) DATABASE
13641364
FROM non_role_grantee_list(NOTRIAL(&$node->users)) granted_by
13651365
{
1366-
$node->object = newNode<GranteeClause>(obj_database, QualifiedName(getDllSecurityName(obj_database)));
1366+
$node->object = newNode<GranteeClause>(obj_database, QualifiedName(getDdlSecurityName(obj_database)));
13671367
$node->grantAdminOption = $1;
13681368
$node->grantor = $6;
13691369
$node->isDdl = true;

src/isql/show.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ processing_state SHOW_ddl_grants(const std::optional<QualifiedMetaString>& name,
860860
continue;
861861

862862
if (!isDdlObject(PRV.RDB$OBJECT_TYPE) || (obj_type != obj_any && PRV.RDB$OBJECT_TYPE != obj_type) ||
863-
(name && name->object != getDllSecurityName(PRV.RDB$OBJECT_TYPE)))
863+
(name && name->object != getDdlSecurityName(PRV.RDB$OBJECT_TYPE)))
864864
{
865865
continue;
866866
}
@@ -939,7 +939,7 @@ processing_state SHOW_ddl_grants(const std::optional<QualifiedMetaString>& name,
939939
SORTED BY PRV.RDB$RELATION_SCHEMA_NAME, PRV.RDB$USER, PRV.RDB$GRANT_OPTION
940940
{
941941
if (!isDdlObject(PRV.RDB$OBJECT_TYPE) || (obj_type != obj_any && PRV.RDB$OBJECT_TYPE != obj_type) ||
942-
(name && name->object != getDllSecurityName(PRV.RDB$OBJECT_TYPE)))
942+
(name && name->object != getDdlSecurityName(PRV.RDB$OBJECT_TYPE)))
943943
{
944944
continue;
945945
}

src/jrd/ini.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ namespace
568568
if (!attachment->isGbak() || !(attachment->att_flags & ATT_gbak_restore_has_schema))
569569
{
570570
storeGrant(tdbb, userName.c_str(), obj_user,
571-
QualifiedName(getDllSecurityName(obj), PUBLIC_SCHEMA),
571+
QualifiedName(getDdlSecurityName(obj), PUBLIC_SCHEMA),
572572
obj, ALL_DDL_PRIVILEGES, true);
573573

574574
addSecurityClass(tdbb, SCL_getDdlSecurityClassName(obj, PUBLIC_SCHEMA));
@@ -579,7 +579,7 @@ namespace
579579
else
580580
{
581581
storeGrant(tdbb, userName.c_str(), obj_user,
582-
QualifiedName(getDllSecurityName(obj)),
582+
QualifiedName(getDdlSecurityName(obj)),
583583
obj, ALL_DDL_PRIVILEGES, false);
584584

585585
addSecurityClass(tdbb, SCL_getDdlSecurityClassName(obj, {}));

src/jrd/obj.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ inline bool isDdlObject(ObjectType objectType, bool* useSchema = nullptr) noexce
149149
}
150150

151151

152-
inline constexpr const char* getDllSecurityName(ObjectType object_type) noexcept
152+
inline constexpr const char* getDdlSecurityName(ObjectType object_type) noexcept
153153
{
154154
switch (object_type)
155155
{

0 commit comments

Comments
 (0)