X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=t%2F93storage_replication.t;h=2d1e58b7bb0097c8d1872f709f974c0642305018;hp=b70e254fa2d6062a13aa493ed6b310e2fdbcaf3a;hb=106d5f3b7e03a68fb2e125772e3f06a34115f22d;hpb=955a6df69eb864ba348f87f5a06a8b7a68ffc76c

diff --git a/t/93storage_replication.t b/t/93storage_replication.t
index b70e254..2d1e58b 100644
--- a/t/93storage_replication.t
+++ b/t/93storage_replication.t
@@ -2,13 +2,13 @@ use strict;
 use warnings;
 use lib qw(t/lib);
 use Test::More;
-use Data::Dump qw/dump/;
+use DBICTest;
 
 BEGIN {
     eval "use Moose";
     plan $@
         ? ( skip_all => 'needs Moose for testing' )
-        : ( tests => 33 );
+        : ( tests => 40 );
 }
 
 use_ok 'DBIx::Class::Storage::DBI::Replicated::Pool';
@@ -20,17 +20,18 @@ use_ok 'DBIx::Class::Storage::DBI::Replicated';
 ## 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 Data::Dump qw/dump/;
-    
     use base qw/Class::Accessor::Fast/;
     
-    __PACKAGE__->mk_accessors( qw/schema master_path slave_paths/ );
+    __PACKAGE__->mk_accessors( qw/schema/ );
 
     ## Initialize the object
     
@@ -39,8 +40,6 @@ TESTSCHEMACLASS: {
 	    my $self = $class->SUPER::new(@_);
 	
 	    $self->schema( $self->init_schema );
-	    $self->master_path("t/var/DBIxClass.db");
-	
 	    return $self;
 	}
     
@@ -48,20 +47,59 @@ TESTSCHEMACLASS: {
     
     sub init_schema {
         my $class = shift @_;
-        my $schema = DBICTest->init_schema(storage_type=>'::DBI::Replicated');
+        my $schema = DBICTest->init_schema(
+            storage_type=>[
+            	'::DBI::Replicated' => {
+            		balancer_type=>'::Random',
+            	}],
+            );
+
         return $schema;
     }
     
+    sub generate_replicant_connect_info {}
+    sub replicate {}
+    sub cleanup {}
+
+  
+    ## --------------------------------------------------------------------- ##
+    ## 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;
+        return map { [$_,'','',{AutoCommit=>1}] } @dsn;
     }
     
     ## Do a 'good enough' replication by copying the master dbfile over each of
@@ -83,6 +121,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;
+    } 
 }
 
 ## ----------------------------------------------------------------------------
@@ -91,13 +156,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';
@@ -123,7 +187,7 @@ ok my @replicant_connects = $replicated->generate_replicant_connect_info
 ok my @replicated_storages = $replicated->schema->storage->connect_replicants(@replicant_connects)
     => 'Created some storages suitable for replicants';
     
-isa_ok $replicated->schema->storage->current_replicant
+isa_ok $replicated->schema->storage->balancer->current_replicant
     => 'DBIx::Class::Storage::DBI';
     
 ok $replicated->schema->storage->pool->has_replicants
@@ -225,7 +289,47 @@ is $artist3->name, "Dead On Arrival"
 
 is $replicated->schema->storage->pool->connected_replicants => 1
     => "One replicant reconnected to handle the job";
+    
+## What happens when we try to select something that doesn't exist?
 
+ok ! $replicated->schema->resultset('Artist')->find(666)
+    => 'Correctly failed to find something.';
+    
+## test the reliable option
+
+TESTRELIABLE: {
+	
+	$replicated->schema->storage->set_reliable_storage;
+	
+	ok $replicated->schema->resultset('Artist')->find(2)
+	    => 'Read from master 1';
+	
+	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';
+}
+
+## Make sure when reliable goes out of scope, we are using replicants again
+
+ok $replicated->schema->resultset('Artist')->find(1)
+    => 'back to replicant 1.';
+    
+ok $replicated->schema->resultset('Artist')->find(2)
+    => 'back to replicant 2.';
+
+## set all the replicants to inactive, and make sure the balancer falls back to
+## the master.
+
+$replicated->schema->storage->replicants->{"t/var/DBIxClass_slave1.db"}->active(0);
+$replicated->schema->storage->replicants->{"t/var/DBIxClass_slave2.db"}->active(0);
+    
+ok $replicated->schema->resultset('Artist')->find(2)
+    => 'Fallback to master'; 
+       
 ## Delete the old database files
 $replicated->cleanup;