Fix and guard against erroneous use of list context in internal DBIC code

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class.pm

diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index 3ed326f..38fde7a 100644 (file)
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -40,6 +40,8 @@ BEGIN {
       # otherwise we are good
                                                                                     : 0
     ,
+
+    ASSERT_NO_INTERNAL_WANTARRAY => $ENV{DBIC_ASSERT_NO_INTERNAL_WANTARRAY} ? 1 : 0,
   };
 
   if ($] < 5.009_005) {
@@ -398,6 +400,8 @@ dyfrgi: Michael Leuchtenburg <michael@slashhome.org>
 
 edenc: Eden Cardim <edencardim@gmail.com>
 
+ether: Karen Etheridge <ether@cpan.org>
+
 felliott: Fitz Elliott <fitz.elliott@gmail.com>
 
 freetime: Bill Moseley <moseley@hank.org>