It would also be handy if users could see their own pg_stat_activity

queries while the rest remain blank.

Kevin Brown

diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 002134c9acde98f43d7c5fd8f0cf6e8684a54e06..48bbe9561bba9d914df00862c684e2a284f66c5d 100644 (file)
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -212,9 +212,10 @@ postgres: user database host 
       data on the current query are only available if the
       STATS_COMMAND_STRING configuration option has
       been enabled. Furthermore, these columns can only be accessed by
-      superusers; to other users, they always appear NULL. (Note that
-      because of the collector's reporting delay, current query will
-      only be up-to-date for long-running queries.)
+      superusers; or when the user examining the view is the same as the user
+      in the row; for others it reads as null.  (Note that because of the 
+      collector's reporting delay, current query will only be up-to-date for 
+      long-running queries.)
      
 
      
@@ -534,7 +535,8 @@ postgres: user database host 
       text
       
        Current query of backend process (NULL if caller is not
-       superuser, or STATS_COMMAND_STRING is not enabled)
+       superuser, or is the same user as that of the backend being queried,
+       or STATS_COMMAND_STRING is not enabled)
       
      
 

diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 455da1c2aa9429d257efc85ac79a6c10c317d049..c2f0ea2c8299ffd0bed3871fdbf8ee3e2f5ca8b2 100644 (file)
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -284,14 +284,14 @@ pg_stat_get_backend_activity(PG_FUNCTION_ARGS)
    int         len;
    text       *result;
 
-   if (!superuser())
-       PG_RETURN_NULL();
-
    beid = PG_GETARG_INT32(0);
 
    if ((beentry = pgstat_fetch_stat_beentry(beid)) == NULL)
        PG_RETURN_NULL();
 
+   if (!superuser() && beentry->userid != GetUserId())
+       PG_RETURN_NULL();
+
    len = strlen(beentry->activity);
    result = palloc(VARHDRSZ + len);
    VARATT_SIZEP(result) = VARHDRSZ + len;