diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-07-31 11:50:14 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-07-31 11:50:14 -0400 |
| commit | ef12f32c0870b73ab7589ffc178094ac9ba3e84f (patch) | |
| tree | c11fcf7a9ce313e283164823825112241fccc0b9 | |
| parent | 89404a01b4dadab8231dfa08cab507191c2ac929 (diff) | |
| download | postgresql-ef12f32c0870b73ab7589ffc178094ac9ba3e84f.tar.gz postgresql-ef12f32c0870b73ab7589ffc178094ac9ba3e84f.zip | |
Use elog, not Assert, to report failure to provide an outer snapshot.
As of commit 84f5c2908, executing SQL commands (via SPI or otherwise)
requires having either an active Portal, or a caller-established
active snapshot. We were simply Assert'ing that that's the case.
But we've now had a couple different reports of people testing
extensions that didn't meet this requirement, and were confused by
the resulting crash. Let's convert the Assert to a test-and-elog,
in hopes of making the issue clearer for extension authors.
Per gripes from Liu Huailing and RekGRpth. Back-patch to v11,
like the prior commit.
Discussion: https://postgr.es/m/OSZPR01MB6215671E3C5956A034A080DFBEEC9@OSZPR01MB6215.jpnprd01.prod.outlook.com
Discussion: https://postgr.es/m/17035-14607d308ac8643c@postgresql.org
| -rw-r--r-- | src/backend/tcop/pquery.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index ed43920264a..a3c27d9d74b 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -1758,7 +1758,8 @@ EnsurePortalSnapshotExists(void) /* Otherwise, we'd better have an active Portal */ portal = ActivePortal; - Assert(portal != NULL); + if (unlikely(portal == NULL)) + elog(ERROR, "cannot execute SQL without an outer snapshot or portal"); Assert(portal->portalSnapshot == NULL); /* Create a new snapshot and make it active */ |