postgrespro
diff --git a/‎src/backend/catalog/heap.c
Lines changed: 3 additions & 3 deletions b/‎src/backend/catalog/heap.c
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/backend/commands/explain.c
Lines changed: 6 additions & 5 deletions b/‎src/backend/commands/explain.c
Lines changed: 6 additions & 5 deletions
diff --git a/‎src/backend/commands/typecmds.c
Lines changed: 2 additions & 2 deletions b/‎src/backend/commands/typecmds.c
Lines changed: 2 additions & 2 deletions
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.227 2002/09/18 21:35:20 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.228 2002/09/19 22:48:33 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1179,7 +1179,7 @@ StoreAttrDefault(Relation rel, AttrNumber attnum, char *adbin)
 	adsrc = deparse_expression(expr,
 						deparse_context_for(RelationGetRelationName(rel),
 											RelationGetRelid(rel)),
-							   false);
+							   false, false);
 
 	/*
 	 * Make the pg_attrdef entry.
@@ -1277,7 +1277,7 @@ StoreRelCheck(Relation rel, char *ccname, char *ccbin)
 	ccsrc = deparse_expression(expr,
 						deparse_context_for(RelationGetRelationName(rel),
 											RelationGetRelid(rel)),
-							   false);
+							   false, false);
 
 	/*
 	 * Find columns of rel that are used in ccbin
 
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.87 2002/09/04 20:31:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.88 2002/09/19 22:48:33 tgl Exp $
  *
  */
 
@@ -682,7 +682,7 @@ show_scan_qual(List *qual, bool is_or_qual, const char *qlabel,
 									   NIL);
 
 	/* Deparse the expression */
-	exprstr = deparse_expression(node, context, (outercontext != NULL));
+	exprstr = deparse_expression(node, context, (outercontext != NULL), false);
 
 	/* And add to str */
 	for (i = 0; i < indent; i++)
@@ -729,7 +729,7 @@ show_upper_qual(List *qual, const char *qlabel,
 
 	/* Deparse the expression */
 	node = (Node *) make_ands_explicit(qual);
-	exprstr = deparse_expression(node, context, (inner_plan != NULL));
+	exprstr = deparse_expression(node, context, (inner_plan != NULL), false);
 
 	/* And add to str */
 	for (i = 0; i < indent; i++)
@@ -795,8 +795,9 @@ show_sort_keys(List *tlist, int nkeys, const char *qlabel,
 
 			if (target->resdom->reskey == keyno)
 			{
-				/* Deparse the expression */
-				exprstr = deparse_expression(target->expr, context, useprefix);
+				/* Deparse the expression, showing any top-level cast */
+				exprstr = deparse_expression(target->expr, context,
+											 useprefix, true);
 				/* And add to str */
 				if (keyno > 1)
 					appendStringInfo(str, ", ");
 
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.13 2002/09/04 20:31:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.14 2002/09/19 22:48:33 tgl Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -514,7 +514,7 @@ DefineDomain(CreateDomainStmt *stmt)
 				defaultValue = deparse_expression(defaultExpr,
 										  deparse_context_for(domainName,
 															  InvalidOid),
-												  false);
+												  false, false);
 				defaultValueBin = nodeToString(defaultExpr);
 				break;
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.227 2002/09/18 21:35:20 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.228 2002/09/19 22:48:33 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -1179,7 +1179,7 @@ StoreAttrDefault(Relation rel, AttrNumber attnum, char *adbin)`
`1179`	`1179`	`adsrc = deparse_expression(expr,`
`1180`	`1180`	`deparse_context_for(RelationGetRelationName(rel),`
`1181`	`1181`	`RelationGetRelid(rel)),`
`1182`		`- false);`
	`1182`	`+ false, false);`
`1183`	`1183`
`1184`	`1184`	`/*`
`1185`	`1185`	`* Make the pg_attrdef entry.`
`@@ -1277,7 +1277,7 @@ StoreRelCheck(Relation rel, char ccname, char ccbin)`
`1277`	`1277`	`ccsrc = deparse_expression(expr,`
`1278`	`1278`	`deparse_context_for(RelationGetRelationName(rel),`
`1279`	`1279`	`RelationGetRelid(rel)),`
`1280`		`- false);`
	`1280`	`+ false, false);`
`1281`	`1281`
`1282`	`1282`	`/*`
`1283`	`1283`	`* Find columns of rel that are used in ccbin`