Merge branch 'master' into rel_future_beta

funbringer · funbringer · commit d62f80e6bfc0 · 2017-05-11T17:18:00.000+03:00
diff --git a/META.json b/META.json
@@ -0,0 +1,40 @@
+{
+   "name": "pg_pathman",
+   "abstract": "Partitioning tool",
+   "description": "The `pg_pathman` module provides optimized partitioning mechanism and functions to manage partitions.",
+   "version": "1.3.1",
+   "maintainer": [
+      "Ildar Musin <i.musin@postgrespro.ru>",
+      "Dmitry Ivanov <d.ivanov@postgrespro.ru>",
+      "Ildus Kurbangaliev <i.kurbangaliev@postgrespro.ru>"
+   ],
+   "license": "postgresql",
+   "resources": {
+      "bugtracker": {
+         "web": "https://github.com/postgrespro/pg_pathman/issues"
+      },
+      "repository": {
+        "url":  "git://github.com:postgrespro/pg_pathman.git",
+        "web":  "https://github.com/postgrespro/pg_pathman",
+        "type": "git"
+      }
+   },
+   "generated_by": "Ildar Musin",
+   "provides": {
+       "pg_pathman": {
+           "file": "pg_pathman--1.3.sql",
+           "docfile": "README.md",
+           "version": "1.3.1",
+           "abstract": "Partitioning tool"
+      }
+   },
+   "meta-spec": {
+      "version": "1.0.0",
+      "url": "http://pgxn.org/meta/spec.txt"
+   },
+   "tags": [
+      "partitioning",
+      "partition",
+      "optimization"
+   ]
+}
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -266,6 +266,10 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 	appinfo->child_relid	= childRTindex;
 	appinfo->parent_reloid	= parent_rte->relid;
 
+	/* Store table row types for wholerow references */
+	appinfo->parent_reltype = RelationGetDescr(parent_relation)->tdtypeid;
+	appinfo->child_reltype  = RelationGetDescr(child_relation)->tdtypeid;
+
 	make_inh_translation_list(parent_relation, child_relation, childRTindex,
 							  &appinfo->translated_vars);
 
