Changeset 149

Timestamp:

02/05/09 22:17:07 (10 months ago)

Author:

swistow

Message:

Allow existing driver

Location:

branches/use-existing-dbh

Files:

• lib/TheSchwartz.pm (modified) (2 diffs)
• t/lib/db-common.pl (modified) (2 diffs)

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

@@ -61 +61 @@
     my($list) = @_;
     for my $ref (@$list) {
-        my $full = ($ref->{dbh}) ? rand().time().{}.$$ : join '|', map { $ref->{$_} || '' } qw( dsn user pass );
+        my $full = ($ref->{driver}) ? 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(
-                %p,
-                ($db->{prefix} ? (prefix   => $db->{prefix}) : ()),
-        );
+        if ($db->{driver}) {
+            $driver = $db->{driver};
+        } else {
+            $driver = Data::ObjectDriver::Driver::DBI->new(
+                        dsn      => $db->{dsn},
+                        username => $db->{user},
+                        password => $db->{pass},
+                      );
+        }
+        $driver->prefix(($db->{prefix} ? (prefix   => $db->{prefix}) : ()));
+
         if ($cache_duration) {
             $client->{cached_drivers}{$hashdsn}{driver} = $driver;

branches/use-existing-dbh/t/lib/db-common.pl

@@ -53 +53 @@
     }
 
-    return TheSchwartz->new(databases => [
+    if ($ENV{USE_DBH_FOR_TEST}) {
+        my @tmp;
+        for (@$dbs) {
+            my $dsn    = dsn_for($_);  
+            my $dbh    = DBI->connect( $dsn, "root", "" ) or die $DBI::errstr;
+            my $driver =  Data::ObjectDriver::Driver::DBI->new( dbh => $dbh); 
+            push @tmp, { driver => $driver, prefix => $pfx };
+        }
+        return TheSchwartz->new(databases => [@tmp]); 
+    } else {
+        return TheSchwartz->new(databases => [
                                           map { {
                                               dsn  => dsn_for($_),
@@ -61 +71 @@
                                           } } @$dbs
                                           ]);
+    }
 }