From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sat, 12 Dec 2009 13:27:18 +0000 (+0000)
Subject: As clear as it gets
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5c89c897f1377aede43f0e668e79876cec44f55f;p=dbsrgits%2FDBIx-Class-Historic.git

As clear as it gets
---

diff --git a/lib/DBIx/Class/ResultSource.pm b/lib/DBIx/Class/ResultSource.pm
index 4dc8e31..aaa31a3 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 '%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.',
+              "Unable to resolve relationship '%s' from object %s: column '%s' not "
+            . 'loaded from storage (or not passed to new() prior to insert()). You '
+            . 'probably need to call ->discard_changes to get the server-side defaults '
+            . 'from the database.',
               $as,
-              $for->result_source->source_name,
-              $v,
               $for,
+              $v,
             );
           }
           return $UNRESOLVABLE_CONDITION;