postgrespro
diff --git a/‎expected/pathman_basic.out
Copy file name to clipboardExpand all lines: expected/pathman_basic.out
+19-1Lines changed: 19 additions & 1 deletion b/‎expected/pathman_basic.out
Copy file name to clipboardExpand all lines: expected/pathman_basic.out
+19-1Lines changed: 19 additions & 1 deletion
diff --git a/‎sql/pathman_basic.sql
Copy file name to clipboardExpand all lines: sql/pathman_basic.sql
+8Lines changed: 8 additions & 0 deletions b/‎sql/pathman_basic.sql
Copy file name to clipboardExpand all lines: sql/pathman_basic.sql
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎src/hooks.c
Copy file name to clipboardExpand all lines: src/hooks.c
+8-2Lines changed: 8 additions & 2 deletions b/‎src/hooks.c
Copy file name to clipboardExpand all lines: src/hooks.c
+8-2Lines changed: 8 additions & 2 deletions
@@ -1804,7 +1804,25 @@ ORDER BY partition;
 
 DROP TABLE test.provided_part_names CASCADE;
 NOTICE:  drop cascades to 2 other objects
+/* test preventing of double expand of inherited tables */
+CREATE TABLE test.mixinh_parent (id INT PRIMARY KEY);
+CREATE TABLE test.mixinh_child1 () INHERITS (test.mixinh_parent);
+SELECT create_range_partitions('test.mixinh_child1', 'id', 1, 10, 1);
+ create_range_partitions 
+-------------------------
+                       1
+(1 row)
+
+INSERT  INTO test.mixinh_child1 VALUES (1);
+SELECT * FROM test.mixinh_child1;
+ id 
+----
+  1
+(1 row)
+
+SELECT * FROM test.mixinh_parent;
+ERROR:  could not expand partitioned table "mixinh_child1"
 DROP SCHEMA test CASCADE;
-NOTICE:  drop cascades to 28 other objects
+NOTICE:  drop cascades to 32 other objects
 DROP EXTENSION pg_pathman CASCADE;
 DROP SCHEMA pathman CASCADE;
@@ -546,6 +546,14 @@ ORDER BY partition;
 
 DROP TABLE test.provided_part_names CASCADE;
 
+/* test preventing of double expand of inherited tables */
+CREATE TABLE test.mixinh_parent (id INT PRIMARY KEY);
+CREATE TABLE test.mixinh_child1 () INHERITS (test.mixinh_parent);
+SELECT create_range_partitions('test.mixinh_child1', 'id', 1, 10, 1);
+INSERT  INTO test.mixinh_child1 VALUES (1);
+SELECT * FROM test.mixinh_child1;
+SELECT * FROM test.mixinh_parent;
+
 DROP SCHEMA test CASCADE;
 DROP EXTENSION pg_pathman CASCADE;
 DROP SCHEMA pathman CASCADE;
@@ -406,10 +406,16 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 			 * and added its children to the plan.
 			 */
 			if (appinfo->child_relid == rti &&
-				child_oid == parent_oid &&
 				OidIsValid(appinfo->parent_reloid))
 			{
-				goto cleanup;
+				if (child_oid == parent_oid)
+					goto cleanup;
+				else if (!has_pathman_relation_info(parent_oid))
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("could not expand partitioned table \"%s\"",
+									get_rel_name(child_oid)),
+							 errhint("Do not use inheritance and pg_pathman partitions together")));
 			}
 		}
 	}
Original file line number	Diff line number	Diff line change
`@@ -406,10 +406,16 @@ pathman_rel_pathlist_hook(PlannerInfo *root,`
`406`	`406`	`* and added its children to the plan.`
`407`	`407`	`*/`
`408`	`408`	`if (appinfo->child_relid == rti &&`
`409`		`- child_oid == parent_oid &&`
`410`	`409`	`OidIsValid(appinfo->parent_reloid))`
`411`	`410`	`{`
`412`		`- goto cleanup;`
	`411`	`+ if (child_oid == parent_oid)`
	`412`	`+ goto cleanup;`
	`413`	`+ else if (!has_pathman_relation_info(parent_oid))`
	`414`	`+ ereport(ERROR,`
	`415`	`+ (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`416`	`+ errmsg("could not expand partitioned table \"%s\"",`
	`417`	`+ get_rel_name(child_oid)),`
	`418`	`+ errhint("Do not use inheritance and pg_pathman partitions together")));`
`413`	`419`	`}`
`414`	`420`	`}`
`415`	`421`	`}`