::DBI:Replicated - merge connect_info from master to replicants
[dbsrgits/DBIx-Class.git] / t / 93storage_replication.t
index 146a549..0f4b352 100644 (file)
@@ -2,13 +2,16 @@ use strict;
 use warnings;
 use lib qw(t/lib);
 use Test::More;
-use Data::Dump qw/dump/;
+use Test::Exception;
+use DBICTest;
+use List::Util 'first';
+use Scalar::Util 'reftype';
 
 BEGIN {
-    eval "use Moose";
+    eval "use DBIx::Class::Storage::DBI::Replicated; use Test::Moose";
     plan $@
-        ? ( skip_all => 'needs Moose for testing' )
-        : ( tests => 30 );
+        ? ( skip_all => "Deps not installed: $@" )
+        : ( tests => 83 );
 }
 
 use_ok 'DBIx::Class::Storage::DBI::Replicated::Pool';
@@ -16,20 +19,34 @@ use_ok 'DBIx::Class::Storage::DBI::Replicated::Balancer';
 use_ok 'DBIx::Class::Storage::DBI::Replicated::Replicant';
 use_ok 'DBIx::Class::Storage::DBI::Replicated';
 
+=head1 HOW TO USE
+
+    This is a test of the replicated storage system.  This will work in one of
+    two ways, either it was try to fake replication with a couple of SQLite DBs
+    and creative use of copy, or if you define a couple of %ENV vars correctly
+    will try to test those.  If you do that, it will assume the setup is properly
+    replicating.  Your results may vary, but I have demonstrated this to work with
+    mysql native replication.
+    
+=cut
+
+
 ## ----------------------------------------------------------------------------
 ## Build a class to hold all our required testing data and methods.
 ## ----------------------------------------------------------------------------
 
