X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=333a53567fdd9890d6d1137b0700e220d8d825ef;hb=92fcfd01a5408299cc040bb2282d644b46a7c41d;hp=8d64df479e9a6130ab4b25d558bcf14f5f17d039;hpb=d1f542dbc28d54536e6544b996ace7454f681f0e;p=dbsrgits%2FDBIx-Class.git
diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index 8d64df4..333a535 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.08123_01';
-$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,22 @@ 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 * IRC: irc.perl.org#dbix-class
+
+=for html
+(click for instant chatroom login)
+
+=item * Mailing list: L
- SVN: http://dev.catalyst.perl.org/repos/bast/DBIx-Class/
+=item * RT Bug Tracker: L
- SVNWeb: http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/
+=item * gitweb: L
- IRC: irc.perl.org#dbix-class
+=item * git: L
+
+=back
=head1 SYNOPSIS
@@ -209,10 +223,16 @@ is traditional :)
=head1 CONTRIBUTORS
-abraxxa: Alexander Hartmaier
+abraxxa: Alexander Hartmaier
aherzog: Adam Herzog
+Alexander Keusch
+
+amiri: Amiri Barksdale
+
+amoore: Andrew Moore
+
andyg: Andy Grundman
ank: Andres Kievsky
@@ -251,16 +271,24 @@ dkubb: Dan Kubb
dnm: Justin Wheeler
+dpetrov: Dimitar Petrov
+
dwc: Daniel Westermann-Clark
dyfrgi: Michael Leuchtenburg
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
jasonmay: Jason May
@@ -299,6 +327,8 @@ Nniuq: Ron "Quinn" Straight"
norbi: Norbert Buchmuller
+nuba: Nuba Princigalli
+
Numa: Dan Sully
ovid: Curtis "Ovid" Poe
@@ -317,10 +347,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
@@ -351,6 +387,8 @@ Todd Lipcon
Tom Hukins
+tonvoon: Ton Voon
+
triode: Pete Gamache
typester: Daisuke Murase
@@ -367,7 +405,7 @@ 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