Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6a7ac5e

Browse files
committed
Merge commit '4b04d80ca8b287' into PGPRO_pg_trgm
To make configure work on SUSE
2 parentsd6a158e +4b04d80 commit6a7ac5e

File tree

39 files changed

+3820
-165
lines changed

39 files changed

+3820
-165
lines changed

‎configure‎

Lines changed: 217 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9426,7 +9426,7 @@ if test "$ac_res" != no; then :
94269426

94279427
else
94289428

9429-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_44">&5
9429+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_44">&5
94309430
$as_echo_n"checking for library containing ucol_open_44...">&6; }
94319431
if${ac_cv_search_ucol_open_44+:}false;then:
94329432
$as_echo_n"(cached)">&6
@@ -9482,7 +9482,7 @@ if test "$ac_res" != no; then :
94829482

94839483
else
94849484

9485-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_43">&5
9485+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_43">&5
94869486
$as_echo_n"checking for library containing ucol_open_43...">&6; }
94879487
if${ac_cv_search_ucol_open_43+:}false;then:
94889488
$as_echo_n"(cached)">&6
@@ -9538,7 +9538,7 @@ if test "$ac_res" != no; then :
95389538

95399539
else
95409540

9541-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_2">&5
9541+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_2">&5
95429542
$as_echo_n"checking for library containing ucol_open_4_2...">&6; }
95439543
if${ac_cv_search_ucol_open_4_2+:}false;then:
95449544
$as_echo_n"(cached)">&6
@@ -9592,6 +9592,118 @@ ac_res=$ac_cv_search_ucol_open_4_2
95929592
iftest"$ac_res"!= no;then:
95939593
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
95949594

9595+
else
9596+
9597+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_1">&5
9598+
$as_echo_n"checking for library containing ucol_open_4_1...">&6; }
9599+
if${ac_cv_search_ucol_open_4_1+:}false;then:
9600+
$as_echo_n"(cached)">&6
9601+
else
9602+
ac_func_search_save_LIBS=$LIBS
9603+
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
9604+
/* end confdefs.h. */
9605+
9606+
/* Override any GCC internal prototype to avoid an error.
9607+
Use char because int might match the return type of a GCC
9608+
builtin and then its argument prototype would still apply. */
9609+
#ifdef __cplusplus
9610+
extern "C"
9611+
#endif
9612+
char ucol_open_4_1 ();
9613+
int
9614+
main ()
9615+
{
9616+
return ucol_open_4_1 ();
9617+
;
9618+
return 0;
9619+
}
9620+
_ACEOF
9621+
forac_libin'' icui18n icuin;do
9622+
iftest -z"$ac_lib";then
9623+
ac_res="none required"
9624+
else
9625+
ac_res=-l$ac_lib
9626+
LIBS="-l$ac_lib$ac_func_search_save_LIBS"
9627+
fi
9628+
if ac_fn_c_try_link"$LINENO";then:
9629+
ac_cv_search_ucol_open_4_1=$ac_res
9630+
fi
9631+
rm -f core conftest.err conftest.$ac_objext \
9632+
conftest$ac_exeext
9633+
if${ac_cv_search_ucol_open_4_1+:}false;then:
9634+
break
9635+
fi
9636+
done
9637+
if${ac_cv_search_ucol_open_4_1+:}false;then:
9638+
9639+
else
9640+
ac_cv_search_ucol_open_4_1=no
9641+
fi
9642+
rm conftest.$ac_ext
9643+
LIBS=$ac_func_search_save_LIBS
9644+
fi
9645+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_search_ucol_open_4_1">&5
9646+
$as_echo"$ac_cv_search_ucol_open_4_1">&6; }
9647+
ac_res=$ac_cv_search_ucol_open_4_1
9648+
iftest"$ac_res"!= no;then:
9649+
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
9650+
9651+
else
9652+
9653+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_0">&5
9654+
$as_echo_n"checking for library containing ucol_open_4_0...">&6; }
9655+
if${ac_cv_search_ucol_open_4_0+:}false;then:
9656+
$as_echo_n"(cached)">&6
9657+
else
9658+
ac_func_search_save_LIBS=$LIBS
9659+
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
9660+
/* end confdefs.h. */
9661+
9662+
/* Override any GCC internal prototype to avoid an error.
9663+
Use char because int might match the return type of a GCC
9664+
builtin and then its argument prototype would still apply. */
9665+
#ifdef __cplusplus
9666+
extern "C"
9667+
#endif
9668+
char ucol_open_4_0 ();
9669+
int
9670+
main ()
9671+
{
9672+
return ucol_open_4_0 ();
9673+
;
9674+
return 0;
9675+
}
9676+
_ACEOF
9677+
forac_libin'' icui18n icuin;do
9678+
iftest -z"$ac_lib";then
9679+
ac_res="none required"
9680+
else
9681+
ac_res=-l$ac_lib
9682+
LIBS="-l$ac_lib$ac_func_search_save_LIBS"
9683+
fi
9684+
if ac_fn_c_try_link"$LINENO";then:
9685+
ac_cv_search_ucol_open_4_0=$ac_res
9686+
fi
9687+
rm -f core conftest.err conftest.$ac_objext \
9688+
conftest$ac_exeext
9689+
if${ac_cv_search_ucol_open_4_0+:}false;then:
9690+
break
9691+
fi
9692+
done
9693+
if${ac_cv_search_ucol_open_4_0+:}false;then:
9694+
9695+
else
9696+
ac_cv_search_ucol_open_4_0=no
9697+
fi
9698+
rm conftest.$ac_ext
9699+
LIBS=$ac_func_search_save_LIBS
9700+
fi
9701+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_search_ucol_open_4_0">&5
9702+
$as_echo"$ac_cv_search_ucol_open_4_0">&6; }
9703+
ac_res=$ac_cv_search_ucol_open_4_0
9704+
iftest"$ac_res"!= no;then:
9705+
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
9706+
95959707
else
95969708

