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/access | |
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/access')
-rw-r--r-- | src/backend/access/common/tupdesc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index c06a0271ca5..16979c4ea72 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -360,6 +360,8 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2) return false; if (attr1->attinhcount != attr2->attinhcount) return false; + if (attr1->attcollation != attr2->attcollation) + return false; /* attacl and attoptions are not even present... */ } @@ -611,7 +613,9 @@ BuildDescForRelation(List *schema) * BuildDescFromLists * * Build a TupleDesc given lists of column names (as String nodes), - * column type OIDs, and column typmods. No constraints are generated. + * column type OIDs, typmods, and collation OIDs. + * + * No constraints are generated. * * This is essentially a cut-down version of BuildDescForRelation for use * with functions returning RECORD. |