missed sqlite2 bits

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@1234 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index aa0a450ad59a6233eb51709f14a4061422e47d65..d18a35dfdc1eebe1b3a736e60b63b236e2de09a3 100644 (file)
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -262,10 +262,10 @@ sub seenFlushOld {
     my $max_time = &getChanConfDefault("seenMaxDays", 30, $chan) *60*60*24;
     my $delete   = 0;
 
-    if ($param{'DBType'} =~ /^(pgsql|mysql|sqlite)/i) {
+    if ($param{'DBType'} =~ /^(pgsql|mysql|sqlite(2)?)$/i) {
        my $query;
 
-       if ($param{'DBType'} =~ /^mysql|sqlite$/i) {
+       if ($param{'DBType'} =~ /^(mysql|sqlite(2)?)$/i) {
            $query = "SELECT nick,time FROM seen GROUP BY nick HAVING ".
                        "UNIX_TIMESTAMP() - time > $max_time";
        } else {        # pgsql.
@@ -550,12 +550,12 @@ sub seenFlush {
 
     my %stats;
     my $nick;
-    my $flushed        = 0;
+    my $flushed = 0;
     $stats{'count_old'} = &countKeys("seen") || 0;
     $stats{'new'}      = 0;
     $stats{'old'}      = 0;
 
-    if ($param{'DBType'} =~ /^(mysql|pgsql|sqlite)$/i) {
+    if ($param{'DBType'} =~ /^(mysql|pgsql|sqlite(2)?)$/i) {
        foreach $nick (keys %seencache) {
            my $retval = &sqlReplace("seen", {
                        nick    => lc $seencache{$nick}{'nick'},

diff --git a/src/Modules/countdown.pl b/src/Modules/countdown.pl
index 04230c3ff5aa3abeb7a94126276ac1c7b1caeb49..912a463d9109703fd1801aed54b7a993417880c6 100644 (file)
--- a/src/Modules/countdown.pl
+++ b/src/Modules/countdown.pl
@@ -44,7 +44,7 @@ sub countdown {
        ### SQL SPECIFIC.
        my ($to_days,$dayname,$monname);
 
-       if ($param{'DBType'} =~ /^mysql|sqlite$/i) {
+       if ($param{'DBType'} =~ /^(mysql|sqlite(2)?)$/i) {
            $to_days = (&sqlRawReturn("SELECT TO_DAYS(NOW()) - TO_DAYS('$sqldate')"))[0];
            $dayname = (&sqlRawReturn("SELECT DAYNAME('$sqldate')"))[0];
            $monname = (&sqlRawReturn("SELECT MONTHNAME('$sqldate')"))[0];

diff --git a/src/Process.pl b/src/Process.pl
index 914f4812a3ed068167c03eb76aaed3f7981571c9..36cffd423054a12cfaebfdb9fb5a5c2d1da70a76 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -349,7 +349,7 @@ sub process {
        }
     }
 
-    if (&IsParam("factoids") and $param{'DBType'} =~ /^(mysql|sqlite|pgsql)/i) {
+    if (&IsParam("factoids") and $param{'DBType'} =~ /^(mysql|sqlite(2)?|pgsql)$/i) {
        &FactoidStuff();
     } elsif ($param{'DBType'} =~ /^none$/i) {
        return "NO FACTOIDS.";