From: Matt S Trout <mst@shadowcat.co.uk>
Date: Wed, 14 Dec 2005 05:44:37 +0000 (+0000)
Subject: Merge 'trunk' into 'DBIx-Class-resultset'
X-Git-Tag: v0.05005~119^2~25
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=89bfba91c9347d7ef481dd3f33365fdd3c003c62;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'DBIx-Class-resultset'

r4450@obrien (orig r367):  bricas | 2005-12-09 19:25:51 +0000
minor pod fixes
r4451@obrien (orig r368):  matthewt | 2005-12-09 19:40:00 +0000
- Merged patched from andyg to throw useful errors during relationship loading
r4495@obrien (orig r369):  castaway | 2005-12-10 14:14:11 +0000
Check for primary key existance

r4496@obrien (orig r370):  ningu | 2005-12-10 15:06:51 +0000
- updated manifest and manifest.skip
- added support in BelongsTo for string third argument specifying foreign column name (and test)
r4497@obrien (orig r371):  ningu | 2005-12-10 15:48:13 +0000
- docs updates to Relationship and ResultSet
r4498@obrien (orig r372):  ningu | 2005-12-10 16:25:12 +0000
- item => head2 in docs
r4499@obrien (orig r373):  ningu | 2005-12-10 16:54:34 +0000
clean up transaction handling
- tx_begin, tx_commit, tx_rollback (old methods are aliased)
- DBI.pm uses counter to do nested transactions portably
r4500@obrien (orig r374):  ningu | 2005-12-10 17:19:50 +0000
- fix last patch
r4501@obrien (orig r375):  ningu | 2005-12-10 17:57:11 +0000
- fixed up relationship docs
r4502@obrien (orig r376):  ningu | 2005-12-10 18:21:11 +0000
- more dob updates
r4503@obrien (orig r377):  ningu | 2005-12-10 21:19:03 +0000
- update cookbook and resultset docs
r4504@obrien (orig r378):  ningu | 2005-12-10 21:32:04 +0000
- rename tx_* => txn_*
r4507@obrien (orig r381):  ningu | 2005-12-11 09:18:54 +0000
- rewrite belongs_to again, so $cond is foreign key in current table
r4508@obrien (orig r382):  matthewt | 2005-12-12 12:07:29 +0000
- Test and fix to Storage::DBI from Justin DeVuyst
r4509@obrien (orig r383):  matthewt | 2005-12-12 15:52:40 +0000
- Nothing to see here. Move along ...
r4510@obrien (orig r384):  ningu | 2005-12-13 11:22:49 +0000
- fix docs typo
r4511@obrien (orig r385):  ningu | 2005-12-13 20:23:50 +0000
- PK::Auto::Pg bug fix, only checks primary keys
r4512@obrien (orig r386):  ningu | 2005-12-13 20:37:42 +0000
- updated Changes
r4513@obrien (orig r387):  ningu | 2005-12-13 20:54:57 +0000
- add ResultSet to see also in main POD
- update MANIFEST and README
r4514@obrien (orig r388):  ningu | 2005-12-13 21:28:17 +0000
- fix mystery tabs in changes file
---

89bfba91c9347d7ef481dd3f33365fdd3c003c62
diff --cc lib/DBIx/Class.pm
index f0d7a7a,9f02215..322f590
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@@ -4,12 -4,10 +4,10 @@@ use strict
  use warnings;
  
  use vars qw($VERSION);
 -use base qw/DBIx::Class::Componentised Class::Data::Inheritable/;
 +use base qw/DBIx::Class::Componentised Class::Data::Accessor/;
  
 -$VERSION = '0.04001';
 +sub mk_classdata { shift->mk_classaccessor(@_); }
  
- $VERSION = '0.0499_01';
- 
  1;
  
  =head1 NAME 
diff --cc t/lib/DBICTest/Schema/HelperRels.pm
index 2f99d7b,63191ea..de45943
--- a/t/lib/DBICTest/Schema/HelperRels.pm
+++ b/t/lib/DBICTest/Schema/HelperRels.pm
@@@ -26,8 -26,10 +26,10 @@@ DBICTest::Schema::SelfRef->has_many
  
  DBICTest::Schema::Tag->belongs_to('cd', 'DBICTest::Schema::CD');
  
 -DBICTest::Schema::Track->belongs_to('cd', 'DBICTest::Schema::CD');
 +DBICTest::Schema::Track->belongs_to('cd', 'DBICTest::Schema::CD', 'cdid');
  
+ DBICTest::Schema::Track->belongs_to('disc', 'DBICTest::Schema::CD', 'cd');
+ 
  DBICTest::Schema::TwoKeys->belongs_to('artist', 'DBICTest::Schema::Artist');
  
  DBICTest::Schema::TwoKeys->belongs_to('cd', 'DBICTest::Schema::CD');