Changeset 148

Timestamp:

02/05/09 19:27:46 (10 months ago)

Author:

swistow

Message:

Try something out

Files:

• branches/use-existing-dbh/lib/TheSchwartz.pm (modified) (2 diffs)

branches/use-existing-dbh/lib/TheSchwartz.pm

@@ -61 +61 @@
     my($list) = @_;
     for my $ref (@$list) {
-        my $full = join '|', map { $ref->{$_} || '' } qw( dsn user pass );
+        my $full = ($ref->{dbh}) ? rand().time().{}.$$ : join '|', map { $ref->{$_} || '' } qw( dsn user pass );
         $client->{databases}{ md5_hex($full) } = $ref;
     }
@@ -77 +77 @@
         my $db = $client->{databases}{$hashdsn}
             or croak "Ouch, I don't know about a database whose hash is $hashdsn";
+        my %p   = ($db->{dbh}) ?
+                  ( dbd => $db->{dbh} ) :
+                  (
+                    dsn      => $db->{dsn},
+                    username => $db->{user},
+                    password => $db->{pass},
+                  );
         $driver = Data::ObjectDriver::Driver::DBI->new(
-                dsn      => $db->{dsn},
-                username => $db->{user},
-                password => $db->{pass},
+                %p,
                 ($db->{prefix} ? (prefix   => $db->{prefix}) : ()),
         );