From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sat, 12 Dec 2009 11:31:12 +0000 (+0000)
Subject: Even clearer unloaded FK exception
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=971beb942408fe56c2b5afcea159d9ab4db14a27;p=dbsrgits%2FDBIx-Class-Historic.git

Even clearer unloaded FK exception
---

diff --git a/lib/DBIx/Class/ResultSource.pm b/lib/DBIx/Class/ResultSource.pm
index 6945f48..4dc8e31 100644
--- a/lib/DBIx/Class/ResultSource.pm
+++ b/lib/DBIx/Class/ResultSource.pm
@@ -1334,13 +1334,13 @@ sub _resolve_condition {
         unless ($for->has_column_loaded($v)) {
           if ($for->in_storage) {
             $self->throw_exception(sprintf
-              'Unable to resolve relationship from %s to %s: column %s.%s not '
-            . 'loaded from storage (or not passed to new() prior to insert()). '
+              "Unable to resolve relationship '%s' from '%s': column '%s' of object %s "
+            . 'not loaded from storage (or not passed to new() prior to insert()). '
             . 'Maybe you forgot to call ->discard_changes to get defaults from the db.',
-
-              $for->result_source->source_name,
               $as,
-              $as, $v,
+              $for->result_source->source_name,
+              $v,
+              $for,
             );
           }
           return $UNRESOLVABLE_CONDITION;