Changeset 240:d7613fb27e8f

Timestamp:

07/27/08 23:28:53 (4 years ago)

Author:

Anselm Lingnau <anselm@…>

Branch:

default

Message:

Treat addresses "modulo capitalisation" when retrieving from the database.

Files:

• lib/Lancelot/DB.pm (modified) (3 diffs)
• t/00db.t (modified) (2 diffs)

lib/Lancelot/DB.pm

@@ -1126 +1126 @@
         unless UNIVERSAL::isa($address, "Email::Address");
 
-    my($cmd) = q{SELECT id FROM subscribers WHERE local || '@' || domain = ?};
+    my($cmd) = q{SELECT id FROM subscribers WHERE LOWER(local || '@' || domain) = LOWER(?)};
     $ref = $self->{dbh}->selectrow_arrayref($cmd, {}, $address->address);
     unless ($ref) {
@@ -1140 +1140 @@
             # Delete the address
             $self->{dbh}->begin_work;
-            $self->{dbh}->do("DELETE FROM confirmations WHERE address = ?",
+            $self->{dbh}->do("DELETE FROM confirmations WHERE LOWER(address) = LOWER(?)",
                              {}, $address->address) or $result = 0;
             if ($result) {
@@ -1233 +1233 @@
     my ($hash) = $self->{dbh}->selectrow_hashref(<<"", {}, $address->address);
       SELECT * FROM subscribers
-          WHERE local || '\@' || domain = ?
+          WHERE LOWER(local || '\@' || domain) = LOWER(?)
+
+    return {} unless defined $hash;
 
     my (%result);

t/00db.t

@@ -1 +1 @@
 #!/usr/bin/perl -w
 
-use Test::More tests => 186;
+use Test::More tests => 196;
 use Test::DatabaseRow;
 use Test::Exception;
@@ -317 +317 @@
 
 can_ok($db, 'get_address_options');
-foreach my $i (0 .. $#options) {
-    $db->set_address_options($address, { $options[$i] => 1 });
-    my $opts;
-    $ref->{$options[$i]} = 1;
-    ok( $opts = $db->get_address_options($address), "getting address options" );
-    is_deeply($opts, $ref, "option $options[$i] set");
-    $db->set_address_options($address, { $options[$i] => 0 });
-    $ref->{$options[$i]} = 0;
+foreach my $a ($address, ucfirst($address)) {
+    foreach my $i (0 .. $#options) {
+        $db->set_address_options($a, { $options[$i] => 1 });
+        my $opts;
+        $ref->{$options[$i]} = 1;
+        ok( $opts = $db->get_address_options($a), "getting address options" );
+        is_deeply($opts, $ref, "option $options[$i] set");
+        $db->set_address_options($a, { $options[$i] => 0 });
+        $ref->{$options[$i]} = 0;
+    }
 }