Merge pull request IvorySQL#937 from jiaoshuntian/callinto_5stable

Callinto 5stable

Author: gaoxueyu

contrib/file_fdw/expected/ivy_file_fdw.out

@@ -1,6 +1,7 @@
 --
 -- Test foreign-data wrapper file_fdw.
 --
+\set EXECUTE_RUN_PREPARE on
 -- directory paths are passed to us in environment variables
 \getenv abs_srcdir PG_ABS_SRCDIR
 -- Clean up in case a prior regression run failed

contrib/file_fdw/sql/ivy_file_fdw.sql

@@ -2,6 +2,7 @@
 -- Test foreign-data wrapper file_fdw.
 --
 
+\set EXECUTE_RUN_PREPARE on
 -- directory paths are passed to us in environment variables
 \getenv abs_srcdir PG_ABS_SRCDIR
 

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

@@ -1086,7 +1086,7 @@ SELECT
 	decode(bitand(s.flags, 16), 16, 'Y', 'N') AS scale_flag,
 	decode(bitand(s.flags, 2048), 2048, 'Y', 'N') AS extend_flag,null AS shared_flag,
 	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;
+	FROM PG_SEQUENCE s,pg_class c where s.seqrelid = c.oid and pg_get_userbyid(c.relowner) = current_user;
 
 CREATE OR REPLACE VIEW SYS.DBA_VIEWS AS
 SELECT

contrib/pg_stat_statements/expected/ivy_squashing.out

@@ -1,6 +1,7 @@
 --
 -- Const squashing functionality
 --
+\set EXECUTE_RUN_PREPARE on
 CREATE EXTENSION pg_stat_statements;
 --
 -- Simple Lists

contrib/pg_stat_statements/expected/ivy_utility.out

@@ -1,6 +1,7 @@
 --
 -- Utility commands
 --
+\set EXECUTE_RUN_PREPARE on
 -- These tests require track_utility to be enabled.
 SET pg_stat_statements.track_utility = TRUE;
 SELECT pg_stat_statements_reset() IS NOT NULL AS t;

contrib/pg_stat_statements/expected/planning.out

@@ -1,6 +1,7 @@
 --
 -- Information related to planning
 --
+\set EXECUTE_RUN_PREPARE on
 -- These tests require track_planning to be enabled.
 SET pg_stat_statements.track_planning = TRUE;
 SELECT pg_stat_statements_reset() IS NOT NULL AS t;

contrib/pg_stat_statements/expected/select.out

@@ -1,6 +1,7 @@
 --
 -- SELECT statements
 --
+\set EXECUTE_RUN_PREPARE on
 CREATE EXTENSION pg_stat_statements;
 SET pg_stat_statements.track_utility = FALSE;
 SET pg_stat_statements.track_planning = TRUE;

contrib/pg_stat_statements/sql/ivy_squashing.sql

@@ -1,6 +1,7 @@
 --
 -- Const squashing functionality
 --
+\set EXECUTE_RUN_PREPARE on
 CREATE EXTENSION pg_stat_statements;
 
 --

contrib/pg_stat_statements/sql/ivy_utility.sql

@@ -1,6 +1,7 @@
 --
 -- Utility commands
 --
+\set EXECUTE_RUN_PREPARE on
 
 -- These tests require track_utility to be enabled.
 SET pg_stat_statements.track_utility = TRUE;

contrib/pg_stat_statements/sql/planning.sql

@@ -1,6 +1,7 @@
 --
 -- Information related to planning
 --
+\set EXECUTE_RUN_PREPARE on
 
 -- These tests require track_planning to be enabled.
 SET pg_stat_statements.track_planning = TRUE;