From: Peter Rabbitson <ribasushi@cpan.org>
Date: Mon, 1 Aug 2016 16:42:53 +0000 (+0200)
Subject: Some (very minor) fixups of emit_dups calls in e570488a
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=91028369783da0db94a61e879860b8da97417fbb;p=dbsrgits%2FDBIx-Class.git

Some (very minor) fixups of emit_dups calls in e570488a
---

diff --git a/lib/DBIx/Class/ResultSourceProxy.pm b/lib/DBIx/Class/ResultSourceProxy.pm
index b8f0082..7a6ab9d 100644
--- a/lib/DBIx/Class/ResultSourceProxy.pm
+++ b/lib/DBIx/Class/ResultSourceProxy.pm
@@ -306,9 +306,11 @@ EOC
           my $fqmeth = $in_class . '::' . %1$s . '()';
 
           DBIx::Class::_Util::emit_loud_diag(
-          # Repurpose the assertion envvar ( the override-check is independent
-          # from the schema san-checker, but the spirit is the same )
+
+            # Repurpose the assertion envvar ( the override-check is independent
+            # from the schema san-checker, but the spirit is the same )
             confess => $ENV{DBIC_ASSERT_NO_FAILING_SANITY_CHECKS},
+
             msg =>
               "The override method $fqmeth$possible_supers has been bypassed "
             . "$cs\n"
diff --git a/lib/DBIx/Class/Schema.pm b/lib/DBIx/Class/Schema.pm
index 19434b4..5987f75 100644
--- a/lib/DBIx/Class/Schema.pm
+++ b/lib/DBIx/Class/Schema.pm
@@ -9,8 +9,7 @@ use DBIx::Class::Carp;
 use Try::Tiny;
 use Scalar::Util qw( weaken blessed refaddr );
 use DBIx::Class::_Util qw(
-  false emit_loud_diag refdesc
-  refcount quote_sub scope_guard
+  refdesc refcount quote_sub scope_guard
   is_exception dbic_internal_try
   fail_on_internal_call emit_loud_diag
 );
diff --git a/t/lib/DBICTest/BaseSchema.pm b/t/lib/DBICTest/BaseSchema.pm
index 3963678..3ccd016 100644
--- a/t/lib/DBICTest/BaseSchema.pm
+++ b/t/lib/DBICTest/BaseSchema.pm
@@ -483,6 +483,7 @@ sub connection {
           emit_loud_diag(
             # not much else we can do (aside from exit(1) which is too obnoxious)
             msg => 'Incorrect call of result_source() in an eval',
+            emit_dups => 1,
           );
 
 
@@ -564,7 +565,7 @@ sub connection {
             # not much else we can do (aside from exit(1) which is too obnoxious)
             msg => 'Incorrect call of result_source_instance() in an eval',
             skip_frames => 1,
-            show_dups => 1,
+            emit_dups => 1,
           );
 
           &$orig_rsrc_instance;