95979709
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_3_8">&5
@@ -9804,6 +9916,12 @@ fi
98049916
fi
98059917

98069918

9919+
fi
9920+
9921+
9922+
fi
9923+
9924+
98079925
fi
98089926

98099927
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc">&5
@@ -10344,6 +10462,96 @@ _ACEOF
1034410462

1034510463
LIBS="-licuuc$LIBS"
1034610464

10465+
else
10466+
10467+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_4_1 in -licuuc">&5
10468+
$as_echo_n"checking for ucnv_fromUChars_4_1 in -licuuc...">&6; }
10469+
if${ac_cv_lib_icuuc_ucnv_fromUChars_4_1+:}false;then:
10470+
$as_echo_n"(cached)">&6
10471+
else
10472+
ac_check_lib_save_LIBS=$LIBS
10473+
LIBS="-licuuc$LIBS"
10474+
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
10475+
/* end confdefs.h. */
10476+
10477+
/* Override any GCC internal prototype to avoid an error.
10478+
Use char because int might match the return type of a GCC
10479+
builtin and then its argument prototype would still apply. */
10480+
#ifdef __cplusplus
10481+
extern "C"
10482+
#endif
10483+
char ucnv_fromUChars_4_1 ();
10484+
int
10485+
main ()
10486+
{
10487+
return ucnv_fromUChars_4_1 ();
10488+
;
10489+
return 0;
10490+
}
10491+
_ACEOF
10492+
if ac_fn_c_try_link"$LINENO";then:
10493+
ac_cv_lib_icuuc_ucnv_fromUChars_4_1=yes
10494+
else
10495+
ac_cv_lib_icuuc_ucnv_fromUChars_4_1=no
10496+
fi
10497+
rm -f core conftest.err conftest.$ac_objext \
10498+
conftest$ac_exeext conftest.$ac_ext
10499+
LIBS=$ac_check_lib_save_LIBS
10500+
fi
10501+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_lib_icuuc_ucnv_fromUChars_4_1">&5
10502+
$as_echo"$ac_cv_lib_icuuc_ucnv_fromUChars_4_1">&6; }
10503+
iftest"x$ac_cv_lib_icuuc_ucnv_fromUChars_4_1" = xyes;then:
10504+
cat>>confdefs.h<<_ACEOF
10505+
#define HAVE_LIBICUUC 1
10506+
_ACEOF
10507+
10508+
LIBS="-licuuc$LIBS"
10509+
10510+
else
10511+
10512+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_4_0 in -licuuc">&5
10513+
$as_echo_n"checking for ucnv_fromUChars_4_0 in -licuuc...">&6; }
10514+
if${ac_cv_lib_icuuc_ucnv_fromUChars_4_0+:}false;then:
10515+
$as_echo_n"(cached)">&6
10516+
else
10517+
ac_check_lib_save_LIBS=$LIBS
10518+
LIBS="-licuuc$LIBS"
10519+
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
10520+
/* end confdefs.h. */
10521+
10522+
/* Override any GCC internal prototype to avoid an error.
10523+
Use char because int might match the return type of a GCC
10524+
builtin and then its argument prototype would still apply. */
10525+
#ifdef __cplusplus
10526+
extern "C"
10527+
#endif
10528+
char ucnv_fromUChars_4_0 ();
10529+
int
10530+
main ()
10531+
{
10532+
return ucnv_fromUChars_4_0 ();
10533+
;
10534+
return 0;
10535+
}
10536+
_ACEOF
10537+
if ac_fn_c_try_link"$LINENO";then:
10538+
ac_cv_lib_icuuc_ucnv_fromUChars_4_0=yes
10539+
else
10540+
ac_cv_lib_icuuc_ucnv_fromUChars_4_0=no
10541+
fi
10542+
rm -f core conftest.err conftest.$ac_objext \
10543+
conftest$ac_exeext conftest.$ac_ext
10544+
LIBS=$ac_check_lib_save_LIBS
10545+
fi
10546+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_lib_icuuc_ucnv_fromUChars_4_0">&5
10547+
$as_echo"$ac_cv_lib_icuuc_ucnv_fromUChars_4_0">&6; }
10548+
iftest"x$ac_cv_lib_icuuc_ucnv_fromUChars_4_0" = xyes;then:
10549+
cat>>confdefs.h<<_ACEOF
10550+
#define HAVE_LIBICUUC 1
10551+
_ACEOF
10552+
10553+
LIBS="-licuuc$LIBS"
10554+
1034710555
else
1034810556

