Skip to content

P
Postgres FD Implementation
Commit d0dd5c73 authored by Tom Lane's avatar Tom Lane
Browse files
Options

Fix check_exclusion_constraint() to insert correct collations in ScanKeys.

parent 87f2ad13
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
src/backend/executor/execUtils.c
View file @ d0dd5c73
...@@ -1158,6 +1158,7 @@ check_exclusion_constraint(Relation heap, Relation index, IndexInfo *indexInfo, ...@@ -1158,6 +1158,7 @@ check_exclusion_constraint(Relation heap, Relation index, IndexInfo *indexInfo,
{ {
Oid *constr_procs = indexInfo->ii_ExclusionProcs; Oid *constr_procs = indexInfo->ii_ExclusionProcs;
uint16 *constr_strats = indexInfo->ii_ExclusionStrats; uint16 *constr_strats = indexInfo->ii_ExclusionStrats;
Oid *index_collations = index->rd_indcollation;
int index_natts = index->rd_index->indnatts; int index_natts = index->rd_index->indnatts;
IndexScanDesc index_scan; IndexScanDesc index_scan;
HeapTuple tup; HeapTuple tup;
...@@ -1188,11 +1189,14 @@ check_exclusion_constraint(Relation heap, Relation index, IndexInfo *indexInfo, ...@@ -1188,11 +1189,14 @@ check_exclusion_constraint(Relation heap, Relation index, IndexInfo *indexInfo,
for (i = 0; i < index_natts; i++) for (i = 0; i < index_natts; i++)
{ {
ScanKeyInit(&scankeys[i], ScanKeyEntryInitialize(&scankeys[i],
i + 1, 0,
constr_strats[i], i + 1,
constr_procs[i], constr_strats[i],
values[i]); InvalidOid,
index_collations[i],
constr_procs[i],
values[i]);
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment