postgrespro
diff --git a/‎src/partition_creation.c
Copy file name to clipboardExpand all lines: src/partition_creation.c
+17Lines changed: 17 additions & 0 deletions b/‎src/partition_creation.c
Copy file name to clipboardExpand all lines: src/partition_creation.c
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎src/pl_funcs.c
Copy file name to clipboardExpand all lines: src/pl_funcs.c
+7Lines changed: 7 additions & 0 deletions b/‎src/pl_funcs.c
Copy file name to clipboardExpand all lines: src/pl_funcs.c
+7Lines changed: 7 additions & 0 deletions
@@ -112,6 +112,23 @@ create_single_range_partition_internal(Oid parent_relid,
 	init_callback_params	callback_params;
 	List				   *trigger_columns = NIL;
 	Node				   *expr;
+	Datum		values[Natts_pathman_config];
+	bool		isnull[Natts_pathman_config];
+
+
+	/*
+	 * Sanity check. Probably needed only if some absurd init_callback
+	 * decides to drop the table while we are creating partitions.
+	 * It seems much better to use prel cache here, but this doesn't work
+	 * because it regards tables with no partitions as not partitioned at all
+	 * (build_pathman_relation_info returns NULL), and if I comment out that,
+	 * tests fail for not immediately obvious reasons. Don't want to dig
+	 * into this now.
+	 */
+	if (!pathman_config_contains_relation(parent_relid, values, isnull, NULL, NULL))
+	{
+		elog(ERROR, "Can't create range partition: relid %u doesn't exist or not partitioned", parent_relid);
+	}
 
 	/* Generate a name if asked to */
 	if (!partition_rv)
 
@@ -252,6 +252,11 @@ show_cache_stats_internal(PG_FUNCTION_ARGS)
 
 		funccxt = SRF_FIRSTCALL_INIT();
 
+		if (!TopPathmanContext)
+		{
+			elog(ERROR, "pg_pathman's memory contexts are not initialized yet");
+		}
+
 		old_mcxt = MemoryContextSwitchTo(funccxt->multi_call_memory_ctx);
 
 		usercxt = (show_cache_stats_cxt *) palloc(sizeof(show_cache_stats_cxt));
@@ -893,6 +898,8 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 		}
 	}
 
+	CacheInvalidateRelcacheByRelid(relid);
+
 	PG_RETURN_BOOL(true);
 }
Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,11 @@ show_cache_stats_internal(PG_FUNCTION_ARGS)`
`252`	`252`
`253`	`253`	`funccxt = SRF_FIRSTCALL_INIT();`
`254`	`254`
	`255`	`+ if (!TopPathmanContext)`
	`256`	`+ {`
	`257`	`+ elog(ERROR, "pg_pathman's memory contexts are not initialized yet");`
	`258`	`+ }`
	`259`	`+`
`255`	`260`	`old_mcxt = MemoryContextSwitchTo(funccxt->multi_call_memory_ctx);`
`256`	`261`
`257`	`262`	`usercxt = (show_cache_stats_cxt *) palloc(sizeof(show_cache_stats_cxt));`
`@@ -893,6 +898,8 @@ add_to_pathman_config(PG_FUNCTION_ARGS)`
`893`	`898`	`}`
`894`	`899`	`}`
`895`	`900`
	`901`	`+ CacheInvalidateRelcacheByRelid(relid);`
	`902`	`+`
`896`	`903`	`PG_RETURN_BOOL(true);`
`897`	`904`	`}`
`898`	`905`