Changeset 160

Timestamp:

02/10/09 00:06:49 (10 months ago)

Author:

swistow

Message:

Merge in branch which allows passing in of existing driver.

Location:

trunk

Files:

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

trunk/lib/TheSchwartz.pm

@@ -61 +61 @@
     my($list) = @_;
     for my $ref (@$list) {
-        my $full = join '|', map { $ref->{$_} || '' } qw( dsn user pass );
+        my $var;
+        my @parts;
+        if ($ref->{driver}) {
+            my $dbh  = tied(%{$ref->{driver}->dbh});
+            my $dsn  = "dbd:".$dbh->{Driver}->{Name}.":".$dbh->{Name};
+            my $user = $dbh->{Username} || ''; 
+            @parts   = ($dsn, $user);   
+        } else {
+            @parts   = map { $ref->{$_} || '' } qw(dsn user);
+        }
+        my $full = join '|', @parts;
         $client->{databases}{ md5_hex($full) } = $ref;
     }
@@ -77 +87 @@
         my $db = $client->{databases}{$hashdsn}
             or croak "Ouch, I don't know about a database whose hash is $hashdsn";
-        $driver = Data::ObjectDriver::Driver::DBI->new(
-                dsn      => $db->{dsn},
-                username => $db->{user},
-                password => $db->{pass},
-                ($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}) if exists $db->{prefix};
+
         if ($cache_duration) {
             $client->{cached_drivers}{$hashdsn}{driver} = $driver;
@@ -828 +843 @@
 appropriate jobs in the other databases automatically.
 
-Each member of the C<databases> value should be a hashref containing:
+Each member of the C<databases> value should be a hashref containing either:
 
 =over 4
@@ -843 +858 @@
 
 The password to use when connecting to this database.
+
+=back
+
+or
+
+=over 4
+
+=item * C<driver>
+
+A C<Data::ObjectDriver::Driver::DBI> object.
+
+See note below.
 
 =back
@@ -1046 +1073 @@
 out of scope)
 
+=head1 PASSING IN AN EXISTING DRIVER
+
+You can pass in a existing C<Data::Object::Driver::DBI> object which also allows you
+to reuse exist Database handles like so:
+
+        my $dbh = DBI->connect( $dsn, "root", "", {
+                RaiseError => 1,
+                PrintError => 0,
+                AutoCommit => 1,
+            } ) or die $DBI::errstr;
+        my $driver = Data::ObjectDriver::Driver::DBI->new( dbh => $dbh);
+        return TheSchwartz->new(databases => [{ driver => $driver }]);
+
+B<Note>: it's important that the C<RaiseError> and C<AutoCommit> flags are 
+set on the handle for various bits of functionality to work.
+
 =head1 COPYRIGHT, LICENSE & WARRANTY
 

trunk/t/lib/db-common.pl

@@ -53 +53 @@
     }
 
-    return TheSchwartz->new(databases => [
+    if ($ENV{USE_DBH_FOR_TEST}) {
+        my @tmp;
+        for (@$dbs) { eval {
+            my $dsn    = dsn_for($_);  
+            my $dbh    = DBI->connect( $dsn, "root", "", {
+                RaiseError => 1,
+                PrintError => 0,
+                AutoCommit => 1,
+            } ) 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 +75 @@
                                           } } @$dbs
                                           ]);
+    }
 }
 

trunk/t/scoreboard.t

@@ -10 +10 @@
 use TheSchwartz;
 use File::Spec qw();
+use File::Temp qw(tempdir);
 # create a tmp directory with a unique name.  This stops
 # us conflicting with any other runs of this process and means
@@ -21 +22 @@
     setup_dbs({prefix => $pfx}, $dbs);
 
-    my $client = TheSchwartz->new(scoreboard => $tmpdir,
+    my $client = TheSchwartz->new(scoreboard => $tempdir,
                                   databases => [
                                           map { {