1 files changed, 21 insertions, 10 deletions

diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index c8d7d9c21b3..c3ede233bcd 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -6739,11 +6739,12 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
 		int			varno = ((RangeTblRef *) jtnode)->rtindex;
 		RangeTblEntry *rte = rt_fetch(varno, query->rtable);
 		char	   *refname = get_rtable_name(varno, context);
-		bool		gavealias = false;
+		bool		printalias;
 
 		if (rte->lateral)
 			appendStringInfoString(buf, "LATERAL ");
 
+		/* Print the FROM item proper */
 		switch (rte->rtekind)
 		{
 			case RTE_RELATION:
@@ -6776,11 +6777,12 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
 				break;
 		}
 
+		/* Print the relation alias, if needed */
+		printalias = false;
 		if (rte->alias != NULL)
 		{
 			/* Always print alias if user provided one */
-			appendStringInfo(buf, " %s", quote_identifier(refname));
-			gavealias = true;
+			printalias = true;
 		}
 		else if (rte->rtekind == RTE_RELATION)
 		{
@@ -6790,10 +6792,7 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
 			 * resolve a conflict).
 			 */
 			if (strcmp(refname, get_relation_name(rte->relid)) != 0)
-			{
-				appendStringInfo(buf, " %s", quote_identifier(refname));
-				gavealias = true;
-			}
+				printalias = true;
 		}
 		else if (rte->rtekind == RTE_FUNCTION)
 		{
@@ -6802,16 +6801,28 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
 			 * renaming of the function and/or instability of the
 			 * FigureColname rules for things that aren't simple functions.
 			 */
-			appendStringInfo(buf, " %s", quote_identifier(refname));
-			gavealias = true;
+			printalias = true;
+		}
+		else if (rte->rtekind == RTE_CTE)
+		{
+			/*
+			 * No need to print alias if it's same as CTE name (this would
+			 * normally be the case, but not if set_rtable_names had to
+			 * resolve a conflict).
+			 */
+			if (strcmp(refname, rte->ctename) != 0)
+				printalias = true;
 		}
+		if (printalias)
+			appendStringInfo(buf, " %s", quote_identifier(refname));
 
+		/* Print the column definitions or aliases, if needed */
 		if (rte->rtekind == RTE_FUNCTION)
 		{
 			if (rte->funccoltypes != NIL)
 			{
 				/* Function returning RECORD, reconstruct the columndefs */
-				if (!gavealias)
+				if (!printalias)
 					appendStringInfo(buf, " AS ");
 				get_from_clause_coldeflist(rte->eref->colnames,
 										   rte->funccoltypes,