diff options
| author | Tom Lane | 2011-03-26 22:28:40 +0000 |
|---|---|---|
| committer | Tom Lane | 2011-03-26 22:28:40 +0000 |
| commit | 7208fae18f1fdb242b4fcced77a3b836e15ac3ec (patch) | |
| tree | e857033e3c74a3f73de3e29720290ee721199df3 /src/include/access | |
| parent | 0c9d9e8dd655fff7bcfc401e82838b8c20c16939 (diff) | |
Clean up cruft around collation initialization for tupdescs and scankeys.
I found actual bugs in GiST and plpgsql; the rest of this is cosmetic
but meant to decrease the odds of future bugs of omission.
Diffstat (limited to 'src/include/access')
| -rw-r--r-- | src/include/access/skey.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/include/access/skey.h b/src/include/access/skey.h index 3d2956c9353..1d0071ac2d3 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.h @@ -52,6 +52,9 @@ typedef uint16 StrategyNumber; * the operator. When using a ScanKey in a heap scan, these fields are not * used and may be set to InvalidStrategy/InvalidOid. * + * If the operator is collation-sensitive, sk_func.fn_collation must be set + * correctly as well. + * * A ScanKey can also represent a condition "column IS NULL" or "column * IS NOT NULL"; these cases are signaled by the SK_SEARCHNULL and * SK_SEARCHNOTNULL flag bits respectively. The argument is always NULL, @@ -143,6 +146,7 @@ extern void ScanKeyEntryInitialize(ScanKey entry, AttrNumber attributeNumber, StrategyNumber strategy, Oid subtype, + Oid collation, RegProcedure procedure, Datum argument); extern void ScanKeyEntryInitializeWithInfo(ScanKey entry, @@ -150,9 +154,8 @@ extern void ScanKeyEntryInitializeWithInfo(ScanKey entry, AttrNumber attributeNumber, StrategyNumber strategy, Oid subtype, + Oid collation, FmgrInfo *finfo, Datum argument); -extern void ScanKeyEntryInitializeCollation(ScanKey entry, - Oid collation); #endif /* SKEY_H */ |