X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=86bc9b09943265155bc49c83a6652c5941922101;hb=e02b39b48c5cca4812acb88d0bb71443cd8c8ff9;hp=5da895193d9e19336685ea295a001abf4c79249a;hpb=2527233b404455c2114f90da8041f42cd957f541;p=dbsrgits%2FDBIx-Class.git
diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index 5da8951..86bc9b0 100644
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -3,13 +3,23 @@ package DBIx::Class;
use strict;
use warnings;
-use MRO::Compat;
+BEGIN {
+ if ($] < 5.009_005) {
+ require MRO::Compat;
+ *DBIx::Class::_ENV_::OLD_MRO = sub () { 1 };
+ }
+ else {
+ require mro;
+ *DBIx::Class::_ENV_::OLD_MRO = sub () { 0 };
+ }
+}
+
use mro 'c3';
use DBIx::Class::Optional::Dependencies;
use vars qw($VERSION);
-use base qw/DBIx::Class::Componentised Class::Accessor::Grouped/;
+use base qw/DBIx::Class::Componentised DBIx::Class::AccessorGroup/;
use DBIx::Class::StartupCheck;
sub mk_classdata {
@@ -27,9 +37,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.08127';
-$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) = @_;
@@ -42,8 +52,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;
@@ -56,13 +69,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
@@ -100,7 +126,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;
@@ -181,7 +207,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.
@@ -211,14 +238,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
@@ -229,6 +266,8 @@ blblack: Brandon L. Black
bluefeet: Aran Deltac
+bphillips: Brian Phillips
+
boghead: Bryan Beeley
bricas: Brian Cassidy
@@ -237,6 +276,8 @@ brunov: Bruno Vecchi
caelum: Rafael Kitover
+caldrin: Maik Hentsche
+
castaway: Jess Robinson
claco: Christopher H. Laco
@@ -247,22 +288,38 @@ da5id: David Jack Olrik
debolaz: Anders Nor Berle
+dew: Dan Thomas
+
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
+
+jawnsy: Jonathan Yu
+
jasonmay: Jason May
jesper: Jesper Krogh
@@ -279,16 +336,24 @@ jon: Jon Schutz
jshirley: J. Shirley
+kaare: Kaare Rasmussen
+
konobi: Scott McWhirter
+littlesavage: Alexey Illarionov
+
lukes: Luke Saunders
marcus: Marcus Ramberg
mattlaw: Matt Lawrence
+mattp: Matt Phillips
+
michaelr: Michael Reddick
+milki: Jonathan Chu
+
ned: Neil de Carteret
nigel: Nigel Metheringham
@@ -299,6 +364,8 @@ Nniuq: Ron "Quinn" Straight"
norbi: Norbert Buchmuller
+nuba: Nuba Princigalli
+
Numa: Dan Sully
ovid: Curtis "Ovid" Poe
@@ -317,10 +384,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
@@ -333,6 +406,8 @@ robkinyon: Rob Kinyon
Roman: Roman Filippov
+Sadrak: Felix Antonius Wilhelm Ostmann
+
sc_: Just Another Perl Hacker
scotty: Scotty Allen
@@ -343,14 +418,22 @@ solomon: Jared Johnson
spb: Stephen Bennett
+Squeeks
+
sszabo: Stephan Szabo
+talexb: Alex Beamish
+
+tamias: Ronald J Kimball
+
teejay : Aaron Trevena
Todd Lipcon
Tom Hukins
+tonvoon: Ton Voon
+
triode: Pete Gamache
typester: Daisuke Murase
@@ -363,11 +446,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