Merge branch 'PGPRO10' into PGPRO-626-ICU

Author: dmpgpro

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PostgreSQL 10.3.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 10.4.
 #
 # Report bugs to <bugs@postgrespro.ru>.
 #
@@ -583,8 +583,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgrespro'
-PACKAGE_VERSION='10.3'
-PACKAGE_STRING='PostgreSQL 10.3'
+PACKAGE_VERSION='10.4'
+PACKAGE_STRING='PostgreSQL 10.4'
 PACKAGE_BUGREPORT='bugs@postgrespro.ru'
 PACKAGE_URL=''
 
@@ -1427,7 +1427,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PostgreSQL 10.3 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 10.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1493,7 +1493,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 10.3:";;
+     short | recursive ) echo "Configuration of PostgreSQL 10.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1652,7 +1652,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 10.3
+PostgreSQL configure 10.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2364,7 +2364,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PostgreSQL $as_me 10.3, which was
+It was created by PostgreSQL $as_me 10.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2782,7 +2782,7 @@ fi
 
 
 
-PGPRO_VERSION="$PACKAGE_VERSION.2"
+PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="standard"
 PGPRO_EDN="std"
@@ -17603,7 +17603,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PostgreSQL $as_me 10.3, which was
+This file was extended by PostgreSQL $as_me 10.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17673,7 +17673,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-PostgreSQL config.status 10.3
+PostgreSQL config.status 10.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.in

@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [10.3], [bugs@postgrespro.ru], [postgrespro])
+AC_INIT([PostgreSQL], [10.4], [bugs@postgrespro.ru], [postgrespro])
 PACKAGE_TARNAME=postgrespro
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
@@ -39,7 +39,7 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
              [PG_VERSION="$PACKAGE_VERSION$withval"],
              [PG_VERSION="$PACKAGE_VERSION"])
 
-PGPRO_VERSION="$PACKAGE_VERSION.2"
+PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="standard"
 PGPRO_EDN="std"

contrib/Makefile

@@ -27,6 +27,7 @@ SUBDIRS = \
 		hstore		\
 		hunspell_en_us \
 		hunspell_fr \
+		hunspell_ne_np \
 		hunspell_nl_nl \
 		hunspell_ru_ru \
 		intagg		\
@@ -58,6 +59,7 @@ SUBDIRS = \
 		postgres_fdw	\
 		seg		\
 		shared_ispell \
+		snowball_ext \
 		spi		\
 		sr_plan		\
 		tablefunc	\

contrib/adminpack/Makefile

@@ -5,7 +5,7 @@ OBJS = adminpack.o $(WIN32RES)
 PG_CPPFLAGS = -I$(libpq_srcdir)
 
 EXTENSION = adminpack
-DATA = adminpack--1.0.sql
+DATA = adminpack--1.0.sql adminpack--1.0--1.1.sql
 PGFILEDESC = "adminpack - support functions for pgAdmin"
 
 ifdef USE_PGXS

contrib/adminpack/adminpack--1.0--1.1.sql