-TESTSCHEMACLASS: {
+TESTSCHEMACLASSES: {
 
+    ## --------------------------------------------------------------------- ##
+    ## Create an object to contain your replicated stuff.
+    ## --------------------------------------------------------------------- ##
+    
     package DBIx::Class::DBI::Replicated::TestReplication;
    
     use DBICTest;
-    use File::Copy;
-    
     use base qw/Class::Accessor::Fast/;
     
-    __PACKAGE__->mk_accessors( qw/schema master_path slave_paths/ );
+    __PACKAGE__->mk_accessors( qw/schema/ );
 
     ## Initialize the object
     
@@ -38,33 +55,114 @@ TESTSCHEMACLASS: {
            my $self = $class->SUPER::new(@_);
        
            $self->schema( $self->init_schema );
-           $self->master_path("t/var/DBIxClass.db");
-       
            return $self;
        }
     
     ## Get the Schema and set the replication storage type
     
     sub init_schema {
+        # current SQLT SQLite producer does not handle DROP TABLE IF EXISTS, trap warnings here
+        local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /no such table.+DROP TABLE/ };
+
         my $class = shift @_;
-        my $schema = DBICTest->init_schema(storage_type=>'::DBI::Replicated');
+
+        my $schema = DBICTest->init_schema(
+            sqlite_use_file => 1,
+            storage_type=>{
+               '::DBI::Replicated' => {
+                       balancer_type=>'::Random',
+                    balancer_args=>{
+                       auto_validate_every=>100,
+                    },
+               }
+            },
+            deploy_args=>{
+                   add_drop_table => 1,
+            },
+        );
+
         return $schema;
     }
     
+    sub generate_replicant_connect_info {}
+    sub replicate {}
+    sub cleanup {}
+
+    ## --------------------------------------------------------------------- ##
+    ## Add a connect_info option to test option merging.
+    ## --------------------------------------------------------------------- ##
+    {
+    package DBIx::Class::Storage::DBI::Replicated;
+
+    use Moose;
+
+    __PACKAGE__->meta->make_mutable;
+
+    around connect_info => sub {
+      my ($next, $self, $info) = @_;
+      $info->[3]{master_option} = 1;
+      $self->$next($info);
+    };
+
+    __PACKAGE__->meta->make_immutable;
+
+    no Moose;
+    }
+  
+    ## --------------------------------------------------------------------- ##
+    ## Subclass for when you are using SQLite for testing, this provides a fake
+    ## replication support.
+    ## --------------------------------------------------------------------- ##
+        
+    package DBIx::Class::DBI::Replicated::TestReplication::SQLite;
+
+    use DBICTest;
+    use File::Copy;    
+    use base 'DBIx::Class::DBI::Replicated::TestReplication';
+    
+    __PACKAGE__->mk_accessors( qw/master_path slave_paths/ );
+    
+    ## Set the mastep path from DBICTest
+    
+       sub new {
+           my $class = shift @_;
+           my $self = $class->SUPER::new(@_);
+       
+           $self->master_path( DBICTest->_sqlite_dbfilename );
+           $self->slave_paths([
+            "t/var/DBIxClass_slave1.db",
+            "t/var/DBIxClass_slave2.db",    
+        ]);
+        
+           return $self;
+       }    
+       
     ## Return an Array of ArrayRefs where each ArrayRef is suitable to use for
     ## $storage->connect_info to be used for connecting replicants.
     
     sub generate_replicant_connect_info {
-       my $self = shift @_;
+        my $self = shift @_;
         my @dsn = map {
             "dbi:SQLite:${_}";
         } @{$self->slave_paths};
         
-        return map { [$_,'','',{}] } @dsn;
+        my @connect_infos = map { [$_,'','',{AutoCommit=>1}] } @dsn;
+
+    # try a hashref too
+        my $c = $connect_infos[0];
+        $connect_infos[0] = {
+          dsn => $c->[0],
+          user => $c->[1],
+          password => $c->[2],
+          %{ $c->[3] }
+        };
+
+        @connect_infos
     }
-    
+
     ## Do a 'good enough' replication by copying the master dbfile over each of
-    ## the slave dbfiles.
+    ## the slave dbfiles.  If the master is SQLite we do this, otherwise we
+    ## just do a one second pause to let the slaves catch up.
     
     sub replicate {
         my $self = shift @_;
@@ -81,6 +179,33 @@ TESTSCHEMACLASS: {
             unlink $slave;
         }     
     }
+    
+    ## --------------------------------------------------------------------- ##
+    ## Subclass for when you are setting the databases via custom export vars
+    ## This is for when you have a replicating database setup that you are
+    ## going to test against.  You'll need to define the correct $ENV and have
+    ## two slave databases to test against, as well as a replication system
+    ## that will replicate in less than 1 second.
+    ## --------------------------------------------------------------------- ##
+        
+    package DBIx::Class::DBI::Replicated::TestReplication::Custom; 
+    use base 'DBIx::Class::DBI::Replicated::TestReplication';
+    
+    ## Return an Array of ArrayRefs where each ArrayRef is suitable to use for
+    ## $storage->connect_info to be used for connecting replicants.
+    
+    sub generate_replicant_connect_info { 
+        return (
+            [$ENV{"DBICTEST_SLAVE0_DSN"}, $ENV{"DBICTEST_SLAVE0_DBUSER"}, $ENV{"DBICTEST_SLAVE0_DBPASS"}, {AutoCommit => 1}],
+            [$ENV{"DBICTEST_SLAVE1_DSN"}, $ENV{"DBICTEST_SLAVE1_DBUSER"}, $ENV{"DBICTEST_SLAVE1_DBPASS"}, {AutoCommit => 1}],           
+        );
+    }
+    
+    ## pause a bit to let the replication catch up 
+    
+    sub replicate {
+       sleep 1;
+    } 
 }
 
 ## ----------------------------------------------------------------------------
