postgres.git / summary / log / commit / refs

commit    3c49fa2aff2c2e4ec612c97e2c44b928c8809fae
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Fri Dec 01 14:48:06 2023 +0000
First released in: 17.0, 12.18, 13.14, 14.11, 15.6, 16.2

    Check collation when creating partitioned index
    
    When creating a partitioned index, the partition key must be a subset
    of the index's columns.  But this currently doesn't check that the
    collations between the partition key and the index definition match.
    So you can construct a unique index that fails to enforce uniqueness.
    (This would most likely involve a nondeterministic collation, so it
    would have to be crafted explicitly and is not something that would
    just happen by accident.)
    
    This patch adds the required collation check.  As a result, any
    previously allowed unique index that has a collation mismatch would no
    longer be allowed to be created.
    
    Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
    Discussion: https://www.postgresql.org/message-id/flat/3327cb54-f7f1-413b-8fdb-7a9dceebb938%40eisentraut.org


 src/backend/commands/indexcmds.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index cfebc8aaaf1..4a7cfb3ce42 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -984,10 +984,13 @@ DefineIndex(Oid relationId,
 			{
 				if (key->partattrs[i] == indexInfo->ii_IndexAttrNumbers[j])
 				{
-					/* Matched the column, now what about the equality op? */
+					/* Matched the column, now what about the collation and equality op? */
 					Oid			idx_opfamily;
 					Oid			idx_opcintype;
 
+					if (key->partcollation[i] != collationObjectId[j])
+						continue;
+
 					if (get_opclass_opfamily_and_input_type(classObjectId[j],
 															&idx_opfamily,
 															&idx_opcintype))


[parent: efb804682719]