Merge pull request #4 from bichht0608/RELEASE_5.5.0

Release v5.5.0
pgspider · Dec 20, 2023 · abdce58 · abdce58
2 parents 22de09a + 656534b
commit abdce58
Show file tree

Hide file tree

Showing 128 changed files with 30,542 additions and 80 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,8 @@
-# mongo_fdw/Makefile
+# mongo_fdw/Makefile.meta
 #
 # Portions Copyright (c) 2004-2022, EnterpriseDB Corporation.
 # Portions Copyright © 2012–2014 Citus Data, Inc.
+# Portions Copyright (c) 2021, TOSHIBA CORPORATION
 #
 
 MODULE_big = mongo_fdw
@@ -50,8 +51,8 @@ ifndef MAJORVERSION
     MAJORVERSION := $(basename $(VERSION))
 endif
 
-ifeq (,$(findstring $(MAJORVERSION), 9.6 10 11 12 13 14))
-    $(error PostgreSQL 9.6, 10, 11, 12, 13, or 14 is required to compile this extension)
+ifeq (,$(findstring $(MAJORVERSION), 13 14 15 16))
+    $(error PostgreSQL 13, 14 15 or 16 is required to compile this extension)
 endif
 
 ifdef REGRESS_PREFIX

diff --git a/Makefile.legacy b/Makefile.legacy
@@ -2,6 +2,7 @@
 #
 # Portions Copyright (c) 2004-2022, EnterpriseDB Corporation.
 # Portions Copyright © 2012–2014 Citus Data, Inc.
+# Portions Copyright (c) 2021, TOSHIBA CORPORATION
 #
 
 MODULE_big = mongo_fdw
@@ -46,8 +47,8 @@ ifndef MAJORVERSION
     MAJORVERSION := $(basename $(VERSION))
 endif
 
-ifeq (,$(findstring $(MAJORVERSION), 9.6 10 11 12 13 14))
-    $(error PostgreSQL 9.6, 10, 11, 12, 13, or 14 is required to compile this extension)
+ifeq (,$(findstring $(MAJORVERSION), 13 14 15 16))
+    $(error PostgreSQL 13, 14 15 or 16 is required to compile this extension)
 endif
 
 ifdef REGRESS_PREFIX

diff --git a/Makefile.meta b/Makefile.meta
@@ -2,6 +2,7 @@
 #
 # Portions Copyright (c) 2004-2022, EnterpriseDB Corporation.
 # Portions Copyright © 2012–2014 Citus Data, Inc.
+# Portions Copyright (c) 2021, TOSHIBA CORPORATION
 #
 
 MODULE_big = mongo_fdw
@@ -50,8 +51,8 @@ ifndef MAJORVERSION
     MAJORVERSION := $(basename $(VERSION))
 endif
 
-ifeq (,$(findstring $(MAJORVERSION), 13 14 15))
-    $(error PostgreSQL 13, 14 or 15 is required to compile this extension)
+ifeq (,$(findstring $(MAJORVERSION), 13 14 15 16))
+    $(error PostgreSQL 13, 14 15 or 16 is required to compile this extension)
 endif
 
 ifdef REGRESS_PREFIX

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This PostgreSQL extension implements a Foreign Data Wrapper (FDW) for
 [MongoDB][1].
 
 Please note that this version of mongo_fdw works with PostgreSQL and EDB
-Postgres Advanced Server 9.6, 10, 11, 12, 13, and 14.
+Postgres Advanced Server 13, 14, 15 and 16.
 
 Installation
 ------------
@@ -579,6 +579,7 @@ License
 -------
 Portions Copyright (c) 2004-2022, EnterpriseDB Corporation.
 Portions Copyright © 2012–2014 Citus Data, Inc.
+Portions Copyright (c) 2021, TOSHIBA CORPORATION
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by

diff --git a/autogen.sh b/autogen.sh
@@ -7,6 +7,7 @@
 #
 # Portions Copyright (c) 2012-2014, PostgreSQL Global Development Group
 # Portions Copyright (c) 2004-2022, EnterpriseDB Corporation.
+# Portions Copyright (c) 2021, TOSHIBA CORPORATION
 #
 # IDENTIFICATION
 #             autogen.sh
@@ -30,7 +31,7 @@ if ! [ -x "$(command -v cmake3)" ]; then
 fi
 
 ###
