Merge 'trunk' into 'replication_dedux'

r8571@dev (orig r4363):  bricas | 2008-05-08 10:44:24 -0500
add Test::Exception to deps (RT #34256). move testing modules to test_requires().
r8572@dev (orig r4364):  bricas | 2008-05-08 15:08:18 -0500
add RT ticket number to changes
r8579@dev (orig r4371):  bricas | 2008-05-08 21:55:30 -0500
pod fix (RT #32988)

diff --git a/Changes b/Changes
index 963dc0b..d15c510 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for DBIx::Class
 
+        - pod fix (RT #32988)
+        - add Test::Exception to test requirements (RT #34256)
         - make ash's build_requires/META.yml fixes work better
         - is_deferable support on relations used by the SQL::Translator
           parser
@@ -25,6 +27,7 @@ Revision history for DBIx::Class
         - Added freeze, thaw and dclone methods to Schema so that thawed
           objects will get re-attached to the schema.
         - Moved dbicadmin to JSON::Any wrapped JSON.pm for a sane API
+          (also fixes RT #32393)
         - introduced DBIx::Class::set_inflated_columns
         - DBIx::Class::Row::copy uses set_inflated_columns
 

diff --git a/Makefile.PL b/Makefile.PL
index 99a4de4..4d3cb66 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -29,10 +29,11 @@ requires 'List::Util'                => 1.19;
 # Perl 5.8.0 doesn't have utf8::is_utf8()
 requires 'Encode'                    => 0 if ($] <= 5.008000);  
 
-build_requires 'DBD::SQLite'         => 1.13;
-build_requires 'Test::Builder'       => 0.33;
-build_requires 'Test::Warn'          => 0.08;
-build_requires 'Test::NoWarnings'    => 0.08;
+test_requires 'DBD::SQLite'         => 1.13;
+test_requires 'Test::Builder'       => 0.33;
+test_requires 'Test::Warn'          => 0.08;
+test_requires 'Test::NoWarnings'    => 0.08;
+test_requires 'Test::Exception'     => 0;
 
 install_script 'script/dbicadmin';
 

diff --git a/lib/DBIx/Class/Relationship/Base.pm b/lib/DBIx/Class/Relationship/Base.pm
index 10eebcd..3a95b3c 100644 (file)
--- a/lib/DBIx/Class/Relationship/Base.pm
+++ b/lib/DBIx/Class/Relationship/Base.pm
@@ -435,7 +435,7 @@ B<Currently only available for C<many-to-many> relationships.>
 
   my $actor = $schema->resultset('Actor')->find(1);
   my @roles = $schema->resultset('Role')->search({ role => 
-     { '-in' -> ['Fred', 'Barney'] } } );
+     { '-in' => ['Fred', 'Barney'] } } );
 
   $actor->set_roles(\@roles);
      # Replaces all of $actor's previous roles with the two named