Various small tweaks.

diff --git a/Bucardo.pm b/Bucardo.pm
index a8dfaf61e67601a28f298184c152bcd0c6c52967..614157f141c877d96cba9a2ddb6af32cc745d210 100644 (file)
--- a/Bucardo.pm
+++ b/Bucardo.pm
@@ -3299,7 +3299,6 @@ sub start_kid {
                     $dmlcount{conflicts} += $count;
 
                     $self->glog("Conflicts for $S.$T: $count", LOG_NORMAL);
-$self->glog(Dumper \%conflict);
 
                     ## If we have a custom conflict handler for this goat, invoke it
                     if ($g->{code_conflict}) {
@@ -3447,7 +3446,6 @@ $self->glog(Dumper \%conflict);
                                                  . qq{(SELECT MAX(txntime) FROM bucardo.$g->{tracktable} }
                                                  . qq{WHERE target = '$x->{TARGETNAME}')};
                                             $g->{sql_got_delta} = $SQL;
-                                            $self->glog("AAAA Running $SQL");
                                         }
                                         $sth = $x->{dbh}->prepare($g->{sql_got_delta});
                                         $count = $sth->execute();

diff --git a/bucardo.schema b/bucardo.schema
index c97ee64877bd543abd3c21325ab9e2a84a62bd2c..a839cd39fd8298af43f9ef168b27cd31db115737 100644 (file)
--- a/bucardo.schema
+++ b/bucardo.schema
@@ -2133,16 +2133,16 @@ SELECT 'Fixme'::TEXT;
             my $makername = fetch1_sql($SQL,$dbh,$schema.'_'.$table);
             ## Create this table if needed, with one column per PK columns
             $sth = $sth{haztable};
-            my $delta_table = "delta_$makername";                      
+            my $delta_table = "delta_$makername";
             my $index1_name = "dex1_$makername";
             my $index2_name = "dex2_$makername";
             my $deltafunc = "delta_$makername";
             my $track_table = "track_$makername";
             my $index3_name = "dex3_$makername";
             my $stage_table = "stage_$makername";
-                       ## Need to account for quoted versions, e.g. names with spaces
-                       if ($makername =~ s/"//g) {
-              $delta_table = qq{"delta_$makername"};                   
+            ## Need to account for quoted versions, e.g. names with spaces
+            if ($makername =~ s/"//g) {
+              $delta_table = qq{"delta_$makername"};
               $index1_name = qq{"dex1_$makername"};
               $index2_name = qq{"dex2_$makername"};
               $deltafunc = qq{"delta_$makername"};
@@ -2150,14 +2150,14 @@ SELECT 'Fixme'::TEXT;
               $index3_name = qq{"dex3_$makername"};
               $stage_table = qq{"stage_$makername"};
             }
-                       ## Also need non-quoted versions to feed to execute()
-                       (my $noquote_delta_table = $delta_table) =~ s/^"(.+)"$/$1/;
-                       (my $noquote_index1_name = $index1_name) =~ s/^"(.+)"$/$1/;
-                       (my $noquote_index2_name = $index2_name) =~ s/^"(.+)"$/$1/;
-                       (my $noquote_deltafunc = $deltafunc) =~ s/^"(.+)"$/$1/;
-                       (my $noquote_track_table = $track_table) =~ s/^"(.+)"$/$1/;
-                       (my $noquote_index3_name = $index3_name) =~ s/^"(.+)"$/$1/;
-                       (my $noquote_stage_table = $stage_table) =~ s/^"(.+)"$/$1/;
+            ## Also need non-quoted versions to feed to execute()
+            (my $noquote_delta_table = $delta_table) =~ s/^"(.+)"$/$1/;
+            (my $noquote_index1_name = $index1_name) =~ s/^"(.+)"$/$1/;
+            (my $noquote_index2_name = $index2_name) =~ s/^"(.+)"$/$1/;
+            (my $noquote_deltafunc = $deltafunc) =~ s/^"(.+)"$/$1/;
+            (my $noquote_track_table = $track_table) =~ s/^"(.+)"$/$1/;
+            (my $noquote_index3_name = $index3_name) =~ s/^"(.+)"$/$1/;
+            (my $noquote_stage_table = $stage_table) =~ s/^"(.+)"$/$1/;
 
             $count = $sth->execute('bucardo',$noquote_delta_table);
             if ($count < 1) {

diff --git a/t/20-postgres.t b/t/20-postgres.t
index 19279efdea8724515e245370dca50746e6b78e38..a6f69f4c3b9f2c462c3b0e448149b664c95ffb1d 100644 (file)
--- a/t/20-postgres.t
+++ b/t/20-postgres.t
@@ -200,7 +200,7 @@ $res = $bct->ctl('bucardo kick sync pgtest3 0');
 like($res, qr/Cannot kick inactive sync/, $t);
 
 ## All rows should be on A, B, C, and D
-my $expected = [];
+$expected = [];
 push @$expected, [$_] for 1..10;
 $bct->check_for_row($expected, [qw/A B C D/]);