@@ -89,13 +214,12 @@ TESTSCHEMACLASS: {
 
 ## Thi first bunch of tests are basic, just make sure all the bits are behaving
 
-ok my $replicated = DBIx::Class::DBI::Replicated::TestReplication
-    ->new({
-        slave_paths=>[
-               "t/var/DBIxClass_slave1.db",
-               "t/var/DBIxClass_slave2.db",    
-        ],
-    }) => 'Created a replication object';
+my $replicated_class = DBICTest->has_custom_dsn ?
+    'DBIx::Class::DBI::Replicated::TestReplication::Custom' :
+    'DBIx::Class::DBI::Replicated::TestReplication::SQLite';
+
+ok my $replicated = $replicated_class->new
+    => 'Created a replication object';
     
 isa_ok $replicated->schema
     => 'DBIx::Class::Schema';
@@ -112,34 +236,60 @@ isa_ok $replicated->schema->storage->master
 isa_ok $replicated->schema->storage->pool
     => 'DBIx::Class::Storage::DBI::Replicated::Pool';
     
-isa_ok $replicated->schema->storage->balancer
+does_ok $replicated->schema->storage->balancer
     => 'DBIx::Class::Storage::DBI::Replicated::Balancer'; 
 
 ok my @replicant_connects = $replicated->generate_replicant_connect_info
     => 'got replication connect information';
 
-ok my @replicated_storages = $replicated->schema->storage->create_replicants(@replicant_connects)
+ok my @replicated_storages = $replicated->schema->storage->connect_replicants(@replicant_connects)
     => 'Created some storages suitable for replicants';
-    
-isa_ok $replicated->schema->storage->current_replicant
-    => 'DBIx::Class::Storage::DBI';
-    
+
+ok my @all_storages = $replicated->schema->storage->all_storages
+    => '->all_storages';
+
+is scalar @all_storages
+    ,3
+    => 'correct number of ->all_storages';
+
+is ((grep $_->isa('DBIx::Class::Storage::DBI'), @all_storages)
+    ,3
+    => '->all_storages are correct type');
+
+is ((grep $_->{master_option},
+      grep { (reftype($_)||'') eq 'HASH' }
+        map @{ $_->_connect_info }, @all_storages)
+    ,3
+    => 'connect_info was merged from master to replicants');
+my @replicant_names = keys %{ $replicated->schema->storage->replicants };
+
+## Silence warning about not supporting the is_replicating method if using the
+## sqlite dbs.
+$replicated->schema->storage->debugobj->silence(1)
+  if first { m{^t/} } @replicant_names;
+   
+isa_ok $replicated->schema->storage->balancer->current_replicant
+    => 'DBIx::Class::Storage::DBI'; 
+
+$replicated->schema->storage->debugobj->silence(0);
+
 ok $replicated->schema->storage->pool->has_replicants
     => 'does have replicants';     
 
-is $replicated->schema->storage->num_replicants => 2
+is $replicated->schema->storage->pool->num_replicants => 2
     => 'has two replicants';
        
-isa_ok $replicated_storages[0]
+does_ok $replicated_storages[0]
     => 'DBIx::Class::Storage::DBI::Replicated::Replicant';
 
-isa_ok $replicated_storages[1]
+does_ok $replicated_storages[1]
     => 'DBIx::Class::Storage::DBI::Replicated::Replicant';
     
-isa_ok $replicated->schema->storage->replicants->{"t/var/DBIxClass_slave1.db"}
+does_ok $replicated->schema->storage->replicants->{$replicant_names[0]}
     => 'DBIx::Class::Storage::DBI::Replicated::Replicant';
 
-isa_ok $replicated->schema->storage->replicants->{"t/var/DBIxClass_slave2.db"}
+does_ok $replicated->schema->storage->replicants->{$replicant_names[1]}
     => 'DBIx::Class::Storage::DBI::Replicated::Replicant';  
 
 ## Add some info to the database
@@ -154,6 +304,17 @@ $replicated
 ## Make sure all the slaves have the table definitions
 
 $replicated->replicate;
+$replicated->schema->storage->replicants->{$replicant_names[0]}->active(1);
+$replicated->schema->storage->replicants->{$replicant_names[1]}->active(1);
+
+## Silence warning about not supporting the is_replicating method if using the
+## sqlite dbs.
+$replicated->schema->storage->debugobj->silence(1)
+  if first { m{^t/} } @replicant_names;
+$replicated->schema->storage->pool->validate_replicants;
+
+$replicated->schema->storage->debugobj->silence(0);
 
 ## Make sure we can read the data.
 
@@ -179,12 +340,6 @@ $replicated
         [ 7, "Watergate"],
     ]);
 
-## Alright, the database 'cluster' is not in a consistent state.  When we do
-## a read now we expect bad news
-
-is $replicated->schema->resultset('Artist')->find(5), undef
-    => 'read after disconnect fails because it uses a replicant which we have neglected to "replicate" yet';
-
 ## Make sure all the slaves have the table definitions
 $replicated->replicate;
 
@@ -201,8 +356,16 @@ is $artist2->name, "Doom's Children"
 
 ## What happens when we disconnect all the replicants?
 
