Fix crash in error report of invalid tuple lock
My tweak of these error messages in commit c359a1b082 contained the
thinko that a query would always have rowMarks set for a query
containing a locking clause. Not so: when declaring a cursor, for
instance, rowMarks isn't set at the point we're checking, so we'd be
dereferencing a NULL pointer.
The fix is to pass the lock strength to the function raising the error,
instead of trying to reverse-engineer it. The result not only is more
robust, but it also seems cleaner overall.
Per report from Robert Haas.
Branch
------
master
Details
-------
http://git.postgresql.org/pg/commitdiff/88c556680ca3faa40f7428c7705455d744a9859e
Modified Files
--------------
src/backend/optimizer/plan/planner.c | 3 ++-
src/backend/parser/analyze.c | 25 +++++++++----------------
src/include/parser/analyze.h | 2 +-
src/test/regress/expected/matview.out | 3 +++
src/test/regress/expected/portals.out | 4 ++++
src/test/regress/expected/union.out | 2 ++
src/test/regress/sql/matview.sql | 3 +++
src/test/regress/sql/portals.sql | 3 +++
src/test/regress/sql/union.sql | 2 ++
9 files changed, 29 insertions(+), 18 deletions(-)