Update of /home/cvsd/slony1/slony1-engine/tools
In directory main.slony.info:/tmp/cvs-serv4740

Modified Files:
      Tag: REL_1_2_STABLE
	test_slony_replication.pl test_slony_state.pl 
Log Message:
Bug #110 - some quoting problems


Index: test_slony_state.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/test_slony_state.pl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C 2 -d -r1.5.2.3 -r1.5.2.4
*** test_slony_state.pl	10 Feb 2010 22:21:27 -0000	1.5.2.3
--- test_slony_state.pl	10 Feb 2010 22:50:11 -0000	1.5.2.4
***************
*** 45,49 ****
  # Query to find live DSNs
  my $dsnsquery =
! "
     select p.pa_server, p.pa_conninfo
     from "_$cluster".sl_path p
--- 45,49 ----
  # Query to find live DSNs
  my $dsnsquery =
! qq{
     select p.pa_server, p.pa_conninfo
     from "_$cluster".sl_path p
***************
*** 52,56 ****
  --                          sub_active = 't')
     group by pa_server, pa_conninfo;
! ";
  
  print "Query:\n$dsnsquery\n";
--- 52,56 ----
  --                          sub_active = 't')
     group by pa_server, pa_conninfo;
! };
  
  print "Query:\n$dsnsquery\n";

Index: test_slony_replication.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/test_slony_replication.pl,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C 2 -d -r1.3.4.1 -r1.3.4.2
*** test_slony_replication.pl	17 Aug 2009 17:39:58 -0000	1.3.4.1
--- test_slony_replication.pl	10 Feb 2010 22:50:11 -0000	1.3.4.2
***************
*** 48,52 ****
  
  # Query to find the "master" node
! my $masterquery = "
    select sub_provider 
     from "_$cluster".sl_subscribe s1 
--- 48,52 ----
  
  # Query to find the "master" node
! my $masterquery = qq{
    select sub_provider 
     from "_$cluster".sl_subscribe s1 
***************
*** 57,61 ****
     and s1.sub_set = $set
     group by sub_provider;
! ";
  
  my $tq = $dbh->exec($masterquery);
--- 57,61 ----
     and s1.sub_set = $set
     group by sub_provider;
! };
  
  my $tq = $dbh->exec($masterquery);
***************
*** 71,75 ****
  # Query to find live DSNs
  my $dsnsquery =
! "
     select p.pa_server, p.pa_conninfo
     from "_$cluster".sl_path p
--- 71,75 ----
  # Query to find live DSNs
  my $dsnsquery =
! qq{
     select p.pa_server, p.pa_conninfo
     from "_$cluster".sl_path p
***************
*** 79,83 ****
                            sub_active = 't')
     group by pa_server, pa_conninfo;
! ";
  
  print "Query:\n$dsnsquery\n";
--- 79,83 ----
                            sub_active = 't')
     group by pa_server, pa_conninfo;
! };
  
  print "Query:\n$dsnsquery\n";