[Bast-commits] r7614 - DBIx-Class/0.08/trunk/lib/DBIx/Class

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-09-09 12:42:49 +0000 (Wed, 09 Sep 2009)
New Revision: 7614

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
Log:
Really sanify exception text

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm	2009-09-09 12:16:12 UTC (rev 7613)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm	2009-09-09 12:42:49 UTC (rev 7614)
@@ -1322,10 +1322,14 @@
         #warn "$self $k $for $v";
         unless ($for->has_column_loaded($v)) {
           if ($for->in_storage) {
-            $self->throw_exception(
-              "Unable to resolve relationship to ${for}: column ${v} 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."
+            $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()). '
+            . 'Maybe you forgot to call ->discard_changes to get defaults from the db.',
+
+              $for->result_source->source_name,
+              $as,
+              $as, $v,
             );
           }
           return $UNRESOLVABLE_CONDITION;