X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSourceProxy.pm;h=9975540565dcb3c33770d2f252edece58f145072;hb=034d0be414a18cf3730c1e6e260acf6e70df476c;hp=b596e5c1a60b97ed684435d523d0c5e12fb2f6c4;hpb=d99162346719ed25e4e212f1a689d0744f89c3fe;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/ResultSourceProxy.pm b/lib/DBIx/Class/ResultSourceProxy.pm index b596e5c..9975540 100644 --- a/lib/DBIx/Class/ResultSourceProxy.pm +++ b/lib/DBIx/Class/ResultSourceProxy.pm @@ -5,13 +5,29 @@ use strict; use warnings; use base qw/DBIx::Class/; +use Scalar::Util qw/blessed/; +use Carp::Clan qw/^DBIx::Class/; sub iterator_class { shift->result_source_instance->resultset_class(@_) } sub resultset_class { shift->result_source_instance->resultset_class(@_) } sub result_class { shift->result_source_instance->result_class(@_) } -sub source_name { shift->result_source_instance->source_name(@_) } sub source_info { shift->result_source_instance->source_info(@_) } +sub set_inherited_ro_instance { + my $self = shift; + + croak "Cannot set @{[shift]} on an instance" if blessed $self; + + return $self->set_inherited(@_); +} + +sub get_inherited_ro_instance { + return shift->get_inherited(@_); +} + +__PACKAGE__->mk_group_accessors('inherited_ro_instance' => 'source_name'); + + sub resultset_attributes { shift->result_source_instance->resultset_attributes(@_); } @@ -21,11 +37,16 @@ sub add_columns { my $source = $class->result_source_instance; $source->add_columns(@cols); foreach my $c (grep { !ref } @cols) { + # If this is an augment definition get the real colname. + $c =~ s/^\+//; + $class->register_column($c => $source->column_info($c)); } } -*add_column = \&add_columns; +sub add_column { + shift->add_columns(@_); +} sub has_column { shift->result_source_instance->has_column(@_); @@ -57,10 +78,18 @@ sub primary_columns { shift->result_source_instance->primary_columns(@_); } +sub _pri_cols { + shift->result_source_instance->_pri_cols(@_); +} + sub add_unique_constraint { shift->result_source_instance->add_unique_constraint(@_); } +sub add_unique_constraints { + shift->result_source_instance->add_unique_constraints(@_); +} + sub unique_constraints { shift->result_source_instance->unique_constraints(@_); } @@ -88,4 +117,7 @@ sub relationship_info { shift->result_source_instance->relationship_info(@_); } +sub has_relationship { + shift->result_source_instance->has_relationship(@_); +} 1;