X-Git-Url: http://sigaev.ru/git/gitweb.cgi?p=plantuner.git;a=blobdiff_plain;f=plantuner.c;h=b22ef9cf00a6a80f84d2cefa23e96b91337ce2d5;hp=f87dcea21ffe4202225b5a9a3241d28880e661d1;hb=HEAD;hpb=800d81bc85da64ff3ef66e12aed1d4e1e54fc006

diff --git a/plantuner.c b/plantuner.c
index f87dcea..e454698 100644
--- a/plantuner.c
+++ b/plantuner.c
@@ -35,6 +35,9 @@
 #include <access/xact.h>
 #include <catalog/namespace.h>
 #include <catalog/pg_class.h>
+#if PG_VERSION_NUM >= 160000
+#include <nodes/miscnodes.h>
+#endif
 #include <nodes/pg_list.h>
 #include <optimizer/plancat.h>
 #include <storage/bufmgr.h>
@@ -99,7 +102,12 @@ indexesAssign(const char * newval, bool doit, GucSource source,
 	 * follow work could be done only in normal processing because of
 	 * accsess to system catalog
 	 */
-	if (MyBackendId == InvalidBackendId || !IsUnderPostmaster ||
+#if PG_VERSION_NUM >= 170000
+	if (MyProcNumber == INVALID_PROC_NUMBER ||
+#else
+	if (MyBackendId == InvalidBackendId ||
+#endif
+		!IsUnderPostmaster ||
 		!IsTransactionState())
 	{
 		/* reset init state */
@@ -149,9 +157,23 @@ indexesAssign(const char * newval, bool doit, GucSource source,
 	{
 		char	*curname = (char *) lfirst(l);
 #if PG_VERSION_NUM >= 90200
-		Oid		indexOid = RangeVarGetRelid(
-				makeRangeVarFromNameList(stringToQualifiedNameList(curname)),
-											NoLock, true);
+		List	*cur_namelist;
+		Oid		indexOid;
+
+#if PG_VERSION_NUM >= 160000
+		ErrorSaveContext escontext = {T_ErrorSaveContext};
+
+		cur_namelist = stringToQualifiedNameList(curname, (Node *) &escontext);
+
+		/* bad name list syntax */
+		if (cur_namelist == NIL)
+			continue;
+#else
+		cur_namelist = stringToQualifiedNameList(curname);
+#endif
+
+		indexOid = RangeVarGetRelid(makeRangeVarFromNameList(cur_namelist),
+									NoLock, true);
 #else
 		Oid		indexOid = RangeVarGetRelid(
 				makeRangeVarFromNameList(stringToQualifiedNameList(curname)),