X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FBelongsTo.pm;fp=lib%2FDBIx%2FClass%2FRelationship%2FBelongsTo.pm;h=50ddc2eb446ada4e0dff0f2ae27817eaabce50c6;hb=e570488ade8f327f47dd3318db3443a348d561d6;hp=cadca9297eb65548fea892d77458a8ae31b7f7af;hpb=b83736a7d3235d2f50fe5695550eb3637432d960;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Relationship/BelongsTo.pm b/lib/DBIx/Class/Relationship/BelongsTo.pm index cadca92..50ddc2e 100644 --- a/lib/DBIx/Class/Relationship/BelongsTo.pm +++ b/lib/DBIx/Class/Relationship/BelongsTo.pm @@ -39,16 +39,16 @@ sub belongs_to { $class->throw_exception( "No such column '$f_key' declared yet on ${class} ($guess)" - ) unless $class->result_source_instance->has_column($f_key); + ) unless $class->result_source->has_column($f_key); $class->ensure_class_loaded($f_class); my $f_rsrc = dbic_internal_try { - $f_class->result_source_instance; + $f_class->result_source; } catch { $class->throw_exception( "Foreign class '$f_class' does not seem to be a Result class " - . "(or it simply did not load entirely due to a circular relation chain)" + . "(or it simply did not load entirely due to a circular relation chain): $_" ); }; @@ -81,7 +81,7 @@ sub belongs_to { and (keys %$cond)[0] =~ /^foreign\./ and - $class->result_source_instance->has_column($rel) + $class->result_source->has_column($rel) ) ? 'filter' : 'single'; my $fk_columns = ($acc_type eq 'single' and ref $cond eq 'HASH')