Merge commit '42fd8274ffe42b9deb1febd8dc6779d51894f2e6' into PGPROEE10

Author: vbwagner

contrib/rum/LICENSE

@@ -0,0 +1,11 @@
+RUM is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.
+
+Copyright (c) 2015-2017, Postgres Professional
+Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+Portions Copyright (c) 1994, The Regents of the University of California
+
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL POSTGRES PROFESSIONAL BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF POSTGRES PROFESSIONAL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+POSTGRES PROFESSIONAL SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND POSTGRES PROFESSIONAL HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

contrib/rum/Makefile

@@ -23,8 +23,8 @@ RELATIVE_INCLUDES = $(addprefix src/, $(INCLUDES))
 
 LDFLAGS_SL += $(filter -lm, $(LIBS))
 
-REGRESS = rum rum_hash ruminv timestamp orderby orderby_hash altorder \
-	altorder_hash limits \
+REGRESS = rum rum_validate rum_hash ruminv timestamp orderby orderby_hash \
+	altorder altorder_hash limits \
 	int2 int4 int8 float4 float8 money oid \
     time timetz date interval \
     macaddr inet cidr text varchar char bytea bit varbit \

contrib/rum/README.md

@@ -1,3 +1,6 @@
+[![PGXN version](https://badge.fury.io/pg/rum.svg)](https://badge.fury.io/pg/rum)
+[![GitHub license](https://img.shields.io/badge/license-PostgreSQL-blue.svg)](https://raw.githubusercontent.com/postgrespro/rum/master/LICENSE)
+
 [![Postgres Professional](img/PGpro-logo.png)](https://postgrespro.com/)
 
 # RUM - RUM access method
@@ -41,13 +44,21 @@ Before build and install **rum** you should ensure following:
 
 Typical installation procedure may look like this:
 
+### Using GitHub repository
+
     $ git clone https://github.com/postgrespro/rum
     $ cd rum
     $ make USE_PGXS=1
-    $ sudo make USE_PGXS=1 install
+    $ make USE_PGXS=1 install
     $ make USE_PGXS=1 installcheck
     $ psql DB -c "CREATE EXTENSION rum;"
 
+### Using PGXN
+
+    $ USE_PGXS=1 pgxn install rum
+
+> **Important:** Don't forget to set the `PG_CONFIG` variable in case you want to test `RUM` on a custom build of PostgreSQL. Read more [here](https://wiki.postgresql.org/wiki/Building_and_Installing_PostgreSQL_Extension_Modules).
+
 ## Common operators and functions
 
 **rum** module provides next operators.