From: Daniel Westermann-Clark <danieltwc@cpan.org>
Date: Sun, 28 May 2006 01:06:02 +0000 (-0400)
Subject: Merge 'find_compat' into 'DBIx-Class-current'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c11c66dc00d00def0189f96efc23df2673214ab0;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'find_compat' into 'DBIx-Class-current'
---

c11c66dc00d00def0189f96efc23df2673214ab0
diff --cc lib/DBIx/Class/ResultSet.pm
index 1c23b4c,f409567..ec41bc5
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@@ -271,14 -272,14 +272,14 @@@ Additionally, you can specify the colum
        artist => 'Massive Attack',
        title  => 'Mezzanine',
      },
 -    { key => 'artist_title' }
 +    { key => 'cd_artist_title' }
    );
  
- If no C<key> is specified and you explicitly name columns, it searches on all
- unique constraints defined on the source, including the primary key.
- 
  If the C<key> is specified as C<primary>, it searches only on the primary key.
  
+ If no C<key> is specified, it searches on all unique constraints defined on the
+ source, including the primary key.
+ 
  See also L</find_or_create> and L</update_or_create>. For information on how to
  declare unique constraints, see
  L<DBIx::Class::ResultSource/add_unique_constraint>.