Log Message:
-----------
Bug #1152

Description:

    The query_slony_status function doesn't work with uppercase
    setnames (the watchdog2 script uses that function).
    workaround is to use \\"_$SETNAME\\" instead of _$SETNAME in the
    script, and to use my $result=`$SLON_BIN_PATH/psql -p $port -h
    $host -U slony --tuples-only $dbname --command="$query"`;
    as the query command (the username was missing there).

Modified Files:
--------------
    slony1-engine/tools/altperl:
        slon-tools.pm (r1.19 -> r1.20)

-------------- next part --------------
Index: slon-tools.pm
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon-tools.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -Ltools/altperl/slon-tools.pm -Ltools/altperl/slon-tools.pm -u -w -r1.19 -r1.20
--- tools/altperl/slon-tools.pm
+++ tools/altperl/slon-tools.pm
@@ -174,23 +174,23 @@
 select * from 
 (select now() - con_timestamp < '$killafter'::interval, now() - con_timestamp as age,
        con_timestamp
-from _$CLUSTER_NAME.sl_confirm c, _$CLUSTER_NAME.sl_subscribe slony_master
+from "_$CLUSTER_NAME".sl_confirm c, "_$CLUSTER_NAME".sl_subscribe slony_master
   where c.con_origin = slony_master.sub_provider and
-             not exists (select * from _$CLUSTER_NAME.sl_subscribe providers
+             not exists (select * from "_$CLUSTER_NAME".sl_subscribe providers
                   where providers.sub_receiver = slony_master.sub_provider and
                         providers.sub_set = slony_master.sub_set and
                         slony_master.sub_active = 't' and
                         providers.sub_active = 't') and
-        c.con_received = _$CLUSTER_NAME.getLocalNodeId('_$CLUSTER_NAME') and
+        c.con_received = "_$CLUSTER_NAME".getLocalNodeId('_$CLUSTER_NAME') and
         now() - con_timestamp < '$killafter'::interval
 limit 1) as slave_confirmed_events
 union all (select
 now() - con_timestamp < '$killafter'::interval, now() - con_timestamp as age,
        con_timestamp
-from _$CLUSTER_NAME.sl_confirm c, _$CLUSTER_NAME.sl_subscribe slony_master
-  where c.con_origin = _$CLUSTER_NAME.getLocalNodeId('_$CLUSTER_NAME') and
-             exists (select * from _$CLUSTER_NAME.sl_subscribe providers
-                  where providers.sub_provider = _$CLUSTER_NAME.getLocalNodeId('_$CLUSTER_NAME') and
+from "_$CLUSTER_NAME".sl_confirm c, "_$CLUSTER_NAME".sl_subscribe slony_master
+  where c.con_origin = "_$CLUSTER_NAME".getLocalNodeId('_$CLUSTER_NAME') and
+             exists (select * from "_$CLUSTER_NAME".sl_subscribe providers
+                  where providers.sub_provider = "_$CLUSTER_NAME".getLocalNodeId('_$CLUSTER_NAME') and
                         slony_master.sub_active = 't') and
         now() - con_timestamp < '$killafter'::interval
 limit 1)