X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSourceProxy.pm;h=cd18d2e3ed6f0263eda66f9b2b17116f533554fc;hb=1b822bd3;hp=4d80cba05f6ffed1a91f28c2a20edf38358c971e;hpb=a48e92d70ba95a7559fc2d17c953e2f84ee827ed;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/ResultSourceProxy.pm b/lib/DBIx/Class/ResultSourceProxy.pm
index 4d80cba..cd18d2e 100644
--- a/lib/DBIx/Class/ResultSourceProxy.pm
+++ b/lib/DBIx/Class/ResultSourceProxy.pm
@@ -4,88 +4,106 @@ package # hide from PAUSE
 use strict;
 use warnings;
 
-use base qw/DBIx::Class/;
+use base '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(@_) }
+# needs to be loaded early to query method attributes below
+use DBIx::Class::ResultSource;
 
-sub resultset_attributes {
-  shift->result_source_instance->resultset_attributes(@_);
+use DBIx::Class::_Util qw( quote_sub fail_on_internal_call );
+use namespace::clean;
+
+__PACKAGE__->mk_group_accessors('inherited_ro_instance' => 'source_name');
+
+sub get_inherited_ro_instance { $_[0]->get_inherited($_[1]) }
+
+sub set_inherited_ro_instance {
+  $_[0]->throw_exception ("Cannot set '$_[1]' on an instance")
+    if length ref $_[0];
+
+  $_[0]->set_inherited( $_[1], $_[2] );
 }
 
+
 sub add_columns {
   my ($class, @cols) = @_;
-  my $source = $class->result_source_instance;
+  my $source = $class->result_source;
   $source->add_columns(@cols);
+
+  my $colinfos;
   foreach my $c (grep { !ref } @cols) {
-    $class->register_column($c => $source->column_info($c));
+    # If this is an augment definition get the real colname.
+    $c =~ s/^\+//;
+
+    $class->register_column(
+      $c,
+      ( $colinfos ||= $source->columns_info )->{$c}
+    );
   }
 }
 
-*add_column = \&add_columns;
-
-sub has_column {
-  shift->result_source_instance->has_column(@_);
+sub add_column :DBIC_method_is_indirect_sugar {
+  DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
+  shift->add_columns(@_)
 }
 
-sub column_info {
-  shift->result_source_instance->column_info(@_);
-}
 
-sub load_column_info_from_storage {
-  shift->result_source_instance->load_column_info_from_storage;
+sub add_relationship {
+  my ($class, $rel, @rest) = @_;
+  my $source = $class->result_source;
+  $source->add_relationship($rel => @rest);
+  $class->register_relationship($rel => $source->relationship_info($rel));
 }
 
-sub columns {
-  shift->result_source_instance->columns(@_);
-}
 
-sub remove_columns {
-  shift->result_source_instance->remove_columns(@_);
+# legacy resultset_class accessor, seems to be used by cdbi only
+sub iterator_class :DBIC_method_is_indirect_sugar {
+  DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
+  shift->result_source->resultset_class(@_)
 }
 
-*remove_column = \&remove_columns;
+for my $method_to_proxy (qw/
+  source_info
+  result_class
+  resultset_class
+  resultset_attributes
 
-sub set_primary_key {
-  shift->result_source_instance->set_primary_key(@_);
-}
+  columns
+  has_column
 
-sub primary_columns {
-  shift->result_source_instance->primary_columns(@_);
-}
+  remove_column
+  remove_columns
 
-sub add_unique_constraint {
-  shift->result_source_instance->add_unique_constraint(@_);
-}
+  column_info
+  columns_info
+  column_info_from_storage
 
-sub unique_constraints {
-  shift->result_source_instance->unique_constraints(@_);
-}
+  set_primary_key
+  primary_columns
+  sequence
 
-sub unique_constraint_names {
-  shift->result_source_instance->unique_constraint_names(@_);
-}
+  add_unique_constraint
+  add_unique_constraints
 
-sub unique_constraint_columns {
-  shift->result_source_instance->unique_constraint_columns(@_);
-}
+  unique_constraints
+  unique_constraint_names
+  unique_constraint_columns
 
-sub add_relationship {
-  my ($class, $rel, @rest) = @_;
-  my $source = $class->result_source_instance;
-  $source->add_relationship($rel => @rest);
-  $class->register_relationship($rel => $source->relationship_info($rel));
-}
+  relationships
+  relationship_info
+  has_relationship
+/) {
 
-sub relationships {
-  shift->result_source_instance->relationships(@_);
-}
+  my $qsub_opts = { attributes => [ do {
+    no strict 'refs';
+    attributes::get( \&{"DBIx::Class::ResultSource::$method_to_proxy"} )
+  } ] };
+
+  quote_sub __PACKAGE__."::$method_to_proxy", sprintf( <<'EOC', $method_to_proxy ), {}, $qsub_opts;
+    DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and DBIx::Class::_Util::fail_on_internal_call;
+
+    shift->result_source->%s (@_);
+EOC
 
-sub relationship_info {
-  shift->result_source_instance->relationship_info(@_);
 }
 
 1;