diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-22 17:43:18 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-22 17:43:18 -0400 |
| commit | 9e9b9ac7d1860fbb98eb4db17a94ff25524b6447 (patch) | |
| tree | b8505f0c0aa817e1611f43d130248fa7bbb2103c /src/backend/utils/adt/ruleutils.c | |
| parent | 0cfdc1c657b7c2aa1e4524f495e84005f750ec02 (diff) | |
| download | postgresql-9e9b9ac7d1860fbb98eb4db17a94ff25524b6447.tar.gz postgresql-9e9b9ac7d1860fbb98eb4db17a94ff25524b6447.zip | |
Make a code-cleanup pass over the collations patch.
This patch is almost entirely cosmetic --- mostly cleaning up a lot of
neglected comments, and fixing code layout problems in places where the
patch made lines too long and then pgindent did weird things with that.
I did find a bug-of-omission in equalTupleDescs().
Diffstat (limited to 'src/backend/utils/adt/ruleutils.c')
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index e436a1ee59f..3ab90cb7d88 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -235,7 +235,8 @@ static void get_from_clause_item(Node *jtnode, Query *query, deparse_context *context); static void get_from_clause_alias(Alias *alias, RangeTblEntry *rte, deparse_context *context); -static void get_from_clause_coldeflist(List *names, List *types, List *typmods, List *collations, +static void get_from_clause_coldeflist(List *names, + List *types, List *typmods, List *collations, deparse_context *context); static void get_opclass_name(Oid opclass, Oid actual_datatype, StringInfo buf); @@ -6617,7 +6618,8 @@ get_from_clause_alias(Alias *alias, RangeTblEntry *rte, * responsible for ensuring that an alias or AS is present before it. */ static void -get_from_clause_coldeflist(List *names, List *types, List *typmods, List *collations, +get_from_clause_coldeflist(List *names, + List *types, List *typmods, List *collations, deparse_context *context) { StringInfo buf = context->buf; @@ -6651,7 +6653,8 @@ get_from_clause_coldeflist(List *names, List *types, List *typmods, List *collat appendStringInfo(buf, "%s %s", quote_identifier(attname), format_type_with_typemod(atttypid, atttypmod)); - if (attcollation && attcollation != DEFAULT_COLLATION_OID) + if (OidIsValid(attcollation) && + attcollation != get_typcollation(atttypid)) appendStringInfo(buf, " COLLATE %s", generate_collation_name(attcollation)); i++; |