X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F93storage_replication.t;h=2d1e58b7bb0097c8d1872f709f974c0642305018;hb=5ce78bdc81e8e98dc92f9fa978f4e3c035c1d616;hp=146a54955f4b70381665154b274e01761a2bfdc8;hpb=26ab719a4d6ee414537c815677b9884b64417539;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/93storage_replication.t b/t/93storage_replication.t
index 146a549..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 => 30 );
+        : ( tests => 40 );
 }
 
 use_ok 'DBIx::Class::Storage::DBI::Replicated::Pool';
@@ -20,16 +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 base qw/Class::Accessor::Fast/;
     
-    __PACKAGE__->mk_accessors( qw/schema master_path slave_paths/ );
+    __PACKAGE__->mk_accessors( qw/schema/ );
 
     ## Initialize the object
     
@@ -38,8 +40,6 @@ TESTSCHEMACLASS: {
 	    my $self = $class->SUPER::new(@_);
 	
 	    $self->schema( $self->init_schema );
-	    $self->master_path("t/var/DBIxClass.db");
-	
 	    return $self;
 	}
     
@@ -47,24 +47,64 @@ 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
-    ## 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 +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;
+    } 
 }
 
 ## ----------------------------------------------------------------------------
@@ -89,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';
@@ -118,10 +184,10 @@ isa_ok $replicated->schema->storage->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
+isa_ok $replicated->schema->storage->balancer->current_replicant
     => 'DBIx::Class::Storage::DBI';
     
 ok $replicated->schema->storage->pool->has_replicants
@@ -201,9 +267,17 @@ is $artist2->name, "Doom's Children"
 
 ## What happens when we disconnect all the replicants?
 
+is $replicated->schema->storage->pool->connected_replicants => 2
+    => "both replicants are connected";
+    
 $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 => 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,260 +287,51 @@ isa_ok $artist3
 is $artist3->name, "Dead On Arrival"
     => 'Found expected name for first result';
 
+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?
 
-__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);
-		}
-	}
+	ok $replicated->schema->resultset('Artist')->find(2)
+	    => 'Read from master 1';
 	
-	## Cleanup afer ourselves.
-	
-	sub cleanup {
-		my $self = shift @_;
-		my ($master, @slaves) = @{$self->{db_paths}};
-		
-		foreach my $slave (@slaves) {
-			unlink $slave;
-		}		
-	}
-	
-	## Force a reconnection
-	
-	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
-## ----------------------------------------------------------------------------
-
-my %params = (
-	db_paths => [
-		"t/var/DBIxClass.db",
-		"t/var/DBIxClass_slave1.db",
-		"t/var/DBIxClass_slave2.db",
-	],
-);
-
-ok my $replicate = DBIx::Class::DBI::Replicated::TestReplication->new(%params)
-	=> 'Created a replication object';
-	
-isa_ok $replicate->{schema}
-	=> 'DBIx::Class::Schema';
-
-## Add some info to the database
-
-$replicate
-	->{schema}
-	->populate('Artist', [
-		[ qw/artistid name/ ],
-		[ 4, "Ozric Tentacles"],
-	]);
-			    
-## Make sure all the slaves have the table definitions
-
-$replicate->replicate;
-
-## Make sure we can read the data.
-
-ok my $artist1 = $replicate->{schema}->resultset('Artist')->find(4)
-	=> 'Created Result';
-
-isa_ok $artist1
-	=> 'DBICTest::Artist';
-	
-is $artist1->name, 'Ozric Tentacles'
-	=> 'Found expected name for first result';
+## Make sure when reliable goes out of scope, we are using replicants again
 
-## 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.
-
-$replicate
-	->{schema}
-	->populate('Artist', [
-		[ qw/artistid name/ ],
-		[ 5, "Doom's Children"],
-		[ 6, "Dead On Arrival"],
-		[ 7, "Watergate"],
-	]);
-	
-## 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';
-	
-isa_ok $artist2
-	=> 'DBICTest::Artist';
-	
-is $artist2->name, "Doom's Children"
-	=> 'Found expected name for first result';
-	
-## What happens when we delete one of the slaves?
-
-ok my $slave1 = @{$replicate->{slaves}}[0]
-	=> 'Got Slave1';
-
-ok $slave1->disconnect
-	=> 'disconnected slave1';
-
-$replicate->reconnect;
-
-ok my $artist3 = $replicate->{schema}->resultset('Artist')->find(6)
-	=> 'Still finding stuff.';
-	
-isa_ok $artist3
-	=> 'DBICTest::Artist';
-	
-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';
-
-ok $slave2->disconnect
-	=> 'Disconnected slave2';
-
-$replicate->reconnect;
-
-## We expect an error now, since all the slaves are dead
-
-eval {
-	$replicate->{schema}->resultset('Artist')->find(4)->name;
-};
-
-ok $@ => 'Got error when trying to find artistid 4';
-
-## This should also be an error
-
-eval {
-	my $artist4 = $replicate->{schema}->resultset('Artist')->find(7);	
-};
-
-ok $@ => 'Got read errors after everything failed';
-
-## make sure ->connect_info returns something sane
-
-ok $replicate->{schema}->storage->connect_info
-    => 'got something out of ->connect_info';
-
-## Force a connection to the write source for testing.
-
-$replicate->{schema}->storage($replicate->{schema}->storage->write_source);
-
-## What happens when we do a find for something that doesn't exist?
+ok $replicated->schema->resultset('Artist')->find(1)
+    => 'back to replicant 1.';
+    
+ok $replicated->schema->resultset('Artist')->find(2)
+    => 'back to replicant 2.';
 
-ok ! $replicate->{schema}->resultset('Artist')->find(666)
-    => 'Correctly did not find a bad artist id';
+## 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
-$replicate->cleanup;
+$replicated->cleanup;