From: John Napiorkowski <jjn1056@yahoo.com>
Date: Wed, 11 Jun 2008 14:41:07 +0000 (+0000)
Subject: Merge 'trunk' into 'replication_dedux'
X-Git-Tag: v0.08240~402^2~20
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=70c49125fbb6ace2022621dc429f2815407940d9;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'replication_dedux'

r13798@dev (orig r4486):  lukes | 2008-06-10 15:08:17 -0500
 r8139@luke-mbp (orig r4482):  lukes | 2008-06-10 17:25:34 +0100
 new branch for making the FK index optional
 r8140@luke-mbp (orig r4483):  lukes | 2008-06-10 20:09:24 +0100
 added some perldoc
 r8141@luke-mbp (orig r4484):  lukes | 2008-06-10 20:40:42 +0100
 allow add_fk_index param to be specified in rel def
 r8142@luke-mbp (orig r4485):  lukes | 2008-06-10 21:07:56 +0100
 fixed failing test

r13800@dev (orig r4488):  castaway | 2008-06-11 07:25:15 -0500
Point at "prefetch" in the get/set cache docs

r13801@dev (orig r4489):  castaway | 2008-06-11 07:54:58 -0500
Add docs to update mentioning scalar refs and discard_changes
---

70c49125fbb6ace2022621dc429f2815407940d9
diff --cc t/lib/DBICTest/Schema/TwoKeys.pm
index beced31,c504ae3..69af2e6
--- a/t/lib/DBICTest/Schema/TwoKeys.pm
+++ b/t/lib/DBICTest/Schema/TwoKeys.pm
@@@ -10,12 -10,8 +10,12 @@@ __PACKAGE__->add_columns
  );
  __PACKAGE__->set_primary_key(qw/artist cd/);
  
 -__PACKAGE__->belongs_to( artist => 'DBICTest::Schema::Artist' );
 +__PACKAGE__->belongs_to(
 +    artist => 'DBICTest::Schema::Artist',
 +    {'foreign.artistid'=>'self.artist'},
 +);
 +
- __PACKAGE__->belongs_to( cd => 'DBICTest::Schema::CD', undef, { is_deferrable => 0 } );
+ __PACKAGE__->belongs_to( cd => 'DBICTest::Schema::CD', undef, { is_deferrable => 0, add_fk_index => 0 } );
  
  __PACKAGE__->has_many(
    'fourkeys_to_twokeys', 'DBICTest::Schema::FourKeys_to_TwoKeys', {