From: dms Date: Thu, 28 Nov 2002 12:19:24 +0000 (+0000) Subject: - last set of changes to convert from db*() to sql*() X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f5b6971238746faebb57730bcc946d5a2d1af56d;p=infobot.git - last set of changes to convert from db*() to sql*() git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@714 c11ca15a-4712-0410-83d8-924469b57eb5 --- diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl index 21b157b..f0e918c 100644 --- a/src/IRC/Schedulers.pl +++ b/src/IRC/Schedulers.pl @@ -284,7 +284,7 @@ sub seenFlushOld { my $max_time = &getChanConfDefault("seenMaxDays", 30) *60*60*24; my $delete = 0; - if ($param{'DBType'} =~ /^pgsql|mysql|sqlite/i) { + if ($param{'DBType'} =~ /^(pgsql|mysql|sqlite)/i) { my $query; if ($param{'DBType'} =~ /^mysql|sqlite$/i) { @@ -300,7 +300,7 @@ sub seenFlushOld { while (my @row = $sth->fetchrow_array) { my ($nick,$time) = @row; - &dbDel("seen",{"nick"=>$nick}); + &sqlDelete("seen", { nick => $nick } ); $delete++; } $sth->finish; @@ -309,7 +309,8 @@ sub seenFlushOld { my $time = time(); foreach (keys %seen) { - my $delta_time = $time - &dbGet("seen", "time", "nick", $_); + my $t2 = &sqlSelect("seen", "time", { nick => $_ }) || 0; + my $delta_time = $time - $t2; next unless ($delta_time > $max_time); &DEBUG("seenFlushOld: ".&Time2String($delta_time) ); diff --git a/src/Modules/Countdown.pl b/src/Modules/Countdown.pl index b294477..162e395 100644 --- a/src/Modules/Countdown.pl +++ b/src/Modules/Countdown.pl @@ -45,15 +45,15 @@ sub Countdown { my ($to_days,$dayname,$monname); if ($param{'DBType'} =~ /^mysql|sqlite$/i) { - $to_days = (&dbRawReturn("SELECT TO_DAYS(NOW()) - TO_DAYS('$sqldate')"))[0]; - $dayname = (&dbRawReturn("SELECT DAYNAME('$sqldate')"))[0]; - $monname = (&dbRawReturn("SELECT MONTHNAME('$sqldate')"))[0]; + $to_days = (&sqlRawReturn("SELECT TO_DAYS(NOW()) - TO_DAYS('$sqldate')"))[0]; + $dayname = (&sqlRawReturn("SELECT DAYNAME('$sqldate')"))[0]; + $monname = (&sqlRawReturn("SELECT MONTHNAME('$sqldate')"))[0]; } elsif ($param{'DBType'} =~ /^pgsql$/i) { - $to_days = (&dbRawReturn("SELECT date_trunc('day', + $to_days = (&sqlRawReturn("SELECT date_trunc('day', 'now'::timestamp - '$sqldate')"))[0]; - $dayname = qw(Sun Mon Tue Wed Thu Fri Sat)[(&dbRawReturn("SELECT extract(dow from timestamp '$sqldate')"))[0]]; - $monname = qw(BAD Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)[(&dbRawReturn("SELECT extract(month from timestamp '$sqldate')"))[0]]; + $dayname = qw(Sun Mon Tue Wed Thu Fri Sat)[(&sqlRawReturn("SELECT extract(dow from timestamp '$sqldate')"))[0]]; + $monname = qw(BAD Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)[(&sqlRawReturn("SELECT extract(month from timestamp '$sqldate')"))[0]]; } elsif ($param{'DBType'} =~ /^dbm$/i) { &FIXME("Countdown: no dbm support"); diff --git a/src/Modules/Factoids.pl b/src/Modules/Factoids.pl index f7e0f9f..56f7ab1 100644 --- a/src/Modules/Factoids.pl +++ b/src/Modules/Factoids.pl @@ -129,7 +129,7 @@ sub CmdFactInfo { return; } - &performStrictReply("$factinfo{'factoid_key'} -- ". join("; ", @array) ."."); + &pSReply("$factinfo{'factoid_key'} -- ". join("; ", @array) ."."); return; } @@ -137,10 +137,13 @@ sub CmdFactStats { my ($type) = @_; if ($type =~ /^author$/i) { - my %hash = &dbGetCol("factoids", "factoid_key,created_by", "created_by IS NOT NULL"); + my @array = &sqlSelectColArray("factoids", + "factoid_key,created_by", { }, + "created_by IS NOT NULL" + ); my %author; - foreach (keys %hash) { + foreach (@array) { my $thisnuh = $hash{$_}; $thisnuh =~ /^(\S+)!\S+@\S+$/; @@ -171,7 +174,10 @@ sub CmdFactStats { } elsif ($type =~ /^vandalism$/i) { &status("factstats(vandalism): starting..."); my $start_time = &timeget(); - my %data = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL"); + my %data = &sqlSelectColHash("factoids", + "factoid_key,factoid_value", { }, + "factoid_value IS NOT NULL" + ); my @list; my $delta_time = &timedelta($start_time); @@ -230,7 +236,8 @@ sub CmdFactStats { push(@list, "total prepared for deletion - $str"); # total unique authors. - foreach ( &dbRawReturn("SELECT created_by FROM factoids WHERE created_by IS NOT NULL") ) { + # todo: convert to sqlSelectColHash ? (or ColArray?) + foreach ( &sqlRawReturn("SELECT created_by FROM factoids WHERE created_by IS NOT NULL") ) { /^(\S+)!/; my $nick = lc $1; $hash{$nick}++; @@ -239,7 +246,7 @@ sub CmdFactStats { undef %hash; # total unique requesters. - foreach ( &dbRawReturn("SELECT requested_by FROM factoids WHERE requested_by IS NOT NULL") ) { + foreach ( &sqlRawReturn("SELECT requested_by FROM factoids WHERE requested_by IS NOT NULL") ) { /^(\S+)!/; my $nick = lc $1; $hash{$nick}++; @@ -298,7 +305,10 @@ sub CmdFactStats { } elsif ($type =~ /^dup(licate|e)$/i) { &status("factstats(dupe): starting..."); my $start_time = &timeget(); - my %hash = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL", 1); + my %hash = &sqlSelectColHash("factoids", + "factoid_key,factoid_value", { }, + "factoid_value IS NOT NULL", 1 + ); my $refs = 0; my @list; my $v; @@ -414,7 +424,10 @@ sub CmdFactStats { return &formListReply(1, $prefix, @list); } elsif ($type =~ /^locked$/i) { - my %hash = &dbGetCol("factoids", "factoid_key,locked_by", "locked_by IS NOT NULL"); + my %hash = &sqlSelectColhash("factoids", + "factoid_key,locked_by", { }, + "locked_by IS NOT NULL" + ); my @list = keys %hash; for (@list) { @@ -425,7 +438,10 @@ sub CmdFactStats { return &formListReply(0, $prefix, @list); } elsif ($type =~ /^new$/i) { - my %hash = &dbGetCol("factoids", "factoid_key,created_time", "created_time IS NOT NULL"); + my %hash = &sqlSelectColHash("factoids", + "factoid_key,created_time", { }, + "created_time IS NOT NULL" + ); my %age; foreach (keys %hash) { @@ -503,7 +519,10 @@ sub CmdFactStats { return &formListReply(1, $prefix, @list); } elsif ($type =~ /^profanity$/i) { - my %data = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL"); + my %data = &sqlSelectColHash("factoids", + "factoid_key,factoid_value", { }, + "factoid_value IS NOT NULL" + ); my @list; foreach (keys %data) { @@ -549,7 +568,10 @@ sub CmdFactStats { return &formListReply(1, $prefix, @newlist); } elsif ($type =~ /^request(ed)?$/i) { - my %hash = &dbGetCol("factoids", "factoid_key,requested_count", "requested_count IS NOT NULL", 1); + my %hash = &sqlSelectColHash("factoids", + "factoid_key,requested_count", { }, + "requested_count IS NOT NULL", 1 + ); if (!scalar keys %hash) { return 'sorry, no factoids have been questioned.'; @@ -574,9 +596,10 @@ sub CmdFactStats { return &formListReply(0, $prefix, @list); } elsif ($type =~ /^reqrate$/i) { - my %hash = &dbGetCol("factoids", - "factoid_key,(unix_timestamp() - created_time)/requested_count as rate", - "requested_by IS NOT NULL and created_time IS NOT NULL ORDER BY rate LIMIT 15", 1); + my %hash = &sqlSelectColHash("factoids", + "factoid_key,(unix_timestamp() - created_time)/requested_count as rate", { }, + "requested_by IS NOT NULL and created_time IS NOT NULL ORDER BY rate LIMIT 15", 1 + ); my $rate; my @list; @@ -593,7 +616,10 @@ sub CmdFactStats { return &formListReply(0, $prefix, @list); } elsif ($type =~ /^requesters?$/i) { - my %hash = &dbGetCol("factoids", "factoid_key,requested_by", "requested_by IS NOT NULL"); + my %hash = &sqlSelectColHash("factoids", + "factoid_key,requested_by", { }, + "requested_by IS NOT NULL" + ); my %requester; foreach (keys %hash) { @@ -700,7 +726,8 @@ sub CmdFactStats { return &formListReply(1, $prefix, @list); } elsif ($type =~ /^unrequest(ed)?$/i) { - my @list = &dbRawReturn("SELECT factoid_key FROM factoids WHERE requested_count IS NULL"); + # todo: use sqlSelect() + my @list = &sqlRawReturn("SELECT factoid_key FROM factoids WHERE requested_count IS NULL"); for (@list) { s/([\,\;]+)/\037$1\037/g; diff --git a/src/Modules/RootWarn.pl b/src/Modules/RootWarn.pl index cb3d967..ffd7ee2 100644 --- a/src/Modules/RootWarn.pl +++ b/src/Modules/RootWarn.pl @@ -13,7 +13,7 @@ use vars qw($dbh $found $ident); sub rootWarn { my ($nick,$user,$host,$chan) = @_; my $n = lc $nick; - my $attempt = &dbGet("rootwarn", "attempt", "nick=".&dbQuote($n) ) || 0; + my $attempt = &sqlSelect("rootwarn", "attempt", { nick => $n } ) || 0; my $warnmode = &getChanConf("rootWarnMode"); if ($attempt == 0) { # first timer. @@ -55,7 +55,7 @@ sub rootWarn { # ok... don't record the attempt if nick==root. return if ($nick eq "root"); - &dbSet("rootwarn", { nick => lc($nick) }, { + &sqlSet("rootwarn", { nick => lc($nick) }, { attempt => $attempt, time => time(), host => $user."\@".$host, diff --git a/src/Process.pl b/src/Process.pl index be05fdf..22ab7a8 100644 --- a/src/Process.pl +++ b/src/Process.pl @@ -314,15 +314,15 @@ sub process { return; } - my $karma = &dbGet("stats", "counter", - "nick=".&dbQuote($term)." AND type='karma'") || 0; + my $karma = &sqlSelect("stats", "counter", + { nick => $term, type => "karma" }) || 0; if ($inc eq '++') { $karma++; } else { $karma--; } - &dbSet("stats", + &sqlSet("stats", { nick => $term, type => "karma" }, # WHERE # { counter => $karma } # WHAT { -counter => "counter+1" } diff --git a/src/UserExtra.pl b/src/UserExtra.pl index e38fa95..63092d3 100644 --- a/src/UserExtra.pl +++ b/src/UserExtra.pl @@ -221,8 +221,8 @@ sub factstats { sub karma { my $target = lc( shift || $who ); - my $karma = &dbGet("stats", "counter", "nick=". - &dbQuote($target)." AND type='karma'") || 0; + my $karma = &sqlSelect("stats", "counter", + { nick => $target, type => "karma" }) || 0; if ($karma != 0) { &pSReply("$target has karma of $karma");