Modifies fix for #2164 : Removes the macro but this fix will only provide compatbility going forward from postgreSQL 18 onwards.

Author: sanchayanghosh

src/backend/executor/cypher_delete.c

@@ -57,11 +57,8 @@ const CustomExecMethods cypher_delete_exec_methods = {DELETE_SCAN_STATE_NAME,
                                                       NULL,
                                                       NULL};
 
-#if PG_VERSION_NUM >= 18000 
 #define TUPLE_DESC_ATTR_TYPE_ID TupleDescAttr(tupleDescriptor, entity_position - 1)->atttypid
-#else
-#define TUPLE_DESC_ATTR_TYPE_ID tupleDescriptor->attrs[entity_position - 1]->atttypid
-#endif
+
 /*
  * Initialization at the beginning of execution. Setup the child node,
  * setup its scan tuple slot and projection info, expression context,

src/backend/executor/cypher_set.c

@@ -51,13 +51,9 @@ const CustomExecMethods cypher_set_exec_methods = {SET_SCAN_STATE_NAME,
                                                       NULL,
                                                       NULL};
 
-#if PG_VERSION_NUM >= 18000 
 #define TUPLE_DESC_ATTR_TYPE_ID TupleDescAttr(scanTupleSlot->tts_tupleDescriptor, i)->atttypid
 #define TUPLE_DESC_ATTR_TYPE_ID_ENTITY TupleDescAttr(scanTupleSlot->tts_tupleDescriptor, update_item->entity_position - 1)->atttypid
-#else
-#define TUPLE_DESC_ATTR_TYPE_ID scanTupleSlot->tts_tupleDescriptor->attrs[i]->atttypid
-#define TUPLE_DESC_ATTR_TYPE_ID_ENTITY scanTupleSlot->tts_tupleDescriptor->attrs[update_item->entity_position - 1]->atttypid
-#endif
+
 static void begin_cypher_set(CustomScanState *node, EState *estate,
                              int eflags)
 {

src/backend/parser/cypher_clause.c

@@ -2557,17 +2557,10 @@ static void get_res_cols(ParseState *pstate, ParseNamespaceItem *l_pnsi,
     List *colnames = NIL;
     List *colvars = NIL;
 
-    #if PG_VERSION_NUM >= 180000
     expandRTE(l_pnsi->p_rte, l_pnsi->p_rtindex, 0, VAR_RETURNING_DEFAULT, -1, false,
               &l_colnames, &l_colvars);
     expandRTE(r_pnsi->p_rte, r_pnsi->p_rtindex, 0, VAR_RETURNING_DEFAULT, -1, false,
               &r_colnames, &r_colvars);
-    #else
-    expandRTE(l_pnsi->p_rte, l_pnsi->p_rtindex, 0, -1, false,
-              &l_colnames, &l_colvars);
-    expandRTE(r_pnsi->p_rte, r_pnsi->p_rtindex, 0, -1, false,
-              &r_colnames, &r_colvars);
-    #endif 
 
     /* add in all colnames and colvars from the l_rte. */
     *res_colnames = list_concat(*res_colnames, l_colnames);