Added set_schema and fixed previously bad calls ($self->$_).

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / Replication.pm

diff --git a/lib/DBIx/Class/Storage/DBI/Replication.pm b/lib/DBIx/Class/Storage/DBI/Replication.pm
index 76e86e2..bc3a881 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Replication.pm
+++ b/lib/DBIx/Class/Storage/DBI/Replication.pm
@@ -68,12 +68,24 @@ sub all_sources {
 sub connect_info {
     my( $self, $source_info ) = @_;
 
-    my $last_info = ref $source_info->[-1] eq 'HASH' ? pop( @$source_info ) : undef;
+    my( $info, $global_options, $options, @dsns );
 
-    $self->write_source->connect_info( $source_info->[0], $last_info );
+    $info = [ @$source_info ];
 
-    my @dsns = map { ($_->[3]->{priority} || 10) => $_ } @{$source_info}[1..@$source_info-1];
-    $self->read_source->connect_info( [ 'dbi:Multi:', undef, undef, { dsns => \@dsns } ], $last_info );
+    $global_options = ref $info->[-1] eq 'HASH' ? pop( @$info ) : {};
+    if( ref( $options = $info->[0]->[-1] ) eq 'HASH' ) {
+       # Local options present in dsn, merge them with global options
+       map { $global_options->{$_} = $options->{$_} } keys %$options;
+       pop @{$info->[0]};
+    }
+
+    # We need to copy-pass $global_options, since connect_info clears it while processing options
+    $self->write_source->connect_info( [ @{$info->[0]}, { %$global_options } ] );
+
+    @dsns = map { ($_->[3]->{priority} || 10) => $_ } @{$info}[1..@$info-1];
+    $global_options->{dsns} = \@dsns;
+
+    $self->read_source->connect_info( [ 'dbi:Multi:', undef, undef, { %$global_options } ] );
 }
 
 sub select {
@@ -110,22 +122,12 @@ sub build_datetime_parser {
     shift->read_source->build_datetime_parser( @_ );
 }
 
-sub limit_dialect {
-    my $self = shift;
-    $self->$_->limit_dialect( @_ ) for( $self->all_sources );
-}
-sub quote_char {
-    my $self = shift;
-    $self->$_->quote_char( @_ ) for( $self->all_sources );
-}
-sub name_sep {
-    my $self = shift;
-    $self->$_->quote_char( @_ ) for( $self->all_sources );
-}
-sub disconnect {
-    my $self = shift;
-    $self->$_->disconnect( @_ ) for( $self->all_sources );
-}
+sub limit_dialect { $_->limit_dialect( @_ ) for( shift->all_sources ) }
+sub quote_char { $_->quote_char( @_ ) for( shift->all_sources ) }
+sub name_sep { $_->quote_char( @_ ) for( shift->all_sources ) }
+sub disconnect { $_->disconnect( @_ ) for( shift->all_sources ) }
+sub set_schema { $_->set_schema( @_ ) for( shift->all_sources ) }
+
 sub DESTROY {
     my $self = shift;