Commitf3cc978

committed

Add AUTHOID portability

1 parent28dc32c commitf3cc978Copy full SHA for f3cc978

File tree

+57

-3

lines changed

+57

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ configure_remote_session(PGconn *conn)`
`323`	`323`	`* Temporarily switch off this option. Not all regression tests passes`
`324`	`324`	`* correctly without including 'public' value in default search path.`
`325`	`325`	`*/`
`326`		`-do_sql_command(conn,"SET search_path = pg_catalog");`
	`326`	`+/do_sql_command(conn, "SET search_path = pg_catalog"); /`
`327`	`327`
`328`	`328`	`/*`
`329`	`329`	`* Set remote timezone; this is basically just cosmetic, since all`

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1130,6 +1130,41 @@ DropRole(DropRoleStmt *stmt)`
`1130`	`1130`	`heap_close(pg_authid_rel,NoLock);`
`1131`	`1131`	`}`
`1132`	`1132`
	`1133`	`+char*`
	`1134`	`+get_rolename(Oidroleid)`
	`1135`	`+{`
	`1136`	`+HeapTupletuple;`
	`1137`	`+char*rolename;`
	`1138`	`+`
	`1139`	`+tuple=SearchSysCache1(AUTHOID,ObjectIdGetDatum(roleid));`
	`1140`	`+`
	`1141`	`+if (!HeapTupleIsValid(tuple))`
	`1142`	`+ereport(ERROR,`
	`1143`	`+(errcode(ERRCODE_UNDEFINED_OBJECT),`
	`1144`	`+errmsg("role with oid\"%d\" does not exist",roleid)));`
	`1145`	`+`
	`1146`	`+rolename=strdup(NameStr(((Form_pg_authid)GETSTRUCT(tuple))->rolname));`
	`1147`	`+ReleaseSysCache(tuple);`
	`1148`	`+returnrolename;`
	`1149`	`+}`
	`1150`	`+`
	`1151`	`+Oid`
	`1152`	`+get_roleid(constchar*rolename)`
	`1153`	`+{`
	`1154`	`+HeapTupletuple;`
	`1155`	`+Oidroleid;`
	`1156`	`+`
	`1157`	`+tuple=SearchSysCache1(AUTHNAME,CStringGetDatum(rolename));`
	`1158`	`+`
	`1159`	`+if (!HeapTupleIsValid(tuple))`
	`1160`	`+ereport(ERROR,`
	`1161`	`+(errcode(ERRCODE_UNDEFINED_OBJECT),`
	`1162`	`+errmsg("role \"%s\" does not exist",rolename)));`
	`1163`	`+`
	`1164`	`+roleid=HeapTupleGetOid(tuple);`
	`1165`	`+ReleaseSysCache(tuple);`
	`1166`	`+returnroleid;`
	`1167`	`+}`
`1133`	`1168`	`/*`
`1134`	`1169`	`* Rename role`
`1135`	`1170`	`*/`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`
`26`	`26`	`#include<ctype.h>`
`27`	`27`
	`28`	`+#include"commands/user.h"`
`28`	`29`	`#include"lib/stringinfo.h"`
`29`	`30`	`#include"nodes/extensible.h"`
`30`	`31`	`#include"nodes/plannodes.h"`
`@@ -35,8 +36,9 @@`
`35`	`36`	`#include"utils/syscache.h"`
`36`	`37`
`37`	`38`	`#defineNSP_NAME(nspoid) (get_namespace_name(nspoid))`
`38`		`-#defineOID_TYPES_NUM(5)`
`39`		`-staticconstOidoid_types[OID_TYPES_NUM]= {RELOID,TYPEOID,PROCOID,COLLOID,OPEROID};`
	`39`	`+#defineOID_TYPES_NUM(6)`
	`40`	`+staticconstOidoid_types[OID_TYPES_NUM]= {RELOID,TYPEOID,PROCOID,COLLOID,`
	`41`	`+OPEROID,AUTHOID};`
`40`	`42`
`41`	`43`	`staticboolportable_output= false;`
`42`	`44`	`void`
`@@ -141,6 +143,10 @@ write_oid_field(StringInfo str, Oid oid)`
`141`	`143`	`}`
`142`	`144`	`break;`
`143`	`145`
	`146`	`+caseAUTHOID:`
	`147`	`+appendStringInfo(str,"%u %s",AUTHOID,get_rolename(oid));`
	`148`	`+break;`
	`149`	`+`
`144`	`150`	`default:`
`145`	`151`	`Assert(0);`
`146`	`152`	`break;`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`
`37`	`37`	`/* Portable-related dependencies */`
`38`	`38`	`#include"catalog/namespace.h"`
	`39`	`+#include"commands/user.h"`
`39`	`40`	`#include"utils/builtins.h"`
`40`	`41`	`#include"utils/lsyscache.h"`
`41`	`42`	`#include"utils/syscache.h"`
`@@ -2896,6 +2897,16 @@ read_oid_field(char *token, int length)`
`2896`	`2897`	`}`
`2897`	`2898`	`break;`
`2898`	`2899`
	`2900`	`+caseAUTHOID:`
	`2901`	`+{`
	`2902`	`+char*rolename;`
	`2903`	`+`
	`2904`	`+token=pg_strtok(length);/ get nspname */`
	`2905`	`+rolename=nullable_string(token,length);`
	`2906`	`+oid=get_roleid(rolename);`
	`2907`	`+}`
	`2908`	`+break;`
	`2909`	`+`
`2899`	`2910`	`default:`
`2900`	`2911`	`Assert(0);`
`2901`	`2912`	`break;`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,7 @@ extern ObjectAddress RenameRole(const char oldname, const char newname);`
`42`	`42`	`externvoidDropOwnedObjects(DropOwnedStmt*stmt);`
`43`	`43`	`externvoidReassignOwnedObjects(ReassignOwnedStmt*stmt);`
`44`	`44`	`externListroleSpecsToIds(ListmemberNames);`
	`45`	`+externchar*get_rolename(Oidroid);`
	`46`	`+externOidget_roleid(constchar*rolename);`
`45`	`47`
`46`	`48`	`#endif/* USER_H */`

Comments

(0)