--- pgdiff	2003/08/12 20:38:02	1.5
+++ pgdiff	2003/08/13 13:27:32	1.6
@@ -266,6 +266,7 @@
 
 		# insert into slave database
 		sub sql_insert {
+			my $dbh = shift @_ || die "need dbh";
 			my $table = shift @_ || die "need table as argument";
 			my $row = shift @_ || die "need row data";
 			my @cols = @_;
@@ -273,7 +274,7 @@
 			my $sql = "insert into $table (".join(",",@cols).") values (";
 			my $comma = "";
 			foreach my $col (@cols) {
-				$sql .= $comma.$mdbh->quote($row->{$col});
+				$sql .= $comma.$dbh->quote($row->{$col});
 				$comma = ",";
 			}
 			$sql.=")";
@@ -283,15 +284,16 @@
 
 		# delete from slave database
 		sub sql_delete {
+			my $dbh = shift @_ || die "need dbh";
 			my $table = shift @_ || die "need table as argument";
 			my $row = shift @_ || die "need row as argument";
 			my @cols_pk = @_;
 
 			my $where = sql_where(@cols_pk);
 
-			my $sql = "delete from $table ";
+			my $sql = "delete from $table";
 			foreach my $col (@cols_pk) {
-				my $val = $sdbh->quote($row->{$col}) || die "can't find value in row for col $col";
+				my $val = $dbh->quote($row->{$col}) || die "can't find value in row for col $col";
 				$where =~ s/\?/$val/;
 			}
 			$sql .= $where;
@@ -301,12 +303,19 @@
 
 		# update row in slave database
 		sub sql_update {
+			my $dbh = shift @_ || die "need dbh";
 			my $table = shift @_ || die "need table as argument";
 			my $col = shift @_ || die "need col to update";
-			my $val = shift @_ || die "need new val";
-			my @cols_pk = @_ || die "need pk idenitifier";
+			my $row = shift @_ || die "need row";
+			my @cols_pk = @_;
 
-			my $sql = "udate $table set $col=".$mdbh->quote($val);
+			my $sql = "update $table set $col=".$dbh->quote($row->{$col});
+			my $where = sql_where(@cols_pk);
+			foreach my $col (@cols_pk) {
+				my $val = $dbh->quote($row->{$col}) || die "can't find value in row for col $col";
+				$where =~ s/\?/$val/;
+			}
+			$sql .= $where;
 			debug_sql($sql);
 			return $sql;
 		}
@@ -326,7 +335,7 @@
 				$diff_row++;
 				$pk_same = 0;
 				print STDERR "EXTRA row in table '$table' pk: [".join(",",@cols_pk)."] value (".join(",",pk_val($srow,@cols_pk)).")\n" if ($verbose);
-				print sql_delete($table,$srow,@cols_pk),";\n";
+				print sql_delete($sdbh,$table,$srow,@cols_pk),";\n";
 				$have_srow = FETCH_ROW;
 				last;
 			} elsif ( ($have_mrow == HAVE_ROW && $have_srow == NO_ROW) ||
@@ -334,7 +343,7 @@
 				$diff_row++;
 				$pk_same = 0;
 				print STDERR "MISSING row in table '$table' pk: [".join(",",@cols_pk)."] value (".join(",",pk_val($mrow,@cols_pk)).")\n" if ($verbose);
-				print sql_insert($table,$mrow,@cols),";\n";
+				print sql_insert($mdbh,$table,$mrow,@cols),";\n";
 				$have_mrow = FETCH_ROW;
 				last;
 			}
@@ -346,7 +355,7 @@
 				if ($mrow->{$col} ne $srow->{$col}) {
 					$diff_row++;
 					print STDERR "DIFF in table '$table' row ($col): [".join(",",@cols_pk)."] '$mrow->{$col}' != '$srow->{$col}'\n" if ($verbose);
-					print sql_update($table,$col,$mrow->{$col},@cols_pk),";\n";
+					print sql_update($mdbh,$table,$col,$mrow,@cols_pk),";\n";
 				}
 			}
 			$have_mrow = FETCH_ROW;