handle wholerow references as well

Author: funbringer

expected/pathman_rebuild_updates.out

@@ -83,6 +83,25 @@ RETURNING t1.*, t1.tableoid::REGCLASS;
                Filter: (val = 101)
 (6 rows)
 
+EXPLAIN (COSTS OFF) UPDATE test_updates.test SET b = 0
+WHERE val = 101 AND test >= (100, 8)
+RETURNING *, tableoid::REGCLASS;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Update on test_11
+   ->  Seq Scan on test_11
+         Filter: (((test_11.*)::test_updates.test >= ROW(100, 8)) AND (val = 101))
+(3 rows)
+
+/* execute this one */
+UPDATE test_updates.test SET b = 0
+WHERE val = 101 AND test >= (100, -1)
+RETURNING test;
+  test   
+---------
+ (101,0)
+(1 row)
+
 DROP TABLE test_updates.test_dummy;
 DROP SCHEMA test_updates CASCADE;
 NOTICE:  drop cascades to 13 other objects

sql/pathman_rebuild_updates.sql

@@ -45,6 +45,15 @@ FROM test_updates.test_dummy t2
 WHERE t1.val = 101 AND t1.val = t2.val
 RETURNING t1.*, t1.tableoid::REGCLASS;
 
+EXPLAIN (COSTS OFF) UPDATE test_updates.test SET b = 0
+WHERE val = 101 AND test >= (100, 8)
+RETURNING *, tableoid::REGCLASS;
+
+/* execute this one */
+UPDATE test_updates.test SET b = 0
+WHERE val = 101 AND test >= (100, -1)
+RETURNING test;
+
 DROP TABLE test_updates.test_dummy;
 
 

src/planner_tree_modification.c

@@ -96,7 +96,9 @@ typedef struct
 typedef struct
 {
 	Index	child_varno;
-	Oid		parent_relid;
+	Oid		parent_relid,
+			parent_reltype,
+			child_reltype;
 	List   *translated_vars;
 } adjust_appendrel_varnos_cxt;
 
@@ -483,9 +485,11 @@ handle_modification_query(Query *parse, transform_query_cxt *context)
 			if (!inh_translation_list_is_trivial(translated_vars))
 			{
 				/* Translate varnos for this child */
-				aav_cxt.child_varno = result_rti;
-				aav_cxt.parent_relid = parent;
-				aav_cxt.translated_vars = translated_vars;
+				aav_cxt.child_varno		= result_rti;
+				aav_cxt.parent_relid	= parent;
+				aav_cxt.parent_reltype	= RelationGetDescr(parent_rel)->tdtypeid;
+				aav_cxt.child_reltype	= RelationGetDescr(child_rel)->tdtypeid;
+				aav_cxt.translated_vars	= translated_vars;
 				adjust_appendrel_varnos((Node *) parse, &aav_cxt);
 
 				/* Translate column privileges for this child */
@@ -612,24 +616,43 @@ adjust_appendrel_varnos(Node *node, adjust_appendrel_varnos_cxt *context)
 	{
 		Var *var = (Var *) node;
 
-		/* Don't transform system columns & other relations' Vars */
-		if (var->varattno > 0 && var->varno == context->child_varno)
+		/* See adjust_appendrel_attrs_mutator() */
+		if (var->varno == context->child_varno)
 		{
-			Var *child_var;
+			if (var->varattno > 0)
+			{
+				Var *child_var;
 
-			var = copyObject(var);
+				var = copyObject(var);
 
-			if (var->varattno > list_length(context->translated_vars))
-				elog(ERROR, "attribute %d of relation \"%s\" does not exist",
-					 var->varattno, get_rel_name(context->parent_relid));
+				if (var->varattno > list_length(context->translated_vars))
+					elog(ERROR, "attribute %d of relation \"%s\" does not exist",
+						 var->varattno, get_rel_name(context->parent_relid));
 
-			child_var = list_nth(context->translated_vars, var->varattno - 1);
-			if (!child_var)
-				elog(ERROR, "attribute %d of relation \"%s\" does not exist",
-					 var->varattno, get_rel_name(context->parent_relid));
+				child_var = list_nth(context->translated_vars, var->varattno - 1);
+				if (!child_var)
+					elog(ERROR, "attribute %d of relation \"%s\" does not exist",
+						 var->varattno, get_rel_name(context->parent_relid));
 
-			/* Transform attribute number */
-			var->varattno = child_var->varattno;
+				/* Transform attribute number */
+				var->varattno = child_var->varattno;
+			}
+			else if (var->varattno == 0)
+			{
+				ConvertRowtypeExpr *r = makeNode(ConvertRowtypeExpr);
+
+				Assert(var->vartype = context->parent_reltype);
+
+				r->arg = (Expr *) var;
+				r->resulttype = context->parent_reltype;
+				r->convertformat = COERCE_IMPLICIT_CAST;
+				r->location = -1;
+
+				/* Make sure the Var node has the right type ID, too */
+				var->vartype = context->child_reltype;
+
+				return (Node *) r;
+			}
 		}
 
 		return (Node *) var;