1034910557
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_3_8 in -licuuc">&5
@@ -10523,6 +10731,12 @@ fi
1052310731
fi
1052410732

1052510733

10734+
fi
10735+
10736+
10737+
fi
10738+
10739+
1052610740
fi
1052710741

1052810742
fi

‎configure.in‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,15 +1056,19 @@ if test "$with_icu" = yes ; then
10561056
AC_SEARCH_LIBS(ucol_open_50, [icui18n icuin], [], [
10571057
AC_SEARCH_LIBS(ucol_open_48, [icui18n icuin], [], [
10581058
AC_SEARCH_LIBS(ucol_open_46, [icui18n icuin], [], [
1059-
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
1060-
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1061-
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
1059+
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
1060+
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1061+
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
1062+
AC_SEARCH_LIBS(ucol_open_4_1, [icui18n icuin], [], [
1063+
AC_SEARCH_LIBS(ucol_open_4_0, [icui18n icuin], [], [
10621064
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
10631065
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
10641066
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
10651067
])
10661068
])
10671069
])
1070+
])
1071+
])
10681072
])
10691073
])
10701074
])
@@ -1088,11 +1092,15 @@ if test "$with_icu" = yes ; then
10881092
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
10891093
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
10901094
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_2, [], [
1095+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_1, [], [
1096+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_0, [], [
10911097
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
10921098
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
10931099
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
10941100
])
10951101
])
1102+
])
1103+
])
10961104
])
10971105
])
10981106
])

‎contrib/hstore/expected/hstore.out‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,10 +1466,10 @@ select cast( hstore '"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=
14661466
{"b": "t", "c": null, "d": "12345", "e": "012345", "f": "1.234", "g": "2.345e+4", "a key": "1"}
14671467
(1 row)
14681468

1469-
select hstore_to_json_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
1470-
hstore_to_json_loose
1471-
------------------------------------------------------------------------------------------
1472-
{"b": true, "c": null, "d": 12345, "e": "012345", "f": 1.234, "g": 2.345e+4, "a key": 1}
1469+
select hstore_to_json_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4, h=> "2016-01-01"');
1470+
hstore_to_json_loose
1471+
-------------------------------------------------------------------------------------------------------------
1472+
{"b": true, "c": null, "d": 12345, "e": "012345", "f": 1.234, "g": 2.345e+4, "h": "2016-01-01", "a key": 1}
14731473
(1 row)
14741474

14751475
select hstore_to_jsonb('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
@@ -1484,10 +1484,10 @@ select cast( hstore '"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=
14841484
{"b": "t", "c": null, "d": "12345", "e": "012345", "f": "1.234", "g": "2.345e+4", "a key": "1"}
14851485
(1 row)
14861486

1487-
select hstore_to_jsonb_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
1488-
hstore_to_jsonb_loose
1489-
---------------------------------------------------------------------------------------
1490-
{"b": true, "c": null, "d": 12345, "e": "012345", "f": 1.234, "g": 23450, "a key": 1}
1487+
select hstore_to_jsonb_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4, h=> "2016-01-01"');
1488+
hstore_to_jsonb_loose
1489+
----------------------------------------------------------------------------------------------------------
1490+
{"b": true, "c": null, "d": 12345, "e": "012345", "f": 1.234, "g": 23450, "h": "2016-01-01", "a key": 1}
14911491
(1 row)
14921492

14931493
create table test_json_agg (f1 text, f2 hstore);

‎contrib/hstore/sql/hstore.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,11 @@ select count(*) from testhstore where h = 'pos=>98, line=>371, node=>CBA, indexe
334334
-- json and jsonb
335335
select hstore_to_json('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
336336
select cast( hstore'"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4'as json);
337-
select hstore_to_json_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
337+
select hstore_to_json_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4, h=> "2016-01-01"');
338338

339339
select hstore_to_jsonb('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
340340
select cast( hstore'"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4'as jsonb);
341-
select hstore_to_jsonb_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
341+
select hstore_to_jsonb_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4, h=> "2016-01-01"');
342342

343343
createtabletest_json_agg (f1text, f2 hstore);
344344
insert into test_json_aggvalues ('rec1','"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4'),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp