From: Shigeru Hanada <hanada@metrosystems.co.jp>
Date: Fri, 17 Dec 2010 07:24:22 +0000 (+0900)
Subject: Remove colname generic option.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=6fbf78e342cdd79b7cad9141e378f358db611c24;p=users%2Fhanada%2Fpostgres.git

Remove colname generic option.
---

diff --git a/contrib/postgresql_fdw/postgresql_fdw.c b/contrib/postgresql_fdw/postgresql_fdw.c
index 1599c42a1b..022e513b51 100644
--- a/contrib/postgresql_fdw/postgresql_fdw.c
+++ b/contrib/postgresql_fdw/postgresql_fdw.c
@@ -210,35 +210,16 @@ deparseSelectClause(StringInfo sql, ForeignTable *table, TupleDesc tupdesc,
 	first = true;
 	for (i = 0; i < tupdesc->natts; i++)
 	{
-#ifdef NOT_USED
-		List	   *options;
-		ListCell   *lc;
-#endif
-		char	   *colname = NULL;
+		char	   *colname;
 
 		/* skip dropped attributes */
 		if (tupdesc->attrs[i]->attisdropped)
 			continue;
 
-		/* Determine column name to be used */
-#ifdef NOT_USED
-		options = GetGenericOptionsPerColumn(table->relid, i + 1);
-		foreach (lc, options)
-		{
-			DefElem	   *def = (DefElem *) lfirst(lc);
-			if (strcmp(def->defname, "colname") == 0)
-			{
-				colname = strVal(def->arg);
-				break;
-			}
-		}
-#endif
-		if (!colname)
-			colname = tupdesc->attrs[i]->attname.data;
-
 		if (!first)
 			appendStringInfoString(sql, ", ");
 
+		colname = tupdesc->attrs[i]->attname.data;
 		if (prefix)
 			appendStringInfo(sql, "%s.%s", aliasname_q, colname);
 		else
diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c
index dc2f95ac17..2e2f077430 100644
--- a/src/backend/foreign/foreign.c
+++ b/src/backend/foreign/foreign.c
@@ -355,9 +355,6 @@ static struct PgFdwOption valid_options[] = {
 	/* Catalog options */
 	{"nspname", ForeignTableRelationId, false},
 	{"relname", ForeignTableRelationId, false},
-#ifdef NOT_USED
-	{"colname", AttributeRelationId, false},
-#endif
 
 	/* Planner cost options */
 	{"connection_cost", ForeignServerRelationId, false},