Merge branch 'master' into stable

Maxim Orlov · Maxim Orlov · commit edc46b63cb7f · 2020-10-08T16:10:34.000+03:00
diff --git a/pg_variables.c b/pg_variables.c
@@ -2106,8 +2106,11 @@ static void
 compatibility_check(void)
 {
 #ifdef PGPRO_EE
-	if (getNestLevelATX() != 0)
-		elog(ERROR, "pg_variable extension is not compatible with autonomous transactions and connection pooling");
+#	if (PG_VERSION_NUM < 130000) || \
+		((PG_VERSION_NUM >= 130000) && (defined PGPRO_FEATURE_ATX))
+		if (getNestLevelATX() != 0)
+				elog(ERROR, "pg_variable extension is not compatible with autonomous transactions and connection pooling");
+#	endif
 #endif
 }
 
diff --git a/pg_variables.h b/pg_variables.h
diff --git a/pg_variables_record.c b/pg_variables_record.c
@@ -11,7 +11,18 @@
 #include "funcapi.h"
 
 #include "access/htup_details.h"
-#include "access/tuptoaster.h"
+/*
+ * See https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=8b94dab06617ef80a0901ab103ebd8754427ef
+ *
+ * Split tuptoaster.c into three separate files.
+ */
+#if PG_VERSION_NUM >= 130000
+#	include "access/detoast.h"
+#	include "access/heaptoast.h"
+#else
+#	include "access/tuptoaster.h"
+#endif
+
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"

Original file line number	Diff line number	Diff line change
`@@ -2106,8 +2106,11 @@ static void`
`2106`	`2106`	`compatibility_check(void)`
`2107`	`2107`	`{`
`2108`	`2108`	`#ifdef PGPRO_EE`
`2109`		`- if (getNestLevelATX() != 0)`
`2110`		`- elog(ERROR, "pg_variable extension is not compatible with autonomous transactions and connection pooling");`
	`2109`	`+# if (PG_VERSION_NUM < 130000) \|\| \`
	`2110`	`+ ((PG_VERSION_NUM >= 130000) && (defined PGPRO_FEATURE_ATX))`
	`2111`	`+ if (getNestLevelATX() != 0)`
	`2112`	`+ elog(ERROR, "pg_variable extension is not compatible with autonomous transactions and connection pooling");`
	`2113`	`+# endif`
`2111`	`2114`	`#endif`
`2112`	`2115`	`}`
`2113`	`2116`