X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F93storage_replication.t;h=f96d49bc4c924225f3b969e1c6f1d6884b82bdd8;hb=dcdf7b2cd485cc015ddbfd816f6735be075c3386;hp=f6d2be67d9189cae50eb57335cc2a008e69b91e0;hpb=6412a5927691e6b8e3370edeb06ed3ef79c757b3;p=dbsrgits%2FDBIx-Class.git diff --git a/t/93storage_replication.t b/t/93storage_replication.t index f6d2be6..f96d49b 100644 --- a/t/93storage_replication.t +++ b/t/93storage_replication.t @@ -5,12 +5,13 @@ use Test::More; use Test::Exception; use DBICTest; use List::Util 'first'; +use Scalar::Util 'reftype'; BEGIN { eval "use DBIx::Class::Storage::DBI::Replicated; use Test::Moose"; plan $@ ? ( skip_all => "Deps not installed: $@" ) - : ( tests => 82 ); + : ( tests => 88 ); } use_ok 'DBIx::Class::Storage::DBI::Replicated::Pool'; @@ -50,10 +51,10 @@ TESTSCHEMACLASSES: { ## Initialize the object sub new { - my $class = shift @_; + my ($class, $schema_method) = (shift, shift); my $self = $class->SUPER::new(@_); - $self->schema( $self->init_schema ); + $self->schema( $self->init_schema($schema_method) ); return $self; } @@ -63,30 +64,69 @@ TESTSCHEMACLASSES: { # 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( - sqlite_use_file => 1, - storage_type=>{ - '::DBI::Replicated' => { - balancer_type=>'::Random', - balancer_args=>{ - auto_validate_every=>100, - }, - } - }, - deploy_args=>{ - add_drop_table => 1, - }, - ); + my ($class, $schema_method) = @_; + + my $method = "get_schema_$schema_method"; + my $schema = $class->$method; return $schema; } - + + sub get_schema_by_storage_type { + 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, + }, + ); + } + + sub get_schema_by_connect_info { + 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, + }, + ); + } + 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 @@ -197,14 +237,22 @@ 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'; - -isa_ok $replicated->schema->storage - => 'DBIx::Class::Storage::DBI::Replicated'; +my $replicated; + +for my $method (qw/by_connect_info by_storage_type/) { + ok $replicated = $replicated_class->new($method) + => "Created a replication object $method"; + + isa_ok $replicated->schema + => 'DBIx::Class::Schema'; + + isa_ok $replicated->schema->storage + => 'DBIx::Class::Storage::DBI::Replicated'; + + isa_ok $replicated->schema->storage->balancer + => 'DBIx::Class::Storage::DBI::Replicated::Balancer::Random' + => 'configured balancer_type'; +} ok $replicated->schema->storage->meta => 'has a meta object'; @@ -227,11 +275,21 @@ ok my @replicated_storages = $replicated->schema->storage->connect_replicants(@r ok my @all_storages = $replicated->schema->storage->all_storages => '->all_storages'; -ok @all_storages == 3 +is scalar @all_storages, + 3 => 'correct number of ->all_storages'; -ok ((grep $_->isa('DBIx::Class::Storage::DBI'), @all_storages) == 3 +is ((grep $_->isa('DBIx::Class::Storage::DBI'), @all_storages), + 3 => '->all_storages are correct type'); + +my @all_storage_opts = + grep { (reftype($_)||'') eq 'HASH' } + map @{ $_->_connect_info }, @all_storages; + +is ((grep $_->{master_option}, @all_storage_opts), + 3 + => 'connect_info was merged from master to replicants'); my @replicant_names = keys %{ $replicated->schema->storage->replicants };