mirror of
https://github.com/postgres/postgres.git
synced 2025-07-11 10:01:57 +03:00
Fix oversight in tsearch type check
Use IsBinaryCoercible() method instead of custom is_expected_type/is_text_type functions which was introduced when tsearch2 was moved into core. Per report by David E. Wheeler Analysis by Tom Lane Patch by me
This commit is contained in:
@ -65,40 +65,6 @@ typedef struct
|
|||||||
|
|
||||||
static Datum tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column);
|
static Datum tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column);
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Check if datatype is the specified type or equivalent to it.
|
|
||||||
*
|
|
||||||
* Note: we could just do getBaseType() unconditionally, but since that's
|
|
||||||
* a relatively expensive catalog lookup that most users won't need, we
|
|
||||||
* try the straight comparison first.
|
|
||||||
*/
|
|
||||||
static bool
|
|
||||||
is_expected_type(Oid typid, Oid expected_type)
|
|
||||||
{
|
|
||||||
if (typid == expected_type)
|
|
||||||
return true;
|
|
||||||
typid = getBaseType(typid);
|
|
||||||
if (typid == expected_type)
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check if datatype is TEXT or binary-equivalent to it */
|
|
||||||
static bool
|
|
||||||
is_text_type(Oid typid)
|
|
||||||
{
|
|
||||||
/* varchar(n) and char(n) are binary-compatible with text */
|
|
||||||
if (typid == TEXTOID || typid == VARCHAROID || typid == BPCHAROID)
|
|
||||||
return true;
|
|
||||||
/* Allow domains over these types, too */
|
|
||||||
typid = getBaseType(typid);
|
|
||||||
if (typid == TEXTOID || typid == VARCHAROID || typid == BPCHAROID)
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Order: haspos, len, word, for all positions (pos, weight)
|
* Order: haspos, len, word, for all positions (pos, weight)
|
||||||
*/
|
*/
|
||||||
@ -1166,7 +1132,7 @@ ts_stat_sql(MemoryContext persistentContext, text *txt, text *ws)
|
|||||||
|
|
||||||
if (SPI_tuptable == NULL ||
|
if (SPI_tuptable == NULL ||
|
||||||
SPI_tuptable->tupdesc->natts != 1 ||
|
SPI_tuptable->tupdesc->natts != 1 ||
|
||||||
!is_expected_type(SPI_gettypeid(SPI_tuptable->tupdesc, 1),
|
!IsBinaryCoercible(SPI_gettypeid(SPI_tuptable->tupdesc, 1),
|
||||||
TSVECTOROID))
|
TSVECTOROID))
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
@ -1352,7 +1318,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
|
|||||||
(errcode(ERRCODE_UNDEFINED_COLUMN),
|
(errcode(ERRCODE_UNDEFINED_COLUMN),
|
||||||
errmsg("tsvector column \"%s\" does not exist",
|
errmsg("tsvector column \"%s\" does not exist",
|
||||||
trigger->tgargs[0])));
|
trigger->tgargs[0])));
|
||||||
if (!is_expected_type(SPI_gettypeid(rel->rd_att, tsvector_attr_num),
|
if (!IsBinaryCoercible(SPI_gettypeid(rel->rd_att, tsvector_attr_num),
|
||||||
TSVECTOROID))
|
TSVECTOROID))
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
||||||
@ -1370,7 +1336,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
|
|||||||
(errcode(ERRCODE_UNDEFINED_COLUMN),
|
(errcode(ERRCODE_UNDEFINED_COLUMN),
|
||||||
errmsg("configuration column \"%s\" does not exist",
|
errmsg("configuration column \"%s\" does not exist",
|
||||||
trigger->tgargs[1])));
|
trigger->tgargs[1])));
|
||||||
if (!is_expected_type(SPI_gettypeid(rel->rd_att, config_attr_num),
|
if (!IsBinaryCoercible(SPI_gettypeid(rel->rd_att, config_attr_num),
|
||||||
REGCONFIGOID))
|
REGCONFIGOID))
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
||||||
@ -1416,7 +1382,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
|
|||||||
(errcode(ERRCODE_UNDEFINED_COLUMN),
|
(errcode(ERRCODE_UNDEFINED_COLUMN),
|
||||||
errmsg("column \"%s\" does not exist",
|
errmsg("column \"%s\" does not exist",
|
||||||
trigger->tgargs[i])));
|
trigger->tgargs[i])));
|
||||||
if (!is_text_type(SPI_gettypeid(rel->rd_att, numattr)))
|
if (!IsBinaryCoercible(SPI_gettypeid(rel->rd_att, numattr), TEXTOID))
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
||||||
errmsg("column \"%s\" is not of a character type",
|
errmsg("column \"%s\" is not of a character type",
|
||||||
|
Reference in New Issue
Block a user