@ -2818,7 +2818,7 @@ getObjectDescription(const ObjectAddress *object)
case OCLASS_ROLE :
case OCLASS_ROLE :
{
{
appendStringInfo ( & buffer , _ ( " role %s " ) ,
appendStringInfo ( & buffer , _ ( " role %s " ) ,
GetUserNameFromId ( object - > objectId ) ) ;
GetUserNameFromId ( object - > objectId , false ) ) ;
break ;
break ;
}
}
@ -2884,7 +2884,7 @@ getObjectDescription(const ObjectAddress *object)
ReleaseSysCache ( tup ) ;
ReleaseSysCache ( tup ) ;
if ( OidIsValid ( useid ) )
if ( OidIsValid ( useid ) )
usename = GetUserNameFromId ( useid ) ;
usename = GetUserNameFromId ( useid , false ) ;
else
else
usename = " public " ;
usename = " public " ;
@ -2924,28 +2924,28 @@ getObjectDescription(const ObjectAddress *object)
case DEFACLOBJ_RELATION :
case DEFACLOBJ_RELATION :
appendStringInfo ( & buffer ,
appendStringInfo ( & buffer ,
_ ( " default privileges on new relations belonging to role %s " ) ,
_ ( " default privileges on new relations belonging to role %s " ) ,
GetUserNameFromId ( defacl - > defaclrole ) ) ;
GetUserNameFromId ( defacl - > defaclrole , false ) ) ;
break ;
break ;
case DEFACLOBJ_SEQUENCE :
case DEFACLOBJ_SEQUENCE :
appendStringInfo ( & buffer ,
appendStringInfo ( & buffer ,
_ ( " default privileges on new sequences belonging to role %s " ) ,
_ ( " default privileges on new sequences belonging to role %s " ) ,
GetUserNameFromId ( defacl - > defaclrole ) ) ;
GetUserNameFromId ( defacl - > defaclrole , false ) ) ;
break ;
break ;
case DEFACLOBJ_FUNCTION :
case DEFACLOBJ_FUNCTION :
appendStringInfo ( & buffer ,
appendStringInfo ( & buffer ,
_ ( " default privileges on new functions belonging to role %s " ) ,
_ ( " default privileges on new functions belonging to role %s " ) ,
GetUserNameFromId ( defacl - > defaclrole ) ) ;
GetUserNameFromId ( defacl - > defaclrole , false ) ) ;
break ;
break ;
case DEFACLOBJ_TYPE :
case DEFACLOBJ_TYPE :
appendStringInfo ( & buffer ,
appendStringInfo ( & buffer ,
_ ( " default privileges on new types belonging to role %s " ) ,
_ ( " default privileges on new types belonging to role %s " ) ,
GetUserNameFromId ( defacl - > defaclrole ) ) ;
GetUserNameFromId ( defacl - > defaclrole , false ) ) ;
break ;
break ;
default :
default :
/* shouldn't get here */
/* shouldn't get here */
appendStringInfo ( & buffer ,
appendStringInfo ( & buffer ,
_ ( " default privileges belonging to role %s " ) ,
_ ( " default privileges belonging to role %s " ) ,
GetUserNameFromId ( defacl - > defaclrole ) ) ;
GetUserNameFromId ( defacl - > defaclrole , false ) ) ;
break ;
break ;
}
}
@ -4214,7 +4214,7 @@ getObjectIdentityParts(const ObjectAddress *object,
{
{
char * username ;
char * username ;
username = GetUserNameFromId ( object - > objectId ) ;
username = GetUserNameFromId ( object - > objectId , false ) ;
if ( objname )
if ( objname )
* objname = list_make1 ( username ) ;
* objname = list_make1 ( username ) ;
appendStringInfoString ( & buffer ,
appendStringInfoString ( & buffer ,
@ -4295,7 +4295,7 @@ getObjectIdentityParts(const ObjectAddress *object,
ReleaseSysCache ( tup ) ;
ReleaseSysCache ( tup ) ;
if ( OidIsValid ( useid ) )
if ( OidIsValid ( useid ) )
usename = GetUserNameFromId ( useid ) ;
usename = GetUserNameFromId ( useid , false ) ;
else
else
usename = " public " ;
usename = " public " ;
@ -4339,7 +4339,7 @@ getObjectIdentityParts(const ObjectAddress *object,
defacl = ( Form_pg_default_acl ) GETSTRUCT ( tup ) ;
defacl = ( Form_pg_default_acl ) GETSTRUCT ( tup ) ;
username = GetUserNameFromId ( defacl - > defaclrole ) ;
username = GetUserNameFromId ( defacl - > defaclrole , false ) ;
appendStringInfo ( & buffer ,
appendStringInfo ( & buffer ,
" for role %s " ,
" for role %s " ,
quote_identifier ( username ) ) ;
quote_identifier ( username ) ) ;