-# Pull the latest version of Monggo C Driver's master branch
+# Pull the latest version of Mongo C Driver's master branch
 #
 function checkout_mongo_driver
 {
@@ -42,7 +43,7 @@ function checkout_mongo_driver
 }
 
 ###
-# Pull the legacy branch from the Mongo C Driver's
+# Pull the legacy branch of the Mongo C Driver
 #
 function checkout_legacy_branch
 {
@@ -112,6 +113,7 @@ function create_config
 cleanup
 
 if [ "--with-legacy" = $1 ]; then
+	echo "Warning: The legacy driver support has been deprecated in mongo_fdw 5.4.0 and is expected to be removed entirely in a future release."
 	checkout_json_lib &&
 	checkout_legacy_branch &&
 	install_json_lib &&

diff --git a/data/aggregates_test_data.js b/data/aggregates_test_data.js
diff --git a/data/join_test_data.js b/data/join_test_data.js
@@ -45,6 +45,7 @@ db.b2.drop();
 db.innertab.drop();
 db.fkest.drop();
 db.fkest1.drop();
+db.j1.drop();
 
 // Below queries will create and insert values in collections
 db.J1_TBL.insertMany([
@@ -12285,4 +12286,6 @@ db.fkest1.insertMany([
 db.int2_tbl.insertMany([
     {_id: NumberInt(1), f1: NumberInt(0) },
     {_id: NumberInt(2), f1: NumberInt(1) }
-]);
+]);
+
+db.createCollection("j1");
diff --git a/data/json_test_data.js b/data/json_test_data.js
@@ -8,6 +8,8 @@ db.test_json.drop();
 db.foo.drop();
 db.jspoptest.drop();
 db.json_tbl.drop();
+db.repeat_json_tbl.drop();
+db.pg_input_is_valid_tbl.drop();
 
 // Below queries will create and insert values in collections
 db.rows.insertMany([
@@ -67,4 +69,7 @@ db.nestjsonb.insertMany([
     {_id : ObjectId("60f10025c6d173cad75bf388"), j : {"a":[["b",{"x":NumberInt(1)}],["b",{"x":NumberInt(2)}]],"c":NumberInt(3)} },
     {_id : ObjectId("60f10025c6d173cad75bf389"), j : [[NumberInt(14),NumberInt(2),NumberInt(3)]] },
     {_id : ObjectId("60f10025c6d173cad75bf38a"), j : [NumberInt(1),[NumberInt(14),NumberInt(2),NumberInt(3)]] }
-]);
+]);
+
+db.createCollection("repeat_json_tbl");
+db.createCollection("pg_input_is_valid_tbl");
diff --git a/data/jsonb_testjsonb.js b/data/jsonb_testjsonb.js
diff --git a/deparse.c b/deparse.c
@@ -6,6 +6,7 @@
  * Portions Copyright (c) 2012-2014, PostgreSQL Global Development Group
  * Portions Copyright (c) 2004-2022, EnterpriseDB Corporation.
  * Portions Copyright (c) 2012–2014 Citus Data, Inc.
+ * Portions Copyright (c) 2021, TOSHIBA CORPORATION
  *
  * IDENTIFICATION
  * 		deparse.c

diff --git a/expected/13.8/column_remapping.out → expected/13.12/column_remapping.out b/expected/13.8/column_remapping.out → expected/13.12/column_remapping.out
diff --git a/expected/13.8/connection_validation.out → expected/13.12/connection_validation.out b/expected/13.8/connection_validation.out → expected/13.12/connection_validation.out
diff --git a/expected/13.8/connection_validation_1.out → expected/13.12/connection_validation_1.out b/expected/13.8/connection_validation_1.out → expected/13.12/connection_validation_1.out
diff --git a/expected/13.8/dml.out → expected/13.12/dml.out b/expected/13.8/dml.out → expected/13.12/dml.out
diff --git a/expected/13.8/extra/aggregates.out → expected/13.12/extra/aggregates.out b/expected/13.8/extra/aggregates.out → expected/13.12/extra/aggregates.out
diff --git a/expected/13.8/extra/enhance.out → expected/13.12/extra/enhance.out b/expected/13.8/extra/enhance.out → expected/13.12/extra/enhance.out
diff --git a/expected/13.8/extra/join.out → expected/13.12/extra/join.out b/expected/13.8/extra/join.out → expected/13.12/extra/join.out
diff --git a/expected/13.8/extra/json.out → expected/13.12/extra/json.out b/expected/13.8/extra/json.out → expected/13.12/extra/json.out
diff --git a/expected/13.8/extra/jsonb.out → expected/13.12/extra/jsonb.out b/expected/13.8/extra/jsonb.out → expected/13.12/extra/jsonb.out
diff --git a/expected/13.8/extra/limit.out → expected/13.12/extra/limit.out b/expected/13.8/extra/limit.out → expected/13.12/extra/limit.out
diff --git a/expected/13.8/join_pushdown.out → expected/13.12/join_pushdown.out b/expected/13.8/join_pushdown.out → expected/13.12/join_pushdown.out
diff --git a/expected/13.8/pushdown.out → expected/13.12/pushdown.out b/expected/13.8/pushdown.out → expected/13.12/pushdown.out
diff --git a/expected/13.8/select.out → expected/13.12/select.out b/expected/13.8/select.out → expected/13.12/select.out
@@ -16,7 +16,7 @@ CREATE USER MAPPING FOR public SERVER mongo_server;
 SELECT mongo_fdw_version();
  mongo_fdw_version 
 -------------------
-             50400
+             50500
 (1 row)
 
 -- Create foreign tables

diff --git a/expected/13.8/select_1.out → expected/13.12/select_1.out b/expected/13.8/select_1.out → expected/13.12/select_1.out
@@ -12,7 +12,7 @@ CREATE USER MAPPING FOR public SERVER mongo_server;
 SELECT mongo_fdw_version();
  mongo_fdw_version 
 -------------------
-             50400
+             50500
 (1 row)
 
 -- Create foreign tables

diff --git a/expected/13.8/server_options.out → expected/13.12/server_options.out b/expected/13.8/server_options.out → expected/13.12/server_options.out
diff --git a/expected/13.8/server_options_1.out → expected/13.12/server_options_1.out b/expected/13.8/server_options_1.out → expected/13.12/server_options_1.out
diff --git a/expected/14.5/column_remapping.out → expected/14.9/column_remapping.out b/expected/14.5/column_remapping.out → expected/14.9/column_remapping.out
diff --git a/expected/14.5/connection_validation.out → expected/14.9/connection_validation.out b/expected/14.5/connection_validation.out → expected/14.9/connection_validation.out
diff --git a/expected/14.5/connection_validation_1.out → expected/14.9/connection_validation_1.out b/expected/14.5/connection_validation_1.out → expected/14.9/connection_validation_1.out
diff --git a/expected/14.5/dml.out → expected/14.9/dml.out b/expected/14.5/dml.out → expected/14.9/dml.out
diff --git a/expected/14.5/extra/aggregates.out → expected/14.9/extra/aggregates.out b/expected/14.5/extra/aggregates.out → expected/14.9/extra/aggregates.out
diff --git a/expected/14.5/extra/enhance.out → expected/14.9/extra/enhance.out b/expected/14.5/extra/enhance.out → expected/14.9/extra/enhance.out
diff --git a/expected/14.5/extra/join.out → expected/14.9/extra/join.out b/expected/14.5/extra/join.out → expected/14.9/extra/join.out
diff --git a/expected/14.5/extra/json.out → expected/14.9/extra/json.out b/expected/14.5/extra/json.out → expected/14.9/extra/json.out
diff --git a/expected/14.5/extra/jsonb.out → expected/14.9/extra/jsonb.out b/expected/14.5/extra/jsonb.out → expected/14.9/extra/jsonb.out
diff --git a/expected/14.5/extra/limit.out → expected/14.9/extra/limit.out b/expected/14.5/extra/limit.out → expected/14.9/extra/limit.out
diff --git a/expected/14.5/join_pushdown.out → expected/14.9/join_pushdown.out b/expected/14.5/join_pushdown.out → expected/14.9/join_pushdown.out
diff --git a/expected/14.5/pushdown.out → expected/14.9/pushdown.out b/expected/14.5/pushdown.out → expected/14.9/pushdown.out
diff --git a/expected/14.5/select.out → expected/14.9/select.out b/expected/14.5/select.out → expected/14.9/select.out
@@ -16,7 +16,7 @@ CREATE USER MAPPING FOR public SERVER mongo_server;
 SELECT mongo_fdw_version();
  mongo_fdw_version 
 -------------------
-             50400
+             50500
 (1 row)
 
 -- Create foreign tables

diff --git a/expected/15.0/select_1.out → expected/14.9/select_1.out b/expected/15.0/select_1.out → expected/14.9/select_1.out
@@ -12,7 +12,7 @@ CREATE USER MAPPING FOR public SERVER mongo_server;
 SELECT mongo_fdw_version();
  mongo_fdw_version 
 -------------------
-             50400
+             50500
 (1 row)
 
 -- Create foreign tables

diff --git a/expected/14.5/server_options.out → expected/14.9/server_options.out b/expected/14.5/server_options.out → expected/14.9/server_options.out
diff --git a/expected/14.5/server_options_1.out → expected/14.9/server_options_1.out b/expected/14.5/server_options_1.out → expected/14.9/server_options_1.out
diff --git a/expected/15.0/column_remapping.out → expected/15.4/column_remapping.out b/expected/15.0/column_remapping.out → expected/15.4/column_remapping.out
diff --git a/expected/15.0/connection_validation.out → expected/15.4/connection_validation.out b/expected/15.0/connection_validation.out → expected/15.4/connection_validation.out
diff --git a/expected/15.0/connection_validation_1.out → expected/15.4/connection_validation_1.out b/expected/15.0/connection_validation_1.out → expected/15.4/connection_validation_1.out
diff --git a/expected/15.0/dml.out → expected/15.4/dml.out b/expected/15.0/dml.out → expected/15.4/dml.out
diff --git a/expected/15.0/extra/aggregates.out → expected/15.4/extra/aggregates.out b/expected/15.0/extra/aggregates.out → expected/15.4/extra/aggregates.out
diff --git a/expected/15.0/extra/enhance.out → expected/15.4/extra/enhance.out b/expected/15.0/extra/enhance.out → expected/15.4/extra/enhance.out
diff --git a/expected/15.0/extra/join.out → expected/15.4/extra/join.out b/expected/15.0/extra/join.out → expected/15.4/extra/join.out
diff --git a/expected/15.0/extra/json.out → expected/15.4/extra/json.out b/expected/15.0/extra/json.out → expected/15.4/extra/json.out
diff --git a/expected/15.0/extra/jsonb.out → expected/15.4/extra/jsonb.out b/expected/15.0/extra/jsonb.out → expected/15.4/extra/jsonb.out
diff --git a/expected/15.0/extra/limit.out → expected/15.4/extra/limit.out b/expected/15.0/extra/limit.out → expected/15.4/extra/limit.out
diff --git a/expected/15.0/join_pushdown.out → expected/15.4/join_pushdown.out b/expected/15.0/join_pushdown.out → expected/15.4/join_pushdown.out
diff --git a/expected/15.0/pushdown.out → expected/15.4/pushdown.out b/expected/15.0/pushdown.out → expected/15.4/pushdown.out
diff --git a/expected/15.0/select.out → expected/15.4/select.out b/expected/15.0/select.out → expected/15.4/select.out
@@ -16,7 +16,7 @@ CREATE USER MAPPING FOR public SERVER mongo_server;
 SELECT mongo_fdw_version();
  mongo_fdw_version 
 -------------------
-             50400
+             50500
 (1 row)
 
 -- Create foreign tables

diff --git a/expected/14.5/select_1.out → expected/15.4/select_1.out b/expected/14.5/select_1.out → expected/15.4/select_1.out
@@ -12,7 +12,7 @@ CREATE USER MAPPING FOR public SERVER mongo_server;
 SELECT mongo_fdw_version();
  mongo_fdw_version 
 -------------------
-             50400
+             50500
 (1 row)
 
 -- Create foreign tables

diff --git a/expected/15.0/server_options.out → expected/15.4/server_options.out b/expected/15.0/server_options.out → expected/15.4/server_options.out
diff --git a/expected/15.0/server_options_1.out → expected/15.4/server_options_1.out b/expected/15.0/server_options_1.out → expected/15.4/server_options_1.out
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ CREATE USER MAPPING FOR public SERVER mongo_server; @@
     SELECT mongo_fdw_version();
      mongo_fdw_version
     -------------------
     (1 row)
     -- Create foreign tables
@@ Expand Down @@