@@ -0,0 +1,6 @@
+/* contrib/adminpack/adminpack--1.0--1.1.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION adminpack UPDATE TO '1.1'" to load this file. \quit
+
+REVOKE EXECUTE ON FUNCTION pg_catalog.pg_logfile_rotate() FROM PUBLIC;

contrib/adminpack/adminpack.c

@@ -173,7 +173,7 @@ pg_file_rename(PG_FUNCTION_ARGS)
 	fn1 = convert_and_check_filename(PG_GETARG_TEXT_PP(0), false);
 	fn2 = convert_and_check_filename(PG_GETARG_TEXT_PP(1), false);
 	if (PG_ARGISNULL(2))
-		fn3 = 0;
+		fn3 = NULL;
 	else
 		fn3 = convert_and_check_filename(PG_GETARG_TEXT_PP(2), false);
 
@@ -195,7 +195,7 @@ pg_file_rename(PG_FUNCTION_ARGS)
 		PG_RETURN_BOOL(false);
 	}
 
-	rc = access(fn3 ? fn3 : fn2, 2);
+	rc = access(fn3 ? fn3 : fn2, W_OK);
 	if (rc >= 0 || errno != ENOENT)
 	{
 		ereport(ERROR,

contrib/adminpack/adminpack.control

@@ -1,6 +1,6 @@
 # adminpack extension
 comment = 'administrative functions for PostgreSQL'
-default_version = '1.0'
+default_version = '1.1'
 module_pathname = '$libdir/adminpack'
 relocatable = false
 schema = pg_catalog

contrib/fasttrun/Makefile

@@ -1,7 +1,7 @@
 MODULE_big = fasttrun
 OBJS = fasttrun.o $(WIN32RES)
 EXTENSION = fasttrun
-DATA = fasttrun--1.0.sql
+DATA = fasttrun--1.0.sql fasttrun--unpackaged--1.0.sql
 DOCS = README.fasttrun
 REGRESS = fasttrun
 PGFIELDDESC = "fasttrun - functions to truncates the temporary table and doesn't grow pg_class size."

contrib/fasttrun/fasttrun--unpackaged--1.0.sql

@@ -0,0 +1,4 @@
+\echo Use "CREATE EXTENSION fasttrun FROM unpackaged" to load this file. \quit
+
+ALTER EXTENSION fasttrun ADD function fasttruncate(text);
+

contrib/fulleq/Makefile

@@ -1,7 +1,7 @@
 MODULE_big = fulleq
 OBJS = fulleq.o	
 EXTENSION = fulleq
-DATA = fulleq--1.0.sql
+DATA = fulleq--1.0.sql fulleq--unpackaged--1.0.sql
 DOCS = README.fulleq
 REGRESS = fulleq
 PGFIELDDESC = "fulleq - introduce operator == which returns true when operands are equal or both are nulls."
@@ -11,7 +11,7 @@ ARGTYPE = bool bytea char name int8 int2 int4 text \
 	inet cidr varchar date time timestamp timestamptz \
 	interval timetz
 
-#EXTRA_CLEAN = fulleq--1.0.sql
+#EXTRA_CLEAN = fulleq--1.0.sql fulleq--unpackaged--1.0.sql
 
 ifdef USE_PGXS
 PGXS := $(shell pg_config --pgxs)
@@ -23,6 +23,8 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+all: fulleq--1.0.sql fulleq--unpackaged--1.0.sql
+
 fulleq--1.0.sql:	fulleq--1.0.sql.in.in
 	echo '\echo Use "CREATE EXTENSION fulleq" to load this file. \quit' >	$@
 	echo 'SET search_path = public;' >> $@
@@ -31,3 +33,14 @@ fulleq--1.0.sql:	fulleq--1.0.sql.in.in
 		sed -e "s/ARGTYPE/$$type/g" < $< >> $@;	\
 	done
 
+fulleq--unpackaged--1.0.sql:	fulleq-unpackaged.sql.in.in
+	echo '\echo Use "CREATE EXTENSION fulleq FROM unpackaged" to load this file. \quit' > $@
+	echo 'DROP OPERATOR CLASS IF EXISTS int2vector_fill_ops USING hash;' >> $@
+	echo 'DROP OPERATOR FAMILY IF EXISTS int2vector_fill_ops USING hash;' >> $@
+	echo 'DROP FUNCTION IF EXISTS fullhash_int2vector(int2vector);' >> $@
+	echo 'DROP OPERATOR IF EXISTS == (int2vector, int2vector);' >> $@
+	echo 'DROP FUNCTION IF EXISTS isfulleq_int2vector(int2vector, int2vector);' >> $@
+	for type in	$(ARGTYPE);	\
+ 	do	\
+ 		sed -e "s/ARGTYPE/$$type/g" < $< >> $@;	\
+	done