diff options
| -rw-r--r-- | src/backend/tcop/pquery.c | 14 | ||||
| -rw-r--r-- | src/test/regress/expected/portals.out | 24 | ||||
| -rw-r--r-- | src/test/regress/sql/portals.sql | 11 |
3 files changed, 47 insertions, 2 deletions
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index fa561a4861a..f9ed266c1ad 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -1661,6 +1661,9 @@ DoPortalRunFetch(Portal portal, static void DoPortalRewind(Portal portal) { + QueryDesc *queryDesc; + + /* Rewind holdStore, if we have one */ if (portal->holdStore) { MemoryContext oldcontext; @@ -1669,8 +1672,15 @@ DoPortalRewind(Portal portal) tuplestore_rescan(portal->holdStore); MemoryContextSwitchTo(oldcontext); } - if (PortalGetQueryDesc(portal)) - ExecutorRewind(PortalGetQueryDesc(portal)); + + /* Rewind executor, if active */ + queryDesc = PortalGetQueryDesc(portal); + if (queryDesc) + { + PushActiveSnapshot(queryDesc->snapshot); + ExecutorRewind(queryDesc); + PopActiveSnapshot(); + } portal->atStart = true; portal->atEnd = false; diff --git a/src/test/regress/expected/portals.out b/src/test/regress/expected/portals.out index aafc6cf5294..462ad231c36 100644 --- a/src/test/regress/expected/portals.out +++ b/src/test/regress/expected/portals.out @@ -1261,3 +1261,27 @@ FETCH ALL FROM c1; COMMIT; DROP TABLE cursor; +-- Check rewinding a cursor containing a stable function in LIMIT, +-- per bug report in 8336843.9833.1399385291498.JavaMail.root@quick +begin; +create function nochange(int) returns int + as 'select $1 limit 1' language sql stable; +declare c cursor for select * from int8_tbl limit nochange(3); +fetch all from c; + q1 | q2 +------------------+------------------ + 123 | 456 + 123 | 4567890123456789 + 4567890123456789 | 123 +(3 rows) + +move backward all in c; +fetch all from c; + q1 | q2 +------------------+------------------ + 123 | 456 + 123 | 4567890123456789 + 4567890123456789 | 123 +(3 rows) + +rollback; diff --git a/src/test/regress/sql/portals.sql b/src/test/regress/sql/portals.sql index 203e6577039..01c3b85da9a 100644 --- a/src/test/regress/sql/portals.sql +++ b/src/test/regress/sql/portals.sql @@ -473,3 +473,14 @@ UPDATE cursor SET a = 2; FETCH ALL FROM c1; COMMIT; DROP TABLE cursor; + +-- Check rewinding a cursor containing a stable function in LIMIT, +-- per bug report in 8336843.9833.1399385291498.JavaMail.root@quick +begin; +create function nochange(int) returns int + as 'select $1 limit 1' language sql stable; +declare c cursor for select * from int8_tbl limit nochange(3); +fetch all from c; +move backward all in c; +fetch all from c; +rollback; |