Kouhei Sutou
null+****@clear*****
Mon Jun 5 00:15:15 JST 2017
Kouhei Sutou 2017-06-05 00:15:15 +0900 (Mon, 05 Jun 2017) New Revision: 2481c590aaebe81178e23043680c4beb06360514 https://github.com/pgroonga/pgroonga/commit/2481c590aaebe81178e23043680c4beb06360514 Message: Fix types Modified files: data/pgroonga--1.2.0--1.2.1.sql src/pgroonga.c Modified: data/pgroonga--1.2.0--1.2.1.sql (+2 -2) =================================================================== --- data/pgroonga--1.2.0--1.2.1.sql 2017-06-05 00:09:02 +0900 (9aac816) +++ data/pgroonga--1.2.0--1.2.1.sql 2017-06-05 00:15:15 +0900 (81c3e9e) @@ -2,8 +2,8 @@ DROP OPERATOR CLASS pgroonga.text_full_text_search_ops_v2 USING pgroonga; DROP OPERATOR &@> (text, text[]); DROP OPERATOR &?> (text, text[]); -DROP FUNCTION pgroonga.match_contain_text(text[], text); -DROP FUNCTION pgroonga.query_contain_text(text[], text); +DROP FUNCTION pgroonga.match_contain_text(text, text[]); +DROP FUNCTION pgroonga.query_contain_text(text, text[]); CREATE FUNCTION pgroonga.match_in_text(text, text[]) RETURNS bool Modified: src/pgroonga.c (+24 -24) =================================================================== --- src/pgroonga.c 2017-06-05 00:09:02 +0900 (a3df9ee) +++ src/pgroonga.c 2017-06-05 00:15:15 +0900 (fa20b78) @@ -187,12 +187,10 @@ PGRN_FUNCTION_INFO_V1(pgroonga_match_regexp_varchar); /* v2 */ PGRN_FUNCTION_INFO_V1(pgroonga_match_text); PGRN_FUNCTION_INFO_V1(pgroonga_match_text_array); -PGRN_FUNCTION_INFO_V1(pgroonga_match_contain_text); PGRN_FUNCTION_INFO_V1(pgroonga_match_varchar); PGRN_FUNCTION_INFO_V1(pgroonga_contain_varchar_array); PGRN_FUNCTION_INFO_V1(pgroonga_query_text); PGRN_FUNCTION_INFO_V1(pgroonga_query_text_array); -PGRN_FUNCTION_INFO_V1(pgroonga_query_contain_text); PGRN_FUNCTION_INFO_V1(pgroonga_query_varchar); PGRN_FUNCTION_INFO_V1(pgroonga_similar_text); PGRN_FUNCTION_INFO_V1(pgroonga_similar_text_array); @@ -207,9 +205,11 @@ PGRN_FUNCTION_INFO_V1(pgroonga_prefix_rk_text); PGRN_FUNCTION_INFO_V1(pgroonga_prefix_rk_text_array); PGRN_FUNCTION_INFO_V1(pgroonga_prefix_rk_contain_text_array); PGRN_FUNCTION_INFO_V1(pgroonga_match_in_text); +PGRN_FUNCTION_INFO_V1(pgroonga_match_contain_text); PGRN_FUNCTION_INFO_V1(pgroonga_match_in_text_array); PGRN_FUNCTION_INFO_V1(pgroonga_match_in_varchar); PGRN_FUNCTION_INFO_V1(pgroonga_query_in_text); +PGRN_FUNCTION_INFO_V1(pgroonga_query_contain_text); PGRN_FUNCTION_INFO_V1(pgroonga_query_in_text_array); PGRN_FUNCTION_INFO_V1(pgroonga_query_in_varchar); PGRN_FUNCTION_INFO_V1(pgroonga_prefix_in_text); @@ -1877,17 +1877,6 @@ pgroonga_match_text_array(PG_FUNCTION_ARGS) } /** - * pgroonga.match_contain_text(targets text[], term text) : bool - * - * It's deprecated since 1.2.1. Just for backward compatibility. - */ -Datum -pgroonga_match_contain_text(PG_FUNCTION_ARGS) -{ - return pgroonga_match_text_array(fcinfo); -} - -/** * pgroonga.match_varchar(target varchar, term varchar) : bool */ Datum @@ -1959,17 +1948,6 @@ pgroonga_query_text_array(PG_FUNCTION_ARGS) } /** - * pgroonga.query_contain_array(targets text[], query text) : bool - * - * It's deprecated since 1.2.1. Just for backward compatibility. - */ -Datum -pgroonga_query_contain_text(PG_FUNCTION_ARGS) -{ - return pgroonga_query_text_array(fcinfo); -} - -/** * pgroonga.query_varchar(target varchar, term varchar) : bool */ Datum @@ -2339,6 +2317,17 @@ pgroonga_match_in_text(PG_FUNCTION_ARGS) } /** + * pgroonga.match_contain_text(target text, keywords text[]) : bool + * + * It's deprecated since 1.2.1. Just for backward compatibility. + */ +Datum +pgroonga_match_contain_text(PG_FUNCTION_ARGS) +{ + return pgroonga_match_in_text(fcinfo); +} + +/** * pgroonga.match_in_text_array(targets text[], keywords text[]) : bool */ Datum @@ -2392,6 +2381,17 @@ pgroonga_query_in_text(PG_FUNCTION_ARGS) } /** + * pgroonga.query_in_text(target text, queries text[]) : bool + * + * It's deprecated since 1.2.1. Just for backward compatibility. + */ +Datum +pgroonga_query_contain_text(PG_FUNCTION_ARGS) +{ + return pgroonga_query_in_text(fcinfo); +} + +/** * pgroonga.query_in_text_array(targets text[], queries text[]) : bool */ Datum -------------- next part -------------- HTML����������������������������...Download