Add AUTHOID portability

danolivo · danolivo · commit f3cc97892acd · 2019-01-29T13:04:04.000+05:00
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
@@ -323,7 +323,7 @@ configure_remote_session(PGconn *conn)
 	 * Temporarily switch off this option. Not all regression tests passes
 	 * correctly without including 'public' value in default search path.
 	 */
-	do_sql_command(conn, "SET search_path = pg_catalog");
+	/* do_sql_command(conn, "SET search_path = pg_catalog"); */
 
 	/*
 	 * Set remote timezone; this is basically just cosmetic, since all
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
@@ -1130,6 +1130,41 @@ DropRole(DropRoleStmt *stmt)
 	heap_close(pg_authid_rel, NoLock);
 }
 
+char *
+get_rolename(Oid roleid)
+{
+	HeapTuple	tuple;
+	char		*rolename;
+
+	tuple = SearchSysCache1(AUTHOID, ObjectIdGetDatum(roleid));
+
+	if (!HeapTupleIsValid(tuple))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("role with oid\"%d\" does not exist", roleid)));
+
+	rolename = strdup(NameStr(((Form_pg_authid) GETSTRUCT(tuple))->rolname));
+	ReleaseSysCache(tuple);
+	return rolename;
+}
+
+Oid
+get_roleid(const char *rolename)
+{
+	HeapTuple	tuple;
+	Oid			roleid;
+
+	tuple = SearchSysCache1(AUTHNAME, CStringGetDatum(rolename));
+
+	if (!HeapTupleIsValid(tuple))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("role \"%s\" does not exist", rolename)));
+
+	roleid = HeapTupleGetOid(tuple);
+	ReleaseSysCache(tuple);
+	return roleid;
+}
 /*
  * Rename role
  */
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
@@ -25,6 +25,7 @@
 
 #include <ctype.h>
 
+#include "commands/user.h"
 #include "lib/stringinfo.h"
 #include "nodes/extensible.h"
 #include "nodes/plannodes.h"
@@ -35,8 +36,9 @@
 #include "utils/syscache.h"
 
 #define NSP_NAME(nspoid) (get_namespace_name(nspoid))
-#define OID_TYPES_NUM	(5)
-static const Oid oid_types[OID_TYPES_NUM] = {RELOID, TYPEOID, PROCOID, COLLOID, OPEROID};
+#define OID_TYPES_NUM	(6)
+static const Oid oid_types[OID_TYPES_NUM] = {RELOID, TYPEOID, PROCOID, COLLOID,
+											OPEROID, AUTHOID};
 
 static bool portable_output = false;
 void
@@ -141,6 +143,10 @@ write_oid_field(StringInfo str, Oid oid)
 	}
 		break;
 
+	case AUTHOID:
+		appendStringInfo(str, "%u %s", AUTHOID, get_rolename(oid));
+		break;
+
 	default:
 		Assert(0);
 		break;
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
@@ -36,6 +36,7 @@
 
 /* Portable-related dependencies */
 #include "catalog/namespace.h"
+#include "commands/user.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
@@ -2896,6 +2897,16 @@ read_oid_field(char **token, int *length)
 	}
 		break;
 
+	case AUTHOID:
+	{
+		char	*rolename;
+
+		*token = pg_strtok(length); /* get nspname */
+		rolename = nullable_string(*token, *length);
+		oid = get_roleid(rolename);
+	}
+		break;
+
 	default:
 		Assert(0);
 		break;
diff --git a/src/include/commands/user.h b/src/include/commands/user.h
@@ -42,5 +42,7 @@ extern ObjectAddress RenameRole(const char *oldname, const char *newname);
 extern void DropOwnedObjects(DropOwnedStmt *stmt);
 extern void ReassignOwnedObjects(ReassignOwnedStmt *stmt);
 extern List *roleSpecsToIds(List *memberNames);
+extern char *get_rolename(Oid roid);
+extern Oid get_roleid(const char *rolename);
 
 #endif   /* USER_H */
