RELEASE_v2.1.1 (#34)

Support Postgresql 14.0 Support check invalid options
pgspider · Dec 21, 2021 · 5dfaa13 · 5dfaa13
1 parent bf8f926
commit 5dfaa13
Show file tree

Hide file tree

Showing 176 changed files with 770 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # GridDB Foreign Data Wrapper for PostgreSQL
 
 This PostgreSQL extension is a Foreign Data Wrapper (FDW) for [GridDB][1].  
-This version of griddb_fdw can work for PostgreSQL 10, 11, 12, 13 and 14. It is confirmed in GridDB 4.6.0.
+This version of griddb_fdw can work for PostgreSQL 10, 11, 12, 13 and 14. It is confirmed in GridDB 4.6.1.
 
 ## 1. Installation
 griddb_fdw requires GridDB's C client library. This library can be downloaded from the [GridDB][1] website on github[1].
@@ -187,6 +187,9 @@ Returning is way to obtain data if rows are modified by INSERT, UPDATE, and DELE
 INSERT INTO ft1 (c0, c1) VALUES (1, 2) RETURNING c0, c1;
 ```
 
+#### Don't support DIRECT MODIFICATION
+#### Don't support IMPORT FOREIGN SCHEMA with option import_generated
+
 ## 5. License
 Copyright (c) 2017-2021, TOSHIBA Corporation  
 Copyright (c) 2011-2016, EnterpriseDB Corporation

diff --git a/deparse.c b/deparse.c
@@ -88,7 +88,8 @@ typedef struct deparse_expr_cxt
 
 	StringInfo	buf;			/* output buffer to append to */
 	List	  **params_list;	/* exprs that will become remote Params */
-	bool		can_skip_cast;	/* outer function can skip int2/int4/int8/float4/float8 cast */
+	bool		can_skip_cast;	/* outer function can skip
+								 * int2/int4/int8/float4/float8 cast */
 	GridDBAggref *aggref;
 } deparse_expr_cxt;
 

diff --git a/expected/10.17/aggregates.out → expected/10.18/aggregates.out b/expected/10.17/aggregates.out → expected/10.18/aggregates.out
diff --git a/expected/10.17/float4.out → expected/10.18/float4.out b/expected/10.17/float4.out → expected/10.18/float4.out
diff --git a/expected/10.17/float8.out → expected/10.18/float8.out b/expected/10.17/float8.out → expected/10.18/float8.out
diff --git a/expected/10.17/griddb_fdw.out → expected/10.18/griddb_fdw.out b/expected/10.17/griddb_fdw.out → expected/10.18/griddb_fdw.out
@@ -687,14 +687,14 @@ ERROR:  rowkey-column update is not supported
 SELECT * FROM public.griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Testcase 116:
 SELECT griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Test pushdown LIMIT...OFFSET

diff --git a/expected/10.17/griddb_fdw_data_type.out → expected/10.18/griddb_fdw_data_type.out b/expected/10.17/griddb_fdw_data_type.out → expected/10.18/griddb_fdw_data_type.out
diff --git a/expected/10.17/griddb_fdw_post.out → expected/10.18/griddb_fdw_post.out b/expected/10.17/griddb_fdw_post.out → expected/10.18/griddb_fdw_post.out
@@ -9837,9 +9837,11 @@ FROM SERVER griddb_svr INTO import_grid4;
  import_grid4 | FLOAT8_TBL                | griddb_svr |             | 
  import_grid4 | FLOAT8_TMP                | griddb_svr |             | 
  import_grid4 | INT2_TBL                  | griddb_svr |             | 
+ import_grid4 | INT2_TMP                  | griddb_svr |             | 
  import_grid4 | INT4_TBL                  | griddb_svr |             | 
  import_grid4 | INT4_TMP                  | griddb_svr |             | 
  import_grid4 | INT8_TBL                  | griddb_svr |             | 
+ import_grid4 | INT8_TMP                  | griddb_svr |             | 
  import_grid4 | J1_TBL                    | griddb_svr |             | 
  import_grid4 | J2_TBL                    | griddb_svr |             | 
  import_grid4 | T0                        | griddb_svr |             | 
@@ -10097,7 +10099,7 @@ FROM SERVER griddb_svr INTO import_grid4;
  import_grid4 | zt1                       | griddb_svr |             | 
  import_grid4 | zt2                       | griddb_svr |             | 
  import_grid4 | zt3                       | griddb_svr |             | 
-(264 rows)
+(266 rows)
 
 -- Assorted error cases
 IMPORT FOREIGN SCHEMA griddb_schema FROM SERVER griddb_svr INTO import_grid4;
@@ -10290,6 +10292,7 @@ NOTICE:  relation "nt3" already exists, skipping
 NOTICE:  relation "agg_t6" already exists, skipping
 NOTICE:  relation "loc2" already exists, skipping
 NOTICE:  relation "INT2_TBL" already exists, skipping
+NOTICE:  relation "INT2_TMP" already exists, skipping
 NOTICE:  relation "batch_table_p1" already exists, skipping
 NOTICE:  relation "tenk1" already exists, skipping
 NOTICE:  relation "innertab" already exists, skipping
@@ -10364,6 +10367,7 @@ NOTICE:  relation "INT4_TMP" already exists, skipping
 NOTICE:  relation "bitwise_test" already exists, skipping
 NOTICE:  relation "agg_t1" already exists, skipping
 NOTICE:  relation "INT8_TBL" already exists, skipping
+NOTICE:  relation "INT8_TMP" already exists, skipping
 NOTICE:  relation "hpart13" already exists, skipping
 IMPORT FOREIGN SCHEMA nonesuch FROM SERVER griddb_svr INTO import_grid4; -- same as 'public'
 NOTICE:  relation "aggtest" already exists, skipping
@@ -10556,6 +10560,7 @@ NOTICE:  relation "nt3" already exists, skipping
 NOTICE:  relation "agg_t6" already exists, skipping
 NOTICE:  relation "loc2" already exists, skipping
 NOTICE:  relation "INT2_TBL" already exists, skipping
+NOTICE:  relation "INT2_TMP" already exists, skipping
 NOTICE:  relation "batch_table_p1" already exists, skipping
 NOTICE:  relation "tenk1" already exists, skipping
 NOTICE:  relation "innertab" already exists, skipping
@@ -10630,6 +10635,7 @@ NOTICE:  relation "INT4_TMP" already exists, skipping
 NOTICE:  relation "bitwise_test" already exists, skipping
 NOTICE:  relation "agg_t1" already exists, skipping
 NOTICE:  relation "INT8_TBL" already exists, skipping
+NOTICE:  relation "INT8_TMP" already exists, skipping
 NOTICE:  relation "hpart13" already exists, skipping
 IMPORT FOREIGN SCHEMA nonesuch FROM SERVER griddb_svr INTO notthere;
 ERROR:  schema "notthere" does not exist

diff --git a/expected/10.17/insert.out → expected/10.18/insert.out b/expected/10.17/insert.out → expected/10.18/insert.out
diff --git a/expected/10.17/int4.out → expected/10.18/int4.out b/expected/10.17/int4.out → expected/10.18/int4.out
diff --git a/expected/10.17/int8.out → expected/10.18/int8.out b/expected/10.17/int8.out → expected/10.18/int8.out
diff --git a/expected/10.17/join.out → expected/10.18/join.out b/expected/10.17/join.out → expected/10.18/join.out
diff --git a/expected/10.17/limit.out → expected/10.18/limit.out b/expected/10.17/limit.out → expected/10.18/limit.out
diff --git a/expected/10.17/numeric.out → expected/10.18/numeric.out b/expected/10.17/numeric.out → expected/10.18/numeric.out
diff --git a/expected/10.17/prepare.out → expected/10.18/prepare.out b/expected/10.17/prepare.out → expected/10.18/prepare.out
diff --git a/expected/10.17/select.out → expected/10.18/select.out b/expected/10.17/select.out → expected/10.18/select.out
diff --git a/expected/10.17/select_having.out → expected/10.18/select_having.out b/expected/10.17/select_having.out → expected/10.18/select_having.out
diff --git a/expected/10.17/selectfunc.out → expected/10.18/selectfunc.out b/expected/10.17/selectfunc.out → expected/10.18/selectfunc.out
diff --git a/expected/10.17/update.out → expected/10.18/update.out b/expected/10.17/update.out → expected/10.18/update.out
diff --git a/expected/11.12/aggregates.out → expected/11.13/aggregates.out b/expected/11.12/aggregates.out → expected/11.13/aggregates.out
diff --git a/expected/11.12/float4.out → expected/11.13/float4.out b/expected/11.12/float4.out → expected/11.13/float4.out
diff --git a/expected/11.12/float8.out → expected/11.13/float8.out b/expected/11.12/float8.out → expected/11.13/float8.out
diff --git a/expected/11.12/griddb_fdw.out → expected/11.13/griddb_fdw.out b/expected/11.12/griddb_fdw.out → expected/11.13/griddb_fdw.out
@@ -687,14 +687,14 @@ ERROR:  rowkey-column update is not supported
 SELECT * FROM public.griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Testcase 116:
 SELECT griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Test pushdown LIMIT...OFFSET

diff --git a/expected/11.12/griddb_fdw_data_type.out → expected/11.13/griddb_fdw_data_type.out b/expected/11.12/griddb_fdw_data_type.out → expected/11.13/griddb_fdw_data_type.out
diff --git a/expected/11.12/griddb_fdw_post.out → expected/11.13/griddb_fdw_post.out b/expected/11.12/griddb_fdw_post.out → expected/11.13/griddb_fdw_post.out
@@ -9866,9 +9866,11 @@ FROM SERVER griddb_svr INTO import_grid4;
  import_grid4 | FLOAT8_TBL                | griddb_svr |             | 
  import_grid4 | FLOAT8_TMP                | griddb_svr |             | 
  import_grid4 | INT2_TBL                  | griddb_svr |             | 
+ import_grid4 | INT2_TMP                  | griddb_svr |             | 
  import_grid4 | INT4_TBL                  | griddb_svr |             | 
  import_grid4 | INT4_TMP                  | griddb_svr |             | 
  import_grid4 | INT8_TBL                  | griddb_svr |             | 
+ import_grid4 | INT8_TMP                  | griddb_svr |             | 
  import_grid4 | J1_TBL                    | griddb_svr |             | 
  import_grid4 | J2_TBL                    | griddb_svr |             | 
  import_grid4 | T0                        | griddb_svr |             | 
@@ -10126,7 +10128,7 @@ FROM SERVER griddb_svr INTO import_grid4;
  import_grid4 | zt1                       | griddb_svr |             | 
  import_grid4 | zt2                       | griddb_svr |             | 
  import_grid4 | zt3                       | griddb_svr |             | 
-(264 rows)
+(266 rows)
 
 -- Assorted error cases
 IMPORT FOREIGN SCHEMA griddb_schema FROM SERVER griddb_svr INTO import_grid4;
@@ -10319,6 +10321,7 @@ NOTICE:  relation "nt3" already exists, skipping
 NOTICE:  relation "agg_t6" already exists, skipping
 NOTICE:  relation "loc2" already exists, skipping
 NOTICE:  relation "INT2_TBL" already exists, skipping
+NOTICE:  relation "INT2_TMP" already exists, skipping
 NOTICE:  relation "batch_table_p1" already exists, skipping
 NOTICE:  relation "tenk1" already exists, skipping
 NOTICE:  relation "innertab" already exists, skipping
@@ -10393,6 +10396,7 @@ NOTICE:  relation "INT4_TMP" already exists, skipping
 NOTICE:  relation "bitwise_test" already exists, skipping
 NOTICE:  relation "agg_t1" already exists, skipping
 NOTICE:  relation "INT8_TBL" already exists, skipping
+NOTICE:  relation "INT8_TMP" already exists, skipping
 NOTICE:  relation "hpart13" already exists, skipping
 IMPORT FOREIGN SCHEMA nonesuch FROM SERVER griddb_svr INTO import_grid4; -- same as 'public'
 NOTICE:  relation "aggtest" already exists, skipping
@@ -10585,6 +10589,7 @@ NOTICE:  relation "nt3" already exists, skipping
 NOTICE:  relation "agg_t6" already exists, skipping
 NOTICE:  relation "loc2" already exists, skipping
 NOTICE:  relation "INT2_TBL" already exists, skipping
+NOTICE:  relation "INT2_TMP" already exists, skipping
 NOTICE:  relation "batch_table_p1" already exists, skipping
 NOTICE:  relation "tenk1" already exists, skipping
 NOTICE:  relation "innertab" already exists, skipping
@@ -10659,6 +10664,7 @@ NOTICE:  relation "INT4_TMP" already exists, skipping
 NOTICE:  relation "bitwise_test" already exists, skipping
 NOTICE:  relation "agg_t1" already exists, skipping
 NOTICE:  relation "INT8_TBL" already exists, skipping
+NOTICE:  relation "INT8_TMP" already exists, skipping
 NOTICE:  relation "hpart13" already exists, skipping
 IMPORT FOREIGN SCHEMA nonesuch FROM SERVER griddb_svr INTO notthere;
 ERROR:  schema "notthere" does not exist

diff --git a/expected/11.12/insert.out → expected/11.13/insert.out b/expected/11.12/insert.out → expected/11.13/insert.out
diff --git a/expected/11.12/int4.out → expected/11.13/int4.out b/expected/11.12/int4.out → expected/11.13/int4.out
diff --git a/expected/11.12/int8.out → expected/11.13/int8.out b/expected/11.12/int8.out → expected/11.13/int8.out
diff --git a/expected/11.12/join.out → expected/11.13/join.out b/expected/11.12/join.out → expected/11.13/join.out
diff --git a/expected/11.12/limit.out → expected/11.13/limit.out b/expected/11.12/limit.out → expected/11.13/limit.out
diff --git a/expected/11.12/numeric.out → expected/11.13/numeric.out b/expected/11.12/numeric.out → expected/11.13/numeric.out
diff --git a/expected/11.12/prepare.out → expected/11.13/prepare.out b/expected/11.12/prepare.out → expected/11.13/prepare.out
diff --git a/expected/11.12/select.out → expected/11.13/select.out b/expected/11.12/select.out → expected/11.13/select.out
diff --git a/expected/11.12/select_having.out → expected/11.13/select_having.out b/expected/11.12/select_having.out → expected/11.13/select_having.out
diff --git a/expected/11.12/selectfunc.out → expected/11.13/selectfunc.out b/expected/11.12/selectfunc.out → expected/11.13/selectfunc.out
diff --git a/expected/11.12/update.out → expected/11.13/update.out b/expected/11.12/update.out → expected/11.13/update.out
diff --git a/expected/12.7/aggregates.out → expected/12.8/aggregates.out b/expected/12.7/aggregates.out → expected/12.8/aggregates.out
diff --git a/expected/12.7/float4.out → expected/12.8/float4.out b/expected/12.7/float4.out → expected/12.8/float4.out
diff --git a/expected/12.7/float8.out → expected/12.8/float8.out b/expected/12.7/float8.out → expected/12.8/float8.out
diff --git a/expected/12.7/griddb_fdw.out → expected/12.8/griddb_fdw.out b/expected/12.7/griddb_fdw.out → expected/12.8/griddb_fdw.out
@@ -687,14 +687,14 @@ ERROR:  rowkey-column update is not supported
 SELECT * FROM public.griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Testcase 116:
 SELECT griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Test pushdown LIMIT...OFFSET

diff --git a/expected/12.7/griddb_fdw_data_type.out → expected/12.8/griddb_fdw_data_type.out b/expected/12.7/griddb_fdw_data_type.out → expected/12.8/griddb_fdw_data_type.out
diff --git a/expected/12.7/griddb_fdw_post.out → expected/12.8/griddb_fdw_post.out b/expected/12.7/griddb_fdw_post.out → expected/12.8/griddb_fdw_post.out
@@ -9889,9 +9889,11 @@ FROM SERVER griddb_svr INTO import_grid4;
  import_grid4 | FLOAT8_TBL                | griddb_svr |             | 
  import_grid4 | FLOAT8_TMP                | griddb_svr |             | 
  import_grid4 | INT2_TBL                  | griddb_svr |             | 
+ import_grid4 | INT2_TMP                  | griddb_svr |             | 
  import_grid4 | INT4_TBL                  | griddb_svr |             | 
  import_grid4 | INT4_TMP                  | griddb_svr |             | 
  import_grid4 | INT8_TBL                  | griddb_svr |             | 
+ import_grid4 | INT8_TMP                  | griddb_svr |             | 
  import_grid4 | J1_TBL                    | griddb_svr |             | 
  import_grid4 | J2_TBL                    | griddb_svr |             | 
  import_grid4 | T0                        | griddb_svr |             | 
@@ -10149,7 +10151,7 @@ FROM SERVER griddb_svr INTO import_grid4;
  import_grid4 | zt1                       | griddb_svr |             | 
  import_grid4 | zt2                       | griddb_svr |             | 
  import_grid4 | zt3                       | griddb_svr |             | 
-(264 rows)
+(266 rows)
 
 -- Assorted error cases
 IMPORT FOREIGN SCHEMA griddb_schema FROM SERVER griddb_svr INTO import_grid4;
@@ -10342,6 +10344,7 @@ NOTICE:  relation "nt3" already exists, skipping
 NOTICE:  relation "agg_t6" already exists, skipping
 NOTICE:  relation "loc2" already exists, skipping
 NOTICE:  relation "INT2_TBL" already exists, skipping
+NOTICE:  relation "INT2_TMP" already exists, skipping
 NOTICE:  relation "batch_table_p1" already exists, skipping
 NOTICE:  relation "tenk1" already exists, skipping
 NOTICE:  relation "innertab" already exists, skipping
@@ -10416,6 +10419,7 @@ NOTICE:  relation "INT4_TMP" already exists, skipping
 NOTICE:  relation "bitwise_test" already exists, skipping
 NOTICE:  relation "agg_t1" already exists, skipping
 NOTICE:  relation "INT8_TBL" already exists, skipping
+NOTICE:  relation "INT8_TMP" already exists, skipping
 NOTICE:  relation "hpart13" already exists, skipping
 IMPORT FOREIGN SCHEMA nonesuch FROM SERVER griddb_svr INTO import_grid4; -- same as 'public'
 NOTICE:  relation "aggtest" already exists, skipping
@@ -10608,6 +10612,7 @@ NOTICE:  relation "nt3" already exists, skipping
 NOTICE:  relation "agg_t6" already exists, skipping
 NOTICE:  relation "loc2" already exists, skipping
 NOTICE:  relation "INT2_TBL" already exists, skipping
+NOTICE:  relation "INT2_TMP" already exists, skipping
 NOTICE:  relation "batch_table_p1" already exists, skipping
 NOTICE:  relation "tenk1" already exists, skipping
 NOTICE:  relation "innertab" already exists, skipping
@@ -10682,6 +10687,7 @@ NOTICE:  relation "INT4_TMP" already exists, skipping
 NOTICE:  relation "bitwise_test" already exists, skipping
 NOTICE:  relation "agg_t1" already exists, skipping
 NOTICE:  relation "INT8_TBL" already exists, skipping
+NOTICE:  relation "INT8_TMP" already exists, skipping
 NOTICE:  relation "hpart13" already exists, skipping
 IMPORT FOREIGN SCHEMA nonesuch FROM SERVER griddb_svr INTO notthere;
 ERROR:  schema "notthere" does not exist

diff --git a/expected/12.7/insert.out → expected/12.8/insert.out b/expected/12.7/insert.out → expected/12.8/insert.out
diff --git a/expected/12.7/int4.out → expected/12.8/int4.out b/expected/12.7/int4.out → expected/12.8/int4.out
diff --git a/expected/12.7/int8.out → expected/12.8/int8.out b/expected/12.7/int8.out → expected/12.8/int8.out
diff --git a/expected/12.7/join.out → expected/12.8/join.out b/expected/12.7/join.out → expected/12.8/join.out
diff --git a/expected/12.7/limit.out → expected/12.8/limit.out b/expected/12.7/limit.out → expected/12.8/limit.out
diff --git a/expected/12.7/numeric.out → expected/12.8/numeric.out b/expected/12.7/numeric.out → expected/12.8/numeric.out
diff --git a/expected/12.7/prepare.out → expected/12.8/prepare.out b/expected/12.7/prepare.out → expected/12.8/prepare.out
diff --git a/expected/12.7/select.out → expected/12.8/select.out b/expected/12.7/select.out → expected/12.8/select.out
diff --git a/expected/12.7/select_having.out → expected/12.8/select_having.out b/expected/12.7/select_having.out → expected/12.8/select_having.out
diff --git a/expected/12.7/selectfunc.out → expected/12.8/selectfunc.out b/expected/12.7/selectfunc.out → expected/12.8/selectfunc.out
diff --git a/expected/12.7/update.out → expected/12.8/update.out b/expected/12.7/update.out → expected/12.8/update.out
diff --git a/expected/13.3/aggregates.out → expected/13.4/aggregates.out b/expected/13.3/aggregates.out → expected/13.4/aggregates.out
diff --git a/expected/13.3/float4.out → expected/13.4/float4.out b/expected/13.3/float4.out → expected/13.4/float4.out
diff --git a/expected/13.3/float8.out → expected/13.4/float8.out b/expected/13.3/float8.out → expected/13.4/float8.out
diff --git a/expected/13.3/griddb_fdw.out → expected/13.4/griddb_fdw.out b/expected/13.3/griddb_fdw.out → expected/13.4/griddb_fdw.out
@@ -687,14 +687,14 @@ ERROR:  rowkey-column update is not supported
 SELECT * FROM public.griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Testcase 116:
 SELECT griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Test pushdown LIMIT...OFFSET

diff --git a/expected/13.3/griddb_fdw_data_type.out → expected/13.4/griddb_fdw_data_type.out b/expected/13.3/griddb_fdw_data_type.out → expected/13.4/griddb_fdw_data_type.out
diff --git a/expected/13.3/griddb_fdw_post.out → expected/13.4/griddb_fdw_post.out b/expected/13.3/griddb_fdw_post.out → expected/13.4/griddb_fdw_post.out
@@ -9895,9 +9895,11 @@ FROM SERVER griddb_svr INTO import_grid4;
  import_grid4 | FLOAT8_TBL                | griddb_svr |             | 
  import_grid4 | FLOAT8_TMP                | griddb_svr |             | 
  import_grid4 | INT2_TBL                  | griddb_svr |             | 
+ import_grid4 | INT2_TMP                  | griddb_svr |             | 
  import_grid4 | INT4_TBL                  | griddb_svr |             | 
  import_grid4 | INT4_TMP                  | griddb_svr |             | 
  import_grid4 | INT8_TBL                  | griddb_svr |             | 
+ import_grid4 | INT8_TMP                  | griddb_svr |             | 
  import_grid4 | J1_TBL                    | griddb_svr |             | 
  import_grid4 | J2_TBL                    | griddb_svr |             | 
  import_grid4 | T0                        | griddb_svr |             | 
@@ -10155,7 +10157,7 @@ FROM SERVER griddb_svr INTO import_grid4;
  import_grid4 | zt1                       | griddb_svr |             | 
  import_grid4 | zt2                       | griddb_svr |             | 
  import_grid4 | zt3                       | griddb_svr |             | 
-(264 rows)
+(266 rows)
 
 -- Assorted error cases
 IMPORT FOREIGN SCHEMA griddb_schema FROM SERVER griddb_svr INTO import_grid4;
@@ -10348,6 +10350,7 @@ NOTICE:  relation "nt3" already exists, skipping
 NOTICE:  relation "agg_t6" already exists, skipping
 NOTICE:  relation "loc2" already exists, skipping
 NOTICE:  relation "INT2_TBL" already exists, skipping
+NOTICE:  relation "INT2_TMP" already exists, skipping
 NOTICE:  relation "batch_table_p1" already exists, skipping
 NOTICE:  relation "tenk1" already exists, skipping
 NOTICE:  relation "innertab" already exists, skipping
@@ -10422,6 +10425,7 @@ NOTICE:  relation "INT4_TMP" already exists, skipping
 NOTICE:  relation "bitwise_test" already exists, skipping
 NOTICE:  relation "agg_t1" already exists, skipping
 NOTICE:  relation "INT8_TBL" already exists, skipping
+NOTICE:  relation "INT8_TMP" already exists, skipping
 NOTICE:  relation "hpart13" already exists, skipping
 IMPORT FOREIGN SCHEMA nonesuch FROM SERVER griddb_svr INTO import_grid4; -- same as 'public'
 NOTICE:  relation "aggtest" already exists, skipping
@@ -10614,6 +10618,7 @@ NOTICE:  relation "nt3" already exists, skipping
 NOTICE:  relation "agg_t6" already exists, skipping
 NOTICE:  relation "loc2" already exists, skipping
 NOTICE:  relation "INT2_TBL" already exists, skipping
+NOTICE:  relation "INT2_TMP" already exists, skipping
 NOTICE:  relation "batch_table_p1" already exists, skipping
 NOTICE:  relation "tenk1" already exists, skipping
 NOTICE:  relation "innertab" already exists, skipping
@@ -10688,6 +10693,7 @@ NOTICE:  relation "INT4_TMP" already exists, skipping
 NOTICE:  relation "bitwise_test" already exists, skipping
 NOTICE:  relation "agg_t1" already exists, skipping
 NOTICE:  relation "INT8_TBL" already exists, skipping
+NOTICE:  relation "INT8_TMP" already exists, skipping
 NOTICE:  relation "hpart13" already exists, skipping
 IMPORT FOREIGN SCHEMA nonesuch FROM SERVER griddb_svr INTO notthere;
 ERROR:  schema "notthere" does not exist

diff --git a/expected/13.3/insert.out → expected/13.4/insert.out b/expected/13.3/insert.out → expected/13.4/insert.out
diff --git a/expected/13.3/int4.out → expected/13.4/int4.out b/expected/13.3/int4.out → expected/13.4/int4.out
diff --git a/expected/13.3/int8.out → expected/13.4/int8.out b/expected/13.3/int8.out → expected/13.4/int8.out
diff --git a/expected/13.3/join.out → expected/13.4/join.out b/expected/13.3/join.out → expected/13.4/join.out
diff --git a/expected/13.3/limit.out → expected/13.4/limit.out b/expected/13.3/limit.out → expected/13.4/limit.out
diff --git a/expected/13.3/numeric.out → expected/13.4/numeric.out b/expected/13.3/numeric.out → expected/13.4/numeric.out
diff --git a/expected/13.3/prepare.out → expected/13.4/prepare.out b/expected/13.3/prepare.out → expected/13.4/prepare.out
diff --git a/expected/13.3/select.out → expected/13.4/select.out b/expected/13.3/select.out → expected/13.4/select.out
diff --git a/expected/13.3/select_having.out → expected/13.4/select_having.out b/expected/13.3/select_having.out → expected/13.4/select_having.out
diff --git a/expected/13.3/selectfunc.out → expected/13.4/selectfunc.out b/expected/13.3/selectfunc.out → expected/13.4/selectfunc.out
diff --git a/expected/13.3/update.out → expected/13.4/update.out b/expected/13.3/update.out → expected/13.4/update.out
diff --git a/expected/14beta2/aggregates.out → expected/14.0/aggregates.out b/expected/14beta2/aggregates.out → expected/14.0/aggregates.out
@@ -2405,6 +2405,42 @@ select aggfns(distinct a,b,c order by a,c using ~<~,b) filter (where a > 1) from
 (1 row)
 
 rollback;
+-- check handling of bare boolean Var in FILTER
+--Testcase 583:
+select max(0) filter (where b1) from bool_test;
+ max 
+-----
+   0
+(1 row)
+
+--Testcase 584:
+select (select max(0) filter (where b1)) from bool_test;
+ max 
+-----
+   0
+(1 row)
+
+-- check for correct detection of nested-aggregate errors in FILTER
+--Testcase 585:
+select max(unique1) filter (where sum(ten) > 0) from tenk1;
+ERROR:  aggregate functions are not allowed in FILTER
+LINE 1: select max(unique1) filter (where sum(ten) > 0) from tenk1;
+                                          ^
+--Testcase 586:
+select (select max(unique1) filter (where sum(ten) > 0) from int8_tbl) from tenk1;
+ERROR:  aggregate function calls cannot be nested
+LINE 1: select (select max(unique1) filter (where sum(ten) > 0) from...
+                                                  ^
+--Testcase 587:
+select max(unique1) filter (where bool_or(ten > 0)) from tenk1;
+ERROR:  aggregate functions are not allowed in FILTER
+LINE 1: select max(unique1) filter (where bool_or(ten > 0)) from ten...
+                                          ^
+--Testcase 588:
+select (select max(unique1) filter (where bool_or(ten > 0)) from int8_tbl) from tenk1;
+ERROR:  aggregate function calls cannot be nested
+LINE 1: select (select max(unique1) filter (where bool_or(ten > 0)) ...
+                                                  ^
 -- ordered-set aggregates
 begin;
 --Testcase 377:
@@ -3409,7 +3445,7 @@ rollback;
 -- does not lead to array overflow due to unexpected duplicate hash keys
 -- see CAFeeJoKKu0u+A_A9R9316djW-YW3-+Gtgvy3ju655qRHR3jtdA@mail.gmail.com
 --Testcase 527:
-set enable_resultcache to off;
+set enable_memoize to off;
 --Testcase 528:
 explain (costs off)
   select 1 from tenk1
@@ -3426,7 +3462,7 @@ explain (costs off)
 (7 rows)
 
 --Testcase 529:
-reset enable_resultcache;
+reset enable_memoize;
 --
 -- Hash Aggregation Spill tests
 --

diff --git a/expected/14beta2/float4.out → expected/14.0/float4.out b/expected/14beta2/float4.out → expected/14.0/float4.out
diff --git a/expected/14beta2/float8.out → expected/14.0/float8.out b/expected/14beta2/float8.out → expected/14.0/float8.out
diff --git a/expected/14beta2/griddb_fdw.out → expected/14.0/griddb_fdw.out b/expected/14beta2/griddb_fdw.out → expected/14.0/griddb_fdw.out
@@ -688,14 +688,14 @@ ERROR:  rowkey-column update is not supported
 SELECT * FROM public.griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Testcase 111:
 SELECT griddb_fdw_version();
  griddb_fdw_version 
 --------------------
-              20100
+              20101
 (1 row)
 
 --Test pushdown LIMIT...OFFSET
@@ -880,7 +880,7 @@ WHERE t1.ten = ss2.id;
          ->  Foreign Scan on public.onek t2
                Output: num.id, t2.two
                Remote SQL: SELECT  *  FROM onek LIMIT 1 OFFSET 5
-   ->  Result Cache
+   ->  Memoize
          Output: ((num.id)), (t2.two)
          Cache Key: (num.id), t2.two
          ->  Foreign Scan on public.onek t3

diff --git a/expected/14beta2/griddb_fdw_data_type.out → expected/14.0/griddb_fdw_data_type.out b/expected/14beta2/griddb_fdw_data_type.out → expected/14.0/griddb_fdw_data_type.out