postgres.git / summary / log / commit / refs

commit    c31c81cee6aea83e13d83b72d7c6dbbc22179c00
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Mon Jun 08 21:32:50 2009 +0000
First released in: 8.4.0, 8.3.8

    Fix map_sql_table_to_xmlschema() with dropped attributes.


 src/backend/utils/adt/xml.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index ecdbc536356..1bd758b1672 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.68.2.8 2009/05/12 20:17:46 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.68.2.9 2009/06/08 21:32:50 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2648,12 +2648,16 @@ map_sql_table_to_xmlschema(TupleDesc tupdesc, Oid relid, bool nulls,
 					 rowtypename);
 
 	for (i = 0; i < tupdesc->natts; i++)
+	{
+		if (tupdesc->attrs[i]->attisdropped)
+			continue;
 		appendStringInfo(&result,
 			   "    <xsd:element name=\"%s\" type=\"%s\"%s></xsd:element>\n",
 		  map_sql_identifier_to_xml_name(NameStr(tupdesc->attrs[i]->attname),
 										 true, false),
 				   map_sql_type_to_xml_name(tupdesc->attrs[i]->atttypid, -1),
 						 nulls ? " nillable=\"true\"" : " minOccurs=\"0\"");
+	}
 
 	appendStringInfoString(&result,
 						   "  </xsd:sequence>\n"


[parent: abf4b00a8783]