dbDel takes a hash, dbm untested

[infobot.git] / src / dbi.pl

diff --git a/src/dbi.pl b/src/dbi.pl
index 0c9a3f525afaab53d73e7db848356a8fb417fd54..162fda1f7df2ef14e9acbbe48ef9c5a4cbe45b8b 100644 (file)
--- a/src/dbi.pl
+++ b/src/dbi.pl
@@ -408,15 +408,17 @@ sub dbSetRow ($@$) {
 }
 
 #####
-# Usage: &dbDel($table, $primkey, $primval, [$key]);
+# Usage: &dbDel($table, $primhash_ref);
 #  Note: dbDel does dbQuote
 sub dbDel {
-    my ($table, $primkey, $primval, $key) = @_;
-
-    &dbRaw("Del", "DELETE FROM $table WHERE $primkey=".
-               &dbQuote($primval)
+    my ($table, $phref) = @_;
+    my $where = join(' AND ', map {
+               $_."=".&dbQuote($phref->{$_})
+       } keys %{$phref}
     );
 
+    &dbRaw("Del", "DELETE FROM $table WHERE $where");
+
     return 1;
 }