Skip to content

Commit ce23208

Browse files
knizhnikknizhnik
committed
Rebase with master
2 parents 4559d04 + d40d564 commit ce23208

File tree

2,682 files changed

+76079
-44542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,682 files changed

+76079
-44542
lines changed

‎.editorconfig‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
root = true
2+
3+
[*.{c,h,l,y,pl,pm}]
4+
indent_style = tab
5+
indent_size = tab
6+
tab_width = 4
7+
8+
[*.{sgml,xml}]
9+
indent_style = space
10+
indent_size = 1
11+
12+
[*.xsl]
13+
indent_style = space
14+
indent_size = 2

‎.gitattributes‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
* whitespace=space-before-tab,trailing-space
22
*.[chly] whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4
3-
*.dsl whitespace=space-before-tab,trailing-space,tab-in-indent
4-
*.patch -whitespace
53
*.pl whitespace=space-before-tab,trailing-space,tabwidth=4
64
*.po whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eof
75
*.sgml whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eol
@@ -19,6 +17,7 @@ src/backend/catalog/sql_features.txt whitespace=space-before-tab,blank-at-eof,-
1917
# Test output files that contain extra whitespace
2018
*.out -whitespace
2119
contrib/*/output/*.source -whitespace
20+
src/pl/plpgsql/src/output/*.source -whitespace
2221
src/test/regress/output/*.source -whitespace
2322
src/interfaces/ecpg/test/expected/* -whitespace
2423
src/interfaces/libpq/test/expected.out whitespace=-blank-at-eof

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4-
Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

‎GNUmakefile.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ $(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib sr
7575
GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
7676
./config.status $@
7777

78+
update-unicode: | submake-generated-headers submake-libpgport
79+
$(MAKE) -C src/common/unicode $@
80+
$(MAKE) -C contrib/unaccent $@
81+
7882

7983
##########################################################################
8084

‎HISTORY‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Release notes for all versions of PostgreSQL can be found on-line at
2-
https://www.postgresql.org/docs/current/static/release.html
2+
https://www.postgresql.org/docs/current/release.html
33

44
Distribution file sets include release notes for their version and preceding
55
versions. Visit the file doc/src/sgml/html/release.html in an HTML browser.

‎README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ and functions. This distribution also contains C language bindings.
1111

1212
PostgreSQL has many language interfaces, many of which are listed here:
1313

14-
https://www.postgresql.org/download
14+
https://www.postgresql.org/download/
1515

1616
See the file INSTALL for instructions on how to build and install
1717
PostgreSQL. That file also lists supported operating systems and

‎README.git‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ git and so will not be present if you are using a git checkout.
66

77
If you are using a git checkout, you can view the most recent installation
88
instructions at:
9-
https://www.postgresql.org/docs/devel/static/installation.html
9+
https://www.postgresql.org/docs/devel/installation.html
1010

1111
Users compiling from git will also need compatible versions of Bison, Flex,
1212
and Perl, as discussed in the install documentation. These programs are not

‎config/c-compiler.m4‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,6 @@
22
# config/c-compiler.m4
33

44

5-
# PGAC_C_SIGNED
6-
# -------------
7-
# Check if the C compiler understands signed types.
8-
AC_DEFUN([PGAC_C_SIGNED],
9-
[AC_CACHE_CHECK(for signed types, pgac_cv_c_signed,
10-
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
11-
[signed char c; signed short s; signed int i;])],
12-
[pgac_cv_c_signed=yes],
13-
[pgac_cv_c_signed=no])])
14-
if test x"$pgac_cv_c_signed" = xno ; then
15-
AC_DEFINE(signed,, [Define to empty if the C compiler does not understand signed types.])
16-
fi])# PGAC_C_SIGNED
17-
18-
19-
205
# PGAC_C_PRINTF_ARCHETYPE
216
# -----------------------
227
# Select the format archetype to be used by gcc to check printf-type functions.

‎config/c-library.m4‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,14 @@ fi])# PGAC_VAR_INT_TIMEZONE
2626
# PGAC_STRUCT_TIMEZONE
2727
# ------------------
2828
# Figure out how to get the current timezone. If `struct tm' has a
29-
# `tm_zone' member, define `HAVE_TM_ZONE'. Also, if the
30-
# external array `tzname' is found, define `HAVE_TZNAME'.
31-
# This is the same as the standard macro AC_STRUCT_TIMEZONE, except that
32-
# tzname[] is checked for regardless of whether we find tm_zone.
29+
# `tm_zone' member, define `HAVE_STRUCT_TM_TM_ZONE'. Unlike the
30+
# standard macro AC_STRUCT_TIMEZONE, we don't check for `tzname[]' if
31+
# not found, since we don't use it. (We use `int timezone' as a
32+
# fallback.)
3333
AC_DEFUN([PGAC_STRUCT_TIMEZONE],
34-
[AC_REQUIRE([AC_STRUCT_TM])dnl
35-
AC_CHECK_MEMBERS([struct tm.tm_zone],,,[#include <sys/types.h>
36-
#include <$ac_cv_struct_tm>
37-
])
38-
if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
39-
AC_DEFINE(HAVE_TM_ZONE, 1,
40-
[Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
41-
`HAVE_STRUCT_TM_TM_ZONE' instead.])
42-
fi
43-
AC_CACHE_CHECK(for tzname, ac_cv_var_tzname,
44-
[AC_LINK_IFELSE([AC_LANG_PROGRAM(
45-
[[#include <stdlib.h>
34+
[AC_CHECK_MEMBERS([struct tm.tm_zone],,,[#include <sys/types.h>
4635
#include <time.h>
47-
#ifndef tzname /* For SGI. */
48-
extern char *tzname[]; /* RS6000 and others reject char **tzname. */
49-
#endif
50-
]],
51-
[atoi(*tzname);])], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)])
52-
if test $ac_cv_var_tzname = yes; then
53-
AC_DEFINE(HAVE_TZNAME, 1,
54-
[Define to 1 if you have the external array `tzname'.])
55-
fi
36+
])
5637
])# PGAC_STRUCT_TIMEZONE
5738

5839

‎config/programs.m4‎

Lines changed: 64 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,17 +209,21 @@ fi
209209

210210

211211

212-
# PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
213-
# ---------------------------------------
214-
# Readline versions < 2.1 don't have rl_completion_append_character
212+
# PGAC_READLINE_VARIABLES
213+
# -----------------------
214+
# Readline versions < 2.1 don't have rl_completion_append_character,
215+
# and some versions lack rl_completion_suppress_quote.
216+
# Libedit lacks rl_filename_quote_characters and rl_filename_quoting_function
215217

216-
AC_DEFUN([PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER],
218+
AC_DEFUN([PGAC_READLINE_VARIABLES],
217219
[AC_CACHE_CHECK([for rl_completion_append_character], pgac_cv_var_rl_completion_append_character,
218220
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>
219-
#ifdef HAVE_READLINE_READLINE_H
220-
# include <readline/readline.h>
221+
#if defined(HAVE_READLINE_READLINE_H)
222+
#include <readline/readline.h>
223+
#elif defined(HAVE_EDITLINE_READLINE_H)
224+
#include <editline/readline.h>
221225
#elif defined(HAVE_READLINE_H)
222-
# include <readline.h>
226+
#include <readline.h>
223227
#endif
224228
],
225229
[rl_completion_append_character = 'x';])],
@@ -228,7 +232,59 @@ AC_DEFUN([PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER],
228232
if test x"$pgac_cv_var_rl_completion_append_character" = x"yes"; then
229233
AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
230234
[Define to 1 if you have the global variable 'rl_completion_append_character'.])
231-
fi])# PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
235+
fi
236+
AC_CACHE_CHECK([for rl_completion_suppress_quote], pgac_cv_var_rl_completion_suppress_quote,
237+
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>
238+
#if defined(HAVE_READLINE_READLINE_H)
239+
#include <readline/readline.h>
240+
#elif defined(HAVE_EDITLINE_READLINE_H)
241+
#include <editline/readline.h>
242+
#elif defined(HAVE_READLINE_H)
243+
#include <readline.h>
244+
#endif
245+
],
246+
[rl_completion_suppress_quote = 1;])],
247+
[pgac_cv_var_rl_completion_suppress_quote=yes],
248+
[pgac_cv_var_rl_completion_suppress_quote=no])])
249+
if test x"$pgac_cv_var_rl_completion_suppress_quote" = x"yes"; then
250+
AC_DEFINE(HAVE_RL_COMPLETION_SUPPRESS_QUOTE, 1,
251+
[Define to 1 if you have the global variable 'rl_completion_suppress_quote'.])
252+
fi
253+
AC_CACHE_CHECK([for rl_filename_quote_characters], pgac_cv_var_rl_filename_quote_characters,
254+
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>
255+
#if defined(HAVE_READLINE_READLINE_H)
256+
#include <readline/readline.h>
257+
#elif defined(HAVE_EDITLINE_READLINE_H)
258+
#include <editline/readline.h>
259+
#elif defined(HAVE_READLINE_H)
260+
#include <readline.h>
261+
#endif
262+
],
263+
[rl_filename_quote_characters = "x";])],
264+
[pgac_cv_var_rl_filename_quote_characters=yes],
265+
[pgac_cv_var_rl_filename_quote_characters=no])])
266+
if test x"$pgac_cv_var_rl_filename_quote_characters" = x"yes"; then
267+
AC_DEFINE(HAVE_RL_FILENAME_QUOTE_CHARACTERS, 1,
268+
[Define to 1 if you have the global variable 'rl_filename_quote_characters'.])
269+
fi
270+
AC_CACHE_CHECK([for rl_filename_quoting_function], pgac_cv_var_rl_filename_quoting_function,
271+
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>
272+
#if defined(HAVE_READLINE_READLINE_H)
273+
#include <readline/readline.h>
274+
#elif defined(HAVE_EDITLINE_READLINE_H)
275+
#include <editline/readline.h>
276+
#elif defined(HAVE_READLINE_H)
277+
#include <readline.h>
278+
#endif
279+
],
280+
[rl_filename_quoting_function = 0;])],
281+
[pgac_cv_var_rl_filename_quoting_function=yes],
282+
[pgac_cv_var_rl_filename_quoting_function=no])])
283+
if test x"$pgac_cv_var_rl_filename_quoting_function" = x"yes"; then
284+
AC_DEFINE(HAVE_RL_FILENAME_QUOTING_FUNCTION, 1,
285+
[Define to 1 if you have the global variable 'rl_filename_quoting_function'.])
286+
fi
287+
])# PGAC_READLINE_VARIABLES
232288

233289

234290

0 commit comments

Comments
 (0)