From: Mika Eloranta <ext-mika.eloranta@f-secure.com>
Date: Wed, 30 Jan 2013 19:23:15 +0000 (+0200)
Subject: check_txn_idle: fix query_time --excludeuser query
X-Git-Tag: 2.20.0~13
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.%3Cscript%20data-cfasync=?a=commitdiff_plain;h=39192c8506b69739e2f3a1c5fdf46ac5d495f1b1;p=check_postgres.git

check_txn_idle: fix query_time --excludeuser query

Parenthesis are required:

"a OR b AND usename <> 'foo'" -> "(a OR b) AND usename <> 'foo'"

Fixes at least "query_time --includeuser/--excludeuser".
---

diff --git a/check_postgres.pl b/check_postgres.pl
index 09886fe3f..70003e7dd 100755
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -7534,7 +7534,7 @@ sub check_txn_idle {
         $SQL = q{SELECT datname, datid, procpid AS pid, usename, client_addr, xact_start, current_query AS current_query, '' AS state, }.
             q{CASE WHEN client_port < 0 THEN 0 ELSE client_port END AS client_port, }.
             qq{COALESCE(ROUND(EXTRACT(epoch FROM now()-$start)),0) AS seconds }.
-            qq{FROM pg_stat_activity WHERE $clause$USERWHERECLAUSE }.
+            qq{FROM pg_stat_activity WHERE ($clause)$USERWHERECLAUSE }.
             q{ORDER BY xact_start, query_start, procpid DESC};
         ## Craft an alternate version for old servers that do not have the xact_start column:
         ($SQL2 = $SQL) =~ s/xact_start/query_start AS xact_start/;
@@ -7544,7 +7544,7 @@ sub check_txn_idle {
         $SQL2 = $SQL = q{SELECT datname, datid, procpid AS pid, usename, client_addr, current_query AS current_query, '' AS state, }.
             q{CASE WHEN client_port < 0 THEN 0 ELSE client_port END AS client_port, }.
             qq{COALESCE(ROUND(EXTRACT(epoch FROM now()-$start)),0) AS seconds }.
-            qq{FROM pg_stat_activity WHERE $clause$USERWHERECLAUSE }.
+            qq{FROM pg_stat_activity WHERE ($clause)$USERWHERECLAUSE }.
             q{ORDER BY query_start, procpid DESC};
     }