From 022ca99a6b274939d56ee2fb0ff6db11890280c6 Mon Sep 17 00:00:00 2001
From: naisila <nicypp@gmail.com>
Date: Wed, 10 Jul 2024 12:21:24 +0200
Subject: [PATCH] getIdentitySequence now uses Relation instead of relation_id

Relevant PG commit:
509199587df73f06eda898ae13284292f4ae573a
https://github.com/postgres/postgres/commit/509199587df73f06eda898ae13284292f4ae573a
---
 src/backend/distributed/deparser/citus_ruleutils.c          | 3 ++-
 src/backend/distributed/worker/worker_data_fetch_protocol.c | 3 ++-
 src/include/pg_version_compat.h                             | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/backend/distributed/deparser/citus_ruleutils.c b/src/backend/distributed/deparser/citus_ruleutils.c
index 87868238c..6e61564b8 100644
--- a/src/backend/distributed/deparser/citus_ruleutils.c
+++ b/src/backend/distributed/deparser/citus_ruleutils.c
@@ -395,7 +395,8 @@ pg_get_tableschemadef_string(Oid tableRelationId, IncludeSequenceDefaults
 			if (attributeForm->attidentity && includeIdentityDefaults)
 			{
 				bool missing_ok = false;
-				Oid seqOid = getIdentitySequence(RelationGetRelid(relation),
+				Oid seqOid = getIdentitySequence(identitySequenceRelation_compat(
+													 relation),
 												 attributeForm->attnum, missing_ok);
 
 				if (includeIdentityDefaults == INCLUDE_IDENTITY)
diff --git a/src/backend/distributed/worker/worker_data_fetch_protocol.c b/src/backend/distributed/worker/worker_data_fetch_protocol.c
index d2b60aa50..0370001ee 100644
--- a/src/backend/distributed/worker/worker_data_fetch_protocol.c
+++ b/src/backend/distributed/worker/worker_data_fetch_protocol.c
@@ -170,7 +170,8 @@ worker_adjust_identity_column_seq_ranges(PG_FUNCTION_ARGS)
 
 		if (attributeForm->attidentity)
 		{
-			Oid sequenceOid = getIdentitySequence(tableRelationId,
+			Oid sequenceOid = getIdentitySequence(identitySequenceRelation_compat(
+													  tableRelation),
 												  attributeForm->attnum,
 												  missingSequenceOk);
 
diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h
index b3c018c35..c47c38200 100644
--- a/src/include/pg_version_compat.h
+++ b/src/include/pg_version_compat.h
@@ -100,6 +100,7 @@ getStxstattarget_compat(HeapTuple tup)
 
 #define WaitEventSetTracker_compat CurrentResourceOwner
 
+#define identitySequenceRelation_compat(a) (a)
 #else
 
 #include "access/htup_details.h"
@@ -123,6 +124,8 @@ getStxstattarget_compat(HeapTuple tup)
 
 #define WaitEventSetTracker_compat CurrentMemoryContext
 
+#define identitySequenceRelation_compat(a) (RelationGetRelid(a))
+
 #endif
 
 #if PG_VERSION_NUM >= PG_VERSION_16