X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=317d91c63bcfed0a74d5537f142e351ffb350abb;hb=40b2218de3c9b90da19ce0e30fa747cacf933977;hp=8d64df479e9a6130ab4b25d558bcf14f5f17d039;hpb=d1f542dbc28d54536e6544b996ace7454f681f0e;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 8d64df4..317d91c 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -6,6 +6,8 @@ use warnings; use MRO::Compat; use mro 'c3'; +use DBIx::Class::Optional::Dependencies; + use vars qw($VERSION); use base qw/DBIx::Class::Componentised Class::Accessor::Grouped/; use DBIx::Class::StartupCheck; @@ -25,9 +27,9 @@ sub component_base_class { 'DBIx::Class' } # Always remember to do all digits for the version even if they're 0 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports # brain damage and presumably various other packaging systems too -$VERSION = '0.08118_01'; +$VERSION = '0.08126'; -$VERSION = eval $VERSION; # numify for warning-free dev releases +$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases sub MODIFY_CODE_ATTRIBUTES { my ($class,$code,@attrs) = @_; @@ -40,8 +42,11 @@ sub MODIFY_CODE_ATTRIBUTES { sub _attr_cache { my $self = shift; my $cache = $self->can('__attr_cache') ? $self->__attr_cache : {}; - my $rest = eval { $self->next::method }; - return $@ ? $cache : { %$cache, %$rest }; + + return { + %$cache, + %{ $self->maybe::next::method || {} }, + }; } 1; @@ -54,13 +59,26 @@ DBIx::Class - Extensible and flexible object <-> relational mapper. The community can be found via: - Mailing list: http://lists.scsys.co.uk/mailman/listinfo/dbix-class/ +=over + +=item * Web Site: L + +=item * IRC: irc.perl.org#dbix-class + +=for html +(click for instant chatroom login) + +=item * Mailing list: L + +=item * RT Bug Tracker: L - SVN: http://dev.catalyst.perl.org/repos/bast/DBIx-Class/ +=item * gitweb: L - SVNWeb: http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/ +=item * git: L - IRC: irc.perl.org#dbix-class +=item * twitter L + +=back =head1 SYNOPSIS @@ -98,7 +116,7 @@ MyDB/Schema/Result/CD.pm: __PACKAGE__->table('cd'); __PACKAGE__->add_columns(qw/ cdid artistid title year /); __PACKAGE__->set_primary_key('cdid'); - __PACKAGE__->belongs_to(artist => 'MyDB::Schema::Artist', 'artistid'); + __PACKAGE__->belongs_to(artist => 'MyDB::Schema::Result::Artist', 'artistid'); 1; @@ -179,7 +197,8 @@ resultset is used as an iterator it only fetches rows off the statement handle as requested in order to minimise memory usage. It has auto-increment support for SQLite, MySQL, PostgreSQL, Oracle, SQL Server and DB2 and is known to be used in production on at least the first four, and is fork- -and thread-safe out of the box (although your DBD may not be). +and thread-safe out of the box (although +L). This project is still under rapid development, so large new features may be marked EXPERIMENTAL - such APIs are still usable but may have edge bugs. @@ -209,14 +228,24 @@ is traditional :) =head1 CONTRIBUTORS -abraxxa: Alexander Hartmaier +abraxxa: Alexander Hartmaier aherzog: Adam Herzog +Alexander Keusch + +alnewkirk: Al Newkirk + +amiri: Amiri Barksdale + +amoore: Andrew Moore + andyg: Andy Grundman ank: Andres Kievsky +arc: Aaron Crane + arcanez: Justin Hunter ash: Ash Berlin @@ -251,18 +280,30 @@ dkubb: Dan Kubb dnm: Justin Wheeler +dpetrov: Dimitar Petrov + dwc: Daniel Westermann-Clark dyfrgi: Michael Leuchtenburg +freetime: Bill Moseley + frew: Arthur Axel "fREW" Schmidt +goraxe: Gordon Irving + gphat: Cory G Watson groditi: Guillermo Roditi +Haarg: Graham Knop + +hobbs: Andrew Rodland + ilmari: Dagfinn Ilmari MannsEker +initself: Mike Baas + jasonmay: Jason May jesper: Jesper Krogh @@ -279,6 +320,8 @@ jon: Jon Schutz jshirley: J. Shirley +kaare: Kaare Rasmussen + konobi: Scott McWhirter lukes: Luke Saunders @@ -299,6 +342,8 @@ Nniuq: Ron "Quinn" Straight" norbi: Norbert Buchmuller +nuba: Nuba Princigalli + Numa: Dan Sully ovid: Curtis "Ovid" Poe @@ -317,10 +362,16 @@ phaylon: Robert Sedlacek plu: Johannes Plunien +Possum: Daniel LeWarne + quicksilver: Jules Bean rafl: Florian Ragwitz +rainboxx: Matthias Dietrich + +rbo: Robert Bohne + rbuels: Robert Buels rdj: Ryan D Johnson @@ -343,6 +394,8 @@ solomon: Jared Johnson spb: Stephen Bennett +Squeeks + sszabo: Stephan Szabo teejay : Aaron Trevena @@ -351,6 +404,8 @@ Todd Lipcon Tom Hukins +tonvoon: Ton Voon + triode: Pete Gamache typester: Daisuke Murase @@ -363,11 +418,13 @@ willert: Sebastian Willert wreis: Wallace Reis +yrlnry: Mark Jason Dominus + zamolxes: Bogdan Lucaciu =head1 COPYRIGHT -Copyright (c) 2005 - 2009 the DBIx::Class L and L +Copyright (c) 2005 - 2010 the DBIx::Class L and L as listed above. =head1 LICENSE