- I borked DBCommon.pl by mistake (setFactInfo duplication).

[infobot.git] / src / db_mysql.pl

diff --git a/src/db_mysql.pl b/src/db_mysql.pl
index b4820513cba9a10bc24dd5f1fa183292b18b4fa4..1b3f3dc617a23ecaaf09fe970302d11ec0c556d3 100644 (file)
--- a/src/db_mysql.pl
+++ b/src/db_mysql.pl
@@ -49,8 +49,13 @@ sub dbGet {
     my $query  = "SELECT $select FROM $table";
     $query     .= " WHERE $where" if ($where);
 
-    if (!defined $select) {
-       &WARN("dbGet: select == NULL. table => $table");
+    if (!defined $select or $select =~ /^\s*$/) {
+       &WARN("dbGet: select == NULL.");
+       return;
+    }
+
+    if (!defined $table or $table =~ /^\s*$/) {
+       &WARN("dbGet: table == NULL.");
        return;
     }
 
@@ -134,8 +139,6 @@ sub dbGetColNiceHash {
     $query     .= " WHERE ".$where if ($where);
     my %retval;
 
-    &DEBUG("dbGetColNiceHash: query => '$query'.");
-
     my $sth = $dbh->prepare($query);
     &SQLDebug($query);
     if (!$sth->execute) {
@@ -188,6 +191,21 @@ sub dbSet {
        } keys %{$phref}
     );
 
+    if (!defined $phref) {
+       &WARN("dbset: phref == NULL.");
+       return;
+    }
+
+    if (!defined $href) {
+       &WARN("dbset: href == NULL.");
+       return;
+    }
+
+    if (!defined $table) {
+       &WARN("dbset: table == NULL.");
+       return;
+    }
+
     my $result = &dbGet($table, join(',', keys %{$phref}), $where);
 
     my(@keys,@vals);