Merge pull request IvorySQL#714 from bigplaice/support_package_dev_catchup_master

Support package

Author: gaoxueyu

configure

@@ -835,6 +835,7 @@ with_libraries
 with_libs
 enable_integer_datetimes
 enable_nls
+enable_cursor_unname
 with_pgport
 with_oraport
 enable_rpath
@@ -1530,6 +1531,7 @@ Optional Features:
                           obsolete option, no longer supported
   --enable-nls[=LANGUAGES]
                           enable Native Language Support
+  --enable-cursor-unname  enable explicit cursor uname
   --disable-rpath         do not embed shared library search path in
                           executables
   --disable-spinlocks     do not use spinlocks
@@ -3190,6 +3192,32 @@ $as_echo "$enable_nls" >&6; }
 
 
 
+#
+# CURSOR_UNNAME
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CURSOR_UNNAME is wanted" >&5
+$as_echo_n "checking whether CURSOR_UNNAME is wanted... " >&6; }
+# Check whether --enable-cursor-unname was given.
+if test "${enable_cursor_unname+set}" = set; then :
+  enableval=$enable_cursor_unname;
+  case $enableval in
+    yes)
+$as_echo "#define ENABLE_CURSOR_UNNAME 1" >>confdefs.h
+      ;;
+    no)
+      :
+      ;;
+    *)
+      as_fn_error $? "no argument expected for --enable-cursor-unname option" "$LINENO" 5
+      ;;
+  esac
+else
+  enable_cursor_unname=no
+fi
+
+
+
+
 #
 # Default port number (--with-pgport), default 5432
 #

configure.ac

@@ -150,6 +150,16 @@ AC_MSG_RESULT([$enable_nls])
 AC_SUBST(enable_nls)
 AC_SUBST(WANTED_LANGUAGES)
 
+#
+# CURSOR_UNNAME
+#
+AC_MSG_CHECKING([whether CURSOR_UNNAME is wanted])
+PGAC_ARG_BOOL(enable, cursor-unname,
+                no, [enable explicit cursor uname],
+                [AC_DEFINE(ENABLE_CURSOR_UNNAME, 1,
+                           [Define to 1 if you want explicit cursor with unname. (--enable-cursor-uname)])])
+
+
 #
 # Default port number (--with-pgport), default 5432
 #

contrib/ivorysql_ora/src/sysview/sysview--1.0.sql

@@ -1013,3 +1013,4 @@ SELECT
 	decode(bitand(s.flags, 64), 64, 'Y', 'N') AS session_flag,null AS keep_value
 	FROM PG_SEQUENCE s,pg_class c where s.seqrelid = c.oid and c.relowner::regrole = current_user::regrole;
 
+

contrib/postgres_fdw/expected/ivy_postgres_fdw.out

@@ -13251,12 +13251,13 @@ UPDATE async_pt SET c = c || c WHERE b = 0 RETURNING *;
                Filter: (async_pt_3.b = '0'::number)
 (19 rows)
 
-UPDATE async_pt SET c = c || c WHERE b = 0 RETURNING *;
+UPDATE async_pt SET c = c || c WHERE b = 0;
+SELECT * FROM async_pt WHERE b = 0 ORDER BY a DESC;
   a   | b |    c     
 ------+---+----------
  3000 | 0 | 00000000
- 1000 | 0 | 00000000
  2000 | 0 | 00000000
+ 1000 | 0 | 00000000
 (3 rows)
 
 EXPLAIN (VERBOSE, COSTS OFF)

contrib/postgres_fdw/sql/ivy_postgres_fdw.sql

@@ -4107,7 +4107,8 @@ RESET enable_hashjoin;
 -- Test that UPDATE/DELETE with inherited target works with async_capable enabled
 EXPLAIN (VERBOSE, COSTS OFF)
 UPDATE async_pt SET c = c || c WHERE b = 0 RETURNING *;
-UPDATE async_pt SET c = c || c WHERE b = 0 RETURNING *;
+UPDATE async_pt SET c = c || c WHERE b = 0;
+SELECT * FROM async_pt WHERE b = 0 ORDER BY a DESC;
 EXPLAIN (VERBOSE, COSTS OFF)
 DELETE FROM async_pt WHERE b = 0 RETURNING *;
 DELETE FROM async_pt WHERE b = 0;

src/backend/access/common/session.c

@@ -25,6 +25,7 @@
 #include "storage/shm_toc.h"
 #include "utils/memutils.h"
 #include "utils/typcache.h"
+#include "utils/dsa.h"
 
 /* Magic number for per-session DSM TOC. */
 #define SESSION_MAGIC						0xabb0fbc9

src/backend/access/hash/hashvalidate.c

@@ -301,7 +301,8 @@ check_hash_func_signature(Oid funcid, int16 amprocnum, Oid argtype)
 		elog(ERROR, "cache lookup failed for function %u", funcid);
 	procform = (Form_pg_proc) GETSTRUCT(tp);
 
-	if (procform->prorettype != restype || procform->proretset ||
+	if (get_func_real_rettype(tp) != restype || 
+		procform->proretset || 
 		procform->pronargs != nargs)
 		result = false;
 

src/backend/access/index/amvalidate.c

@@ -25,6 +25,8 @@
 #include "catalog/pg_type.h"
 #include "parser/parse_coerce.h"
 #include "utils/syscache.h"
+#include "utils/lsyscache.h"
+
 
 
 /*
@@ -163,7 +165,8 @@ check_amproc_signature(Oid funcid, Oid restype, bool exact,
 		elog(ERROR, "cache lookup failed for function %u", funcid);
 	procform = (Form_pg_proc) GETSTRUCT(tp);
 
-	if (procform->prorettype != restype || procform->proretset ||
+	if (get_func_real_rettype(tp) != restype || 
+		procform->proretset || 
 		procform->pronargs < minargs || procform->pronargs > maxargs)
 		result = false;