Merge branch 'PGPRO10' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO10

Author: vbwagner

contrib/jsquery/.gitignore

@@ -1,3 +1,7 @@
+.deps
+/log/
+/results/
+/tmp_check/
 *.so
 *.o
 jsquery_gram.c

contrib/jsquery/.travis.yml

@@ -0,0 +1,33 @@
+os:
+  - linux
+
+sudo: required
+dist: trusty
+
+language: c
+
+compiler:
+  - clang
+  - gcc
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -y install -qq wget ca-certificates; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source ./travis/dep-ubuntu-postgres.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source ./travis/dep-ubuntu-llvm.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+
+env:
+  global:
+    - LLVM_VER=4.0
+  matrix:
+    - PG_VER=10  CHECK_TYPE=normal
+    - PG_VER=10  CHECK_TYPE=static
+    - PG_VER=10  CHECK_TYPE=valgrind
+    - PG_VER=9.6 CHECK_TYPE=normal
+    - PG_VER=9.6 CHECK_TYPE=static
+    - PG_VER=9.5 CHECK_TYPE=normal
+    - PG_VER=9.5 CHECK_TYPE=static
+    - PG_VER=9.4 CHECK_TYPE=normal
+    - PG_VER=9.4 CHECK_TYPE=static
+
+script: bash ./travis/pg-travis-test.sh

contrib/jsquery/LICENSE

@@ -0,0 +1,11 @@
+JsQuery is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.
+
+Copyright (c) 2014-2018, Postgres Professional
+Portions Copyright (c) 1996-2018, 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/jsquery/META.json

@@ -2,7 +2,7 @@
    "name": "JsQuery",
    "abstract": "JSON Query Language with GIN indexing support",
    "description": "JsQuery provides additional functionality for JSONB, such as a simple and effective way to search in nested objects and arrays, and more comparison operators with index support.  It does this by implementing a specialized search syntax, the @@ operator, and the jsquery type for search strings.",
-   "version": "1.0.0",
+   "version": "1.0.1",
    "maintainer": [
       "Teodor Sigaev <teodor@sigaev.ru>",
       "Alexander Korotkov <aekorotkov@gmail.com>",
@@ -17,15 +17,15 @@
             "PostgreSQL": "9.4.0"
          },
          "recommends": {
-            "PostgreSQL": "9.4.0"
+            "PostgreSQL": "9.6.5"
          }
       }
    },
    "provides": {
      "jsquery": {
        "file": "sql/jsquery.sql",
        "docfile": "README.md",
-       "version": "1.0.0",
+       "version": "1.0.1",
        "abstract": "JSON query language with GIN indexing support"
      }
    },
@@ -50,4 +50,4 @@
         "index",
         "search"
    ]
-}
+}

contrib/jsquery/Makefile

@@ -5,7 +5,8 @@ OBJS = jsonb_gin_ops.o jsquery_constr.o jsquery_extract.o \
 	jsquery_gram.o jsquery_io.o jsquery_op.o jsquery_support.o
 
 EXTENSION = jsquery
-DATA = jsquery--1.0.sql
+DATA = jsquery--1.1.sql jsquery--1.0--1.1.sql
+INCLUDES = jsquery.h
 
 REGRESS = jsquery
 # We need a UTF8 database
@@ -25,6 +26,10 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+ifdef USE_ASSERT_CHECKING
+override CFLAGS += -DUSE_ASSERT_CHECKING
+endif
+
 jsquery_gram.o: jsquery_scan.c
 
 jsquery_gram.c: BISONFLAGS += -d
@@ -34,3 +39,7 @@ distprep: jsquery_gram.c jsquery_scan.c
 maintainer-clean:
 	rm -f jsquery_gram.c jsquery_scan.c jsquery_gram.h
 
+install: installincludes
+
+installincludes:
+	$(INSTALL_DATA) $(addprefix $(srcdir)/, $(INCLUDES)) '$(DESTDIR)$(includedir_server)/'

contrib/jsquery/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/postgrespro/jsquery.svg?branch=master)](https://travis-ci.org/postgrespro/jsquery)
+[![codecov](https://codecov.io/gh/postgrespro/jsquery/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/jsquery)
+[![GitHub license](https://img.shields.io/badge/license-PostgreSQL-blue.svg)](https://raw.githubusercontent.com/postgrespro/jsquery/master/LICENSE)
+
 JsQuery – json query language with GIN indexing support
 =======================================================
 
@@ -36,7 +40,7 @@ and supports PostgreSQL 9.4+.
 Regards
 -------
 
-Development is sponsored by [Wargaming.net](http://wargaming.net).
+Development was sponsored by [Wargaming.net](http://wargaming.net).
 
 Installation
 ------------
@@ -89,6 +93,7 @@ the simplest case path is just an key name. In general path is key names and
 placeholders combined by dot signs. Path can use following placeholders:
 
  * `#` – any index of array;
+ * `#N` – N-th index of array;
  * `%` – any key of object;
  * `*` – any sequence of array indexes and object keys;
  * `@#` – length of array or object, could be only used as last component of

contrib/jsquery/data/test_jsquery.data

@@ -1015,3 +1015,20 @@
 {"t": "a"}
 {"t": true}
 {"t": false}
+[1, 2, 3]
+["a", "b", "c"]
+1
+2
+3
+4
+5
+null
+null
+null
+false
+false
+true
+"aaa"
+"bbb"
+"ccc"
+"ddd"