-$replicated->schema->storage->replicants->{"t/var/DBIxClass_slave1.db"}->disconnect;
-$replicated->schema->storage->replicants->{"t/var/DBIxClass_slave2.db"}->disconnect;
+is $replicated->schema->storage->pool->connected_replicants => 2
+    => "both replicants are connected";
+    
+$replicated->schema->storage->replicants->{$replicant_names[0]}->disconnect;
+$replicated->schema->storage->replicants->{$replicant_names[1]}->disconnect;
+
+is $replicated->schema->storage->pool->connected_replicants => 0
+    => "both replicants are now disconnected";
+
+## All these should pass, since the database should automatically reconnect
 
 ok my $artist3 = $replicated->schema->resultset('Artist')->find(6)
     => 'Still finding stuff.';
@@ -213,263 +376,282 @@ isa_ok $artist3
 is $artist3->name, "Dead On Arrival"
     => 'Found expected name for first result';
 
+is $replicated->schema->storage->pool->connected_replicants => 1
+    => "At Least One replicant reconnected to handle the job";
+    
+## What happens when we try to select something that doesn't exist?
 
-__END__
-
-## ----------------------------------------------------------------------------
-## Build a class to hold all our required testing data and methods.
-## ----------------------------------------------------------------------------
-
-TESTSCHEMACLASS: {
-       
-       package DBIx::Class::DBI::Replicated::TestReplication;
-
-       use DBI;        
-       use DBICTest;
-       use File::Copy;
-       
-       ## Create a constructor
-       
-       sub new {
-               my $class = shift @_;
-               my %params = @_;
-               
-               my $self = bless {
-                       db_paths => $params{db_paths},
-                       dsns => $class->init_dsns(%params),
-                       schema=>$class->init_schema,
-               }, $class;
-               
-               $self->connect;
-               return $self;
-       }
-       
-       ## get the DSNs.  We build this up from the list of file paths
-       
-       sub init_dsns {
-               my $class = shift @_;
-               my %params = @_;
-               my $db_paths = $params{db_paths};
-
-               my @dsn = map {
-                       "dbi:SQLite:${_}";
-               } @$db_paths;
-               
-               return \@dsn;
-       }
+ok ! $replicated->schema->resultset('Artist')->find(666)
+    => 'Correctly failed to find something.';
+    
+## test the reliable option
 
-       ## get the Schema and set the replication storage type
-       
-       sub init_schema {
-               my $class = shift @_;
-               my $schema = DBICTest->init_schema();
-               $schema->storage_type( '::DBI::Replicated' );
-               
-               return $schema;
-       }
+TESTRELIABLE: {
        
-       ## connect the Schema
+       $replicated->schema->storage->set_reliable_storage;
        
-       sub connect {
-               my $self = shift @_;
-               my ($master, @slaves) = @{$self->{dsns}};
-               my $master_connect_info = [$master, '','', {AutoCommit=>1, PrintError=>0}];
-               
-               my @slavesob;
-               foreach my $slave (@slaves)
-               {
-                       my $dbh = shift @{$self->{slaves}}
-                        || DBI->connect($slave,"","",{PrintError=>0, PrintWarn=>0});
-                       
-                       push @{$master_connect_info->[-1]->{slaves_connect_info}},
-                        [$dbh, '','',{priority=>10}];
-                        
-                       push @slavesob,
-                        $dbh;
-               }
-               
-               ## Keep track of the created slave databases
-               $self->{slaves} = \@slavesob;
-               
-               $self
-                       ->{schema}
-                       ->connect(@$master_connect_info);
-       }
-       
-       ## replication
-       
-       sub replicate {
-               my $self = shift @_;
-               my ($master, @slaves) = @{$self->{db_paths}};
-               
-               foreach my $slave (@slaves) {
-                       copy($master, $slave);
-               }
-       }
-       
-       ## Cleanup afer ourselves.
-       
-       sub cleanup {
-               my $self = shift @_;
-               my ($master, @slaves) = @{$self->{db_paths}};
-               
-               foreach my $slave (@slaves) {
-                       unlink $slave;
-               }               
-       }
-       
-       ## Force a reconnection
+       ok $replicated->schema->resultset('Artist')->find(2)
+           => 'Read from master 1';
        
-       sub reconnect {
-               my $self = shift @_;
-               my $schema = $self->connect;
-               $self->{schema} = $schema;
-               return $schema;
-       }
+       ok $replicated->schema->resultset('Artist')->find(5)
+           => 'Read from master 2';
+           
+    $replicated->schema->storage->set_balanced_storage;            
+           
+       ok $replicated->schema->resultset('Artist')->find(3)
+        => 'Read from replicant';
 }
 
-## ----------------------------------------------------------------------------
-## Create an object and run some tests
-## ----------------------------------------------------------------------------
+## Make sure when reliable goes out of scope, we are using replicants again
 
-my %params = (
-       db_paths => [
-               "t/var/DBIxClass.db",
-               "t/var/DBIxClass_slave1.db",
-               "t/var/DBIxClass_slave2.db",
-       ],
-);
+ok $replicated->schema->resultset('Artist')->find(1)
+    => 'back to replicant 1.';
+    
+ok $replicated->schema->resultset('Artist')->find(2)
+    => 'back to replicant 2.';
 
-ok my $replicate = DBIx::Class::DBI::Replicated::TestReplication->new(%params)
-       => 'Created a replication object';
-       
-isa_ok $replicate->{schema}
-       => 'DBIx::Class::Schema';
+## set all the replicants to inactive, and make sure the balancer falls back to
+## the master.
 
-## Add some info to the database
+$replicated->schema->storage->replicants->{$replicant_names[0]}->active(0);
+$replicated->schema->storage->replicants->{$replicant_names[1]}->active(0);
 
-$replicate
-       ->{schema}
-       ->populate('Artist', [
-               [ qw/artistid name/ ],
-               [ 4, "Ozric Tentacles"],
-       ]);
-                           
-## Make sure all the slaves have the table definitions
+## Silence warning about falling back to master.
+$replicated->schema->storage->debugobj->silence(1);
+ok $replicated->schema->resultset('Artist')->find(2)
+    => 'Fallback to master';
 
-$replicate->replicate;
+$replicated->schema->storage->debugobj->silence(0);
 
-## Make sure we can read the data.
+$replicated->schema->storage->replicants->{$replicant_names[0]}->active(1);
+$replicated->schema->storage->replicants->{$replicant_names[1]}->active(1);
 
-ok my $artist1 = $replicate->{schema}->resultset('Artist')->find(4)
-       => 'Created Result';
+## Silence warning about not supporting the is_replicating method if using the
+## sqlite dbs.
+$replicated->schema->storage->debugobj->silence(1)
+  if first { m{^t/} } @replicant_names;
+$replicated->schema->storage->pool->validate_replicants;
 
-isa_ok $artist1
-       => 'DBICTest::Artist';
-       
-is $artist1->name, 'Ozric Tentacles'
-       => 'Found expected name for first result';
+$replicated->schema->storage->debugobj->silence(0);
 
-## Add some new rows that only the master will have  This is because
-## we overload any type of write operation so that is must hit the master
-## database.
+ok $replicated->schema->resultset('Artist')->find(2)
+    => 'Returned to replicates';
+    
+## Getting slave status tests
 
-$replicate
-       ->{schema}
-       ->populate('Artist', [
-               [ qw/artistid name/ ],
-               [ 5, "Doom's Children"],
-               [ 6, "Dead On Arrival"],
-               [ 7, "Watergate"],
-       ]);
+SKIP: {
+    ## We skip this tests unless you have a custom replicants, since the default
+    ## sqlite based replication tests don't support these functions.
+    
+    skip 'Cannot Test Replicant Status on Non Replicating Database', 9
+     unless DBICTest->has_custom_dsn && $ENV{"DBICTEST_SLAVE0_DSN"};
+
+    $replicated->replicate; ## Give the slaves a chance to catchup.
+
+       ok $replicated->schema->storage->replicants->{$replicant_names[0]}->is_replicating
+           => 'Replicants are replicating';
+           
+       is $replicated->schema->storage->replicants->{$replicant_names[0]}->lag_behind_master, 0
+           => 'Replicant is zero seconds behind master';
+           
+       ## Test the validate replicants
        
-## Reconnect the database
-$replicate->reconnect;
-
-## Alright, the database 'cluster' is not in a consistent state.  When we do
-## a read now we expect bad news
-
-is $replicate->{schema}->resultset('Artist')->find(5), undef
-       => 'read after disconnect fails because it uses slave 1 which we have neglected to "replicate" yet';
-
-## Make sure all the slaves have the table definitions
-$replicate->replicate;
-
-## Should find some data now
-
-ok my $artist2 = $replicate->{schema}->resultset('Artist')->find(5)
-       => 'Sync succeed';
+       $replicated->schema->storage->pool->validate_replicants;
        
-isa_ok $artist2
-       => 'DBICTest::Artist';
+       is $replicated->schema->storage->pool->active_replicants, 2
+           => 'Still have 2 replicants after validation';
+           
+       ## Force the replicants to fail the validate test by required their lag to
+       ## be negative (ie ahead of the master!)
        
-is $artist2->name, "Doom's Children"
-       => 'Found expected name for first result';
+    $replicated->schema->storage->pool->maximum_lag(-10);
+    $replicated->schema->storage->pool->validate_replicants;
+    
+    is $replicated->schema->storage->pool->active_replicants, 0
+        => 'No way a replicant be be ahead of the master';
+        
+    ## Let's be fair to the replicants again.  Let them lag up to 5
        
-## What happens when we delete one of the slaves?
-
-ok my $slave1 = @{$replicate->{slaves}}[0]
-       => 'Got Slave1';
-
-ok $slave1->disconnect
-       => 'disconnected slave1';
+    $replicated->schema->storage->pool->maximum_lag(5);
+    $replicated->schema->storage->pool->validate_replicants;
+    
+    is $replicated->schema->storage->pool->active_replicants, 2
+        => 'Both replicants in good standing again';   
+        
+       ## Check auto validate
+       
+       is $replicated->schema->storage->balancer->auto_validate_every, 100
+           => "Got the expected value for auto validate";
+           
+               ## This will make sure we auto validatge everytime
+               $replicated->schema->storage->balancer->auto_validate_every(0);
+               
+               ## set all the replicants to inactive, and make sure the balancer falls back to
+               ## the master.
+               
+               $replicated->schema->storage->replicants->{$replicant_names[0]}->active(0);
+               $replicated->schema->storage->replicants->{$replicant_names[1]}->active(0);
+               
+               ## Ok, now when we go to run a query, autovalidate SHOULD reconnect
+       
+       is $replicated->schema->storage->pool->active_replicants => 0
+           => "both replicants turned off";
+               
+       ok $replicated->schema->resultset('Artist')->find(5)
+           => 'replicant reactivated';
+           
+       is $replicated->schema->storage->pool->active_replicants => 2
+           => "both replicants reactivated";        
+}
 
-$replicate->reconnect;
+## Test the reliably callback
 
-ok my $artist3 = $replicate->{schema}->resultset('Artist')->find(6)
-       => 'Still finding stuff.';
+ok my $reliably = sub {
        
-isa_ok $artist3
-       => 'DBICTest::Artist';
+    ok $replicated->schema->resultset('Artist')->find(5)
+        => 'replicant reactivated';    
        
-is $artist3->name, "Dead On Arrival"
-       => 'Found expected name for first result';
-       
-## Let's delete all the slaves
-
-ok my $slave2 = @{$replicate->{slaves}}[1]
-       => 'Got Slave2';
+} => 'created coderef properly';
 
-ok $slave2->disconnect
-       => 'Disconnected slave2';
+$replicated->schema->storage->execute_reliably($reliably);
 
-$replicate->reconnect;
+## Try something with an error
 
-## We expect an error now, since all the slaves are dead
+ok my $unreliably = sub {
+    
+    ok $replicated->schema->resultset('ArtistXX')->find(5)
+        => 'replicant reactivated'; 
+    
+} => 'created coderef properly';
 
-eval {
-       $replicate->{schema}->resultset('Artist')->find(4)->name;
-};
+throws_ok {$replicated->schema->storage->execute_reliably($unreliably)} 
+    qr/Can't find source for ArtistXX/
+    => 'Bad coderef throws proper error';
+    
+## Make sure replication came back
 
-ok $@ => 'Got error when trying to find artistid 4';
+ok $replicated->schema->resultset('Artist')->find(3)
+    => 'replicant reactivated';
+    
+## make sure transactions are set to execute_reliably
 
-## This should also be an error
+ok my $transaction = sub {
+       
+       my $id = shift @_;
+       
+       $replicated
+           ->schema
+           ->populate('Artist', [
+               [ qw/artistid name/ ],
+               [ $id, "Children of the Grave"],
+           ]);
+           
+    ok my $result = $replicated->schema->resultset('Artist')->find($id)
+        => 'Found expected artist';
+        
+    ok my $more = $replicated->schema->resultset('Artist')->find(1)
+        => 'Found expected artist again';
+        
+   return ($result, $more);
+   
+} => 'Created a coderef properly';
+
+## Test the transaction with multi return
+{
+       ok my @return = $replicated->schema->txn_do($transaction, 666)
+           => 'did transaction';
+           
+           is $return[0]->id, 666
+               => 'first returned value is correct';
+               
+           is $return[1]->id, 1
+               => 'second returned value is correct';
+}
 
-eval {
-       my $artist4 = $replicate->{schema}->resultset('Artist')->find(7);       
-};
+## Test that asking for single return works
+{
+       ok my $return = $replicated->schema->txn_do($transaction, 777)
+           => 'did transaction';
+           
+           is $return->id, 777
+               => 'first returned value is correct';
+}
 
-ok $@ => 'Got read errors after everything failed';
+## Test transaction returning a single value
 
-## make sure ->connect_info returns something sane
+{
+       ok my $result = $replicated->schema->txn_do(sub {
+               ok my $more = $replicated->schema->resultset('Artist')->find(1)
+               => 'found inside a transaction';
+               return $more;
+       }) => 'successfully processed transaction';
+       
+       is $result->id, 1
+          => 'Got expected single result from transaction';
+}
 
-ok $replicate->{schema}->storage->connect_info
-    => 'got something out of ->connect_info';
+## Make sure replication came back
 
-## Force a connection to the write source for testing.
+ok $replicated->schema->resultset('Artist')->find(1)
+    => 'replicant reactivated';
+    
+## Test Discard changes
+
+{
+       ok my $artist = $replicated->schema->resultset('Artist')->find(2)
+           => 'got an artist to test discard changes';
+           
+       ok $artist->discard_changes
+          => 'properly discard changes';
+}
 
-$replicate->{schema}->storage($replicate->{schema}->storage->write_source);
+## Test some edge cases, like trying to do a transaction inside a transaction, etc
 
-## What happens when we do a find for something that doesn't exist?
+{
+    ok my $result = $replicated->schema->txn_do(sub {
+       return $replicated->schema->txn_do(sub {
+               ok my $more = $replicated->schema->resultset('Artist')->find(1)
+               => 'found inside a transaction inside a transaction';
+               return $more;                   
+       });
+    }) => 'successfully processed transaction';
+    
+    is $result->id, 1
+       => 'Got expected single result from transaction';         
+}
 
-ok ! $replicate->{schema}->resultset('Artist')->find(666)
-    => 'Correctly did not find a bad artist id';
+{
+    ok my $result = $replicated->schema->txn_do(sub {
+       return $replicated->schema->storage->execute_reliably(sub {
+               return $replicated->schema->txn_do(sub {
+                       return $replicated->schema->storage->execute_reliably(sub {
+                               ok my $more = $replicated->schema->resultset('Artist')->find(1)
+                               => 'found inside crazy deep transactions and execute_reliably';
+                               return $more;                           
+                       });
+               });     
+       });
+    }) => 'successfully processed transaction';
+    
+    is $result->id, 1
+       => 'Got expected single result from transaction';         
+}     
+
+## Test the force_pool resultset attribute.
+
+{
+       ok my $artist_rs = $replicated->schema->resultset('Artist')
+        => 'got artist resultset';
+          
+       ## Turn on Forced Pool Storage
+       ok my $reliable_artist_rs = $artist_rs->search(undef, {force_pool=>'master'})
+        => 'Created a resultset using force_pool storage';
+          
+    ok my $artist = $reliable_artist_rs->find(2) 
+        => 'got an artist result via force_pool storage';
+}
 
 ## Delete the old database files
-$replicate->cleanup;
-
-
-
-
-
-
+$replicated->cleanup;