happy to get rid of about 70 lines of #ifdefs now that we are dropping support for pg12

Author: luss

src/errors.c

@@ -81,17 +81,11 @@ reportException(PyObject *pErrType, PyObject *pErrValue, PyObject *pErrTraceback
 	{
 		severity = ERROR;
 	}
-#if PG_VERSION_NUM >= 130000
+
 	if (errstart(severity, TEXTDOMAIN))
-#else
-	if (errstart(severity, __FILE__, __LINE__, PG_FUNCNAME_MACRO, TEXTDOMAIN))
-#endif
 	{
-#if PG_VERSION_NUM >= 130000
+
 		if (errstart(severity, TEXTDOMAIN))
-#else
-		if (errstart(severity, __FILE__, __LINE__, PG_FUNCNAME_MACRO, TEXTDOMAIN))
-#endif
 			errmsg("Error in python: %s", errName);
 		errdetail("%s", errValue);
 		errdetail_log("%s", errTraceback);
@@ -102,11 +96,7 @@ reportException(PyObject *pErrType, PyObject *pErrValue, PyObject *pErrTraceback
 	Py_DECREF(tracebackModule);
 	Py_DECREF(newline);
 	Py_DECREF(pTemp);
-#if PG_VERSION_NUM >= 130000
 		errfinish(__FILE__, __LINE__, PG_FUNCNAME_MACRO);
-#else
-		errfinish(0);
-#endif
 }
 
 void reportMulticornException(PyObject* pErrValue)
@@ -133,11 +123,7 @@ void reportMulticornException(PyObject* pErrValue)
 	PG_TRY();
 	{
 
-	#if PG_VERSION_NUM >= 130000
 		if (errstart(severity, TEXTDOMAIN))
-	#else
-		if (errstart(severity, __FILE__, __LINE__, PG_FUNCNAME_MACRO, TEXTDOMAIN))
-	#endif
 		{
 			errmsg("%s", PyString_AsString(message));
 			if (hint != NULL && hint != Py_None)
@@ -150,11 +136,7 @@ void reportMulticornException(PyObject* pErrValue)
 				char* detailstr = PyString_AsString(detail);
 				errdetail("%s", detailstr);
 			}
-	#if PG_VERSION_NUM >= 130000
 			errfinish(__FILE__, __LINE__, PG_FUNCNAME_MACRO);
-	#else
-			errfinish(0);
-	#endif
 		}
 
 	}

src/multicorn.c

@@ -26,9 +26,7 @@
 #include "utils/rel.h"
 #include "parser/parsetree.h"
 #include "fmgr.h"
-#if PG_VERSION_NUM >= 130000
 #include "common/hashfn.h" /* oid_hash */
-#endif
 
 
 PG_MODULE_MAGIC;

src/python.c

@@ -529,37 +529,25 @@ compareColumns(List *columns1, List *columns2)
 		{
 			return false;
 		}
-#if PG_VERSION_NUM >= 130000
+
 		cell1 = lnext(coldef1, cell1);
 		cell2 = lnext(coldef2, cell2);
-#else
-		cell1 = lnext(cell1);
-		cell2 = lnext(cell2);
-#endif
 		/* Compare typoid */
 		if (((Const *) (lfirst(cell1)))->constvalue != ((Const *) lfirst(cell2))->constvalue)
 		{
 			return false;
 		}
-#if PG_VERSION_NUM >= 130000
+
 		cell1 = lnext(coldef1, cell1);
 		cell2 = lnext(coldef2, cell2);
-#else
-		cell1 = lnext(cell1);
-		cell2 = lnext(cell2);
-#endif
 		/* Compare typmod */
 		if (((Const *) (lfirst(cell1)))->constvalue != ((Const *) lfirst(cell2))->constvalue)
 		{
 			return false;
 		}
-#if PG_VERSION_NUM >= 130000
+
 		cell1 = lnext(coldef1, cell1);
 		cell2 = lnext(coldef2, cell2);
-#else
-		cell1 = lnext(cell1);
-		cell2 = lnext(cell2);
-#endif
 		/* Compare column options */
 		if (!compareOptions(lfirst(cell1), lfirst(cell2)))
 		{
@@ -954,11 +942,7 @@ execute(ForeignScanState *node, ExplainState *es)
 				{
 					expr_state = ExecInitExpr(((MulticornParamQual *) qual)->expr,
 											(PlanState *) node);
-					#if PG_VERSION_NUM >= 100000
 					newqual->value = ExecEvalExpr(expr_state, econtext, &isNull);
-					#else
-					newqual->value = ExecEvalExpr(expr_state, econtext, &isNull, NULL);
-					#endif
 				}
 				newqual->base.typeoid = ((Param*) ((MulticornParamQual *) qual)->expr)->paramtype;
 				newqual->isnull = isNull;

src/query.c

@@ -870,49 +870,28 @@ deserializeDeparsedSortGroup(List *items)
 		ListCell *lc;
 		MulticornDeparsedSortGroup *key =
 			palloc0(sizeof(MulticornDeparsedSortGroup));
-#if PG_VERSION_NUM >= 130000
+
 		List *list = lfirst(k);
-#endif
 
 		lc = list_head(lfirst(k));
 		key->attname = (Name) strdup(strVal(lfirst(lc)));
 
-#if PG_VERSION_NUM >= 130000
 		lc = lnext(list, lc);
-#else
-		lc = lnext(lc);
-#endif
 		key->attnum = (int) intVal(lfirst(lc));
 
-#if PG_VERSION_NUM >= 130000
 		lc = lnext(list, lc);
-#else
-		lc = lnext(lc);
-#endif
 		key->reversed = (bool) intVal(lfirst(lc));
 
-#if PG_VERSION_NUM >= 130000
 		lc = lnext(list, lc);
-#else
-		lc = lnext(lc);
-#endif
 		key->nulls_first = (bool) intVal(lfirst(lc));
 
-#if PG_VERSION_NUM >= 130000
 		lc = lnext(list, lc);
-#else
-		lc = lnext(lc);
-#endif
 		if(lfirst(lc) != NULL)
 			key->collate = (Name) strdup(strVal(lfirst(lc)));
 		else
 			key->collate = NULL;
 
-#if PG_VERSION_NUM >= 130000
 		lc = lnext(list, lc);
-#else
-		lc = lnext(lc);
-#endif
 		key->key = (PathKey *) lfirst(lc);
 
 		result = lappend(result, key);

src/utils.c

@@ -81,11 +81,8 @@ log_to_postgres(PyObject *self, PyObject *args, PyObject *kwargs)
 	}
 	hint = PyDict_GetItemString(kwargs, "hint");
 	detail = PyDict_GetItemString(kwargs, "detail");
-#if PG_VERSION_NUM >= 130000
+
 	if (errstart(severity, TEXTDOMAIN))
-#else
-	if (errstart(severity, __FILE__, __LINE__, PG_FUNCNAME_MACRO, TEXTDOMAIN))
-#endif
 	{
 		errmsg("%s", message);
 		if (hint != NULL && hint != Py_None)
@@ -100,11 +97,7 @@ log_to_postgres(PyObject *self, PyObject *args, PyObject *kwargs)
 		}
 		Py_DECREF(args);
 		Py_DECREF(kwargs);
-#if PG_VERSION_NUM >= 130000
 		errfinish(__FILE__, __LINE__, PG_FUNCNAME_MACRO);
-#else
-		errfinish(0);
-#endif
 	}
 	else
 	{