X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSourceProxy.pm;h=696c9a53eb6819f757f04be85a67f579bfa286c6;hb=aaf2403d17fd75fea98d22c2ef28c42d3285ef03;hp=16029b988d296d8a2330eb1d16bbcfa5b404708c;hpb=c0e7b4e55952cd193b6f1866d0c27ece182397eb;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/ResultSourceProxy.pm b/lib/DBIx/Class/ResultSourceProxy.pm
index 16029b9..696c9a5 100644
--- a/lib/DBIx/Class/ResultSourceProxy.pm
+++ b/lib/DBIx/Class/ResultSourceProxy.pm
@@ -1,13 +1,32 @@
-package # hide from PAUSE 
+package # hide from PAUSE
     DBIx::Class::ResultSourceProxy;
 
 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_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(@_);
@@ -22,26 +41,53 @@ sub add_columns {
   }
 }
 
-sub has_column {                                                                
-  my ($self, $column) = @_;                                                     
-  return $self->result_source_instance->has_column($column);                    
+*add_column = \&add_columns;
+
+sub has_column {
+  shift->result_source_instance->has_column(@_);
+}
+
+sub column_info {
+  shift->result_source_instance->column_info(@_);
+}
+
+sub column_info_from_storage {
+  shift->result_source_instance->column_info_from_storage(@_);
 }
 
-sub column_info {                                                               
-  my ($self, $column) = @_;                                                     
-  return $self->result_source_instance->column_info($column);                   
+sub columns {
+  shift->result_source_instance->columns(@_);
 }
 
-                                                                                
-sub columns {                                                                   
-  return shift->result_source_instance->columns(@_);                            
-}                                                                               
-                                                                                
-sub set_primary_key { shift->result_source_instance->set_primary_key(@_); }     
-sub primary_columns { shift->result_source_instance->primary_columns(@_); }
+sub remove_columns {
+  shift->result_source_instance->remove_columns(@_);
+}
+
+*remove_column = \&remove_columns;
+
+sub set_primary_key {
+  shift->result_source_instance->set_primary_key(@_);
+}
 
-sub add_unique_constraint { shift->result_source_instance->add_unique_constraint(@_); }     
-sub unique_constraints { shift->result_source_instance->unique_constraints(@_); }
+sub primary_columns {
+  shift->result_source_instance->primary_columns(@_);
+}
+
+sub add_unique_constraint {
+  shift->result_source_instance->add_unique_constraint(@_);
+}
+
+sub unique_constraints {
+  shift->result_source_instance->unique_constraints(@_);
+}
+
+sub unique_constraint_names {
+  shift->result_source_instance->unique_constraint_names(@_);
+}
+
+sub unique_constraint_columns {
+  shift->result_source_instance->unique_constraint_columns(@_);
+}
 
 sub add_relationship {
   my ($class, $rel, @rest) = @_;