X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=c7d6c9d1fc4a75b5195701f5e2e26f901094a6c6;hb=e0b2dc7456481be6870a23a5927a99c8416c82f7;hp=3c36722ffc1969cda5a1ca3a44b93201a3a0ef4d;hpb=51845f96c6f1026f0e9a3252a473840bddfecbba;p=dbsrgits%2FDBIx-Class.git
diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index 3c36722..c7d6c9d 100644
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -3,12 +3,57 @@ package DBIx::Class;
use strict;
use warnings;
-use MRO::Compat;
+BEGIN {
+ package DBIx::Class::_ENV_;
+
+ if ($] < 5.009_005) {
+ require MRO::Compat;
+ *OLD_MRO = sub () { 1 };
+ }
+ else {
+ require mro;
+ *OLD_MRO = sub () { 0 };
+ }
+
+ # ::Runmode would only be loaded by DBICTest, which in turn implies t/
+ *DBICTEST = eval { DBICTest::RunMode->is_author }
+ ? sub () { 1 }
+ : sub () { 0 }
+ ;
+
+ # During 5.13 dev cycle HELEMs started to leak on copy
+ *PEEPEENESS = (defined $ENV{DBICTEST_ALL_LEAKS}
+ # request for all tests would force "non-leaky" illusion and vice-versa
+ ? ! $ENV{DBICTEST_ALL_LEAKS}
+
+ # otherwise confess that this perl is busted ONLY on smokers
+ : do {
+ if (eval { DBICTest::RunMode->is_smoker }) {
+
+ # leaky 5.13.6 (fixed in blead/cefd5c7c)
+ if ($] == '5.013006') { 1 }
+
+ # not sure why this one leaks, but disable anyway - ANDK seems to make it weep
+ elsif ($] == '5.013005') { 1 }
+
+ else { 0 }
+ }
+ else { 0 }
+ }
+ ) ? sub () { 1 } : sub () { 0 };
+}
+
+use mro 'c3';
+
+use DBIx::Class::Optional::Dependencies;
use vars qw($VERSION);
-use base qw/Class::C3::Componentised Class::Accessor::Grouped/;
+use base qw/DBIx::Class::Componentised DBIx::Class::AccessorGroup/;
use DBIx::Class::StartupCheck;
+__PACKAGE__->mk_group_accessors(inherited => '_skip_namespace_frames');
+__PACKAGE__->_skip_namespace_frames('^DBIx::Class|^SQL::Abstract|^Try::Tiny');
+
sub mk_classdata {
shift->mk_classaccessor(@_);
}
@@ -24,9 +69,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.08112';
+$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) = @_;
@@ -39,8 +84,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;
@@ -53,13 +101,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
- SVN: http://dev.catalyst.perl.org/repos/bast/DBIx-Class/
+=item * Web Site: L
- SVNWeb: http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/
+=item * IRC: irc.perl.org#dbix-class
- IRC: irc.perl.org#dbix-class
+=for html
+(click for instant chatroom login)
+
+=item * Mailing list: L
+
+=item * RT Bug Tracker: L
+
+=item * gitweb: L
+
+=item * git: L
+
+=item * twitter L
+
+=back
=head1 SYNOPSIS
@@ -78,9 +139,8 @@ MyDB/Schema/Result/Artist.pm:
See L for docs on defining result classes.
package MyDB::Schema::Result::Artist;
- use base qw/DBIx::Class/;
+ use base qw/DBIx::Class::Core/;
- __PACKAGE__->load_components(qw/Core/);
__PACKAGE__->table('artist');
__PACKAGE__->add_columns(qw/ artistid name /);
__PACKAGE__->set_primary_key('artistid');
@@ -92,13 +152,13 @@ A result class to represent a CD, which belongs to an artist, in
MyDB/Schema/Result/CD.pm:
package MyDB::Schema::Result::CD;
- use base qw/DBIx::Class/;
+ use base qw/DBIx::Class::Core/;
- __PACKAGE__->load_components(qw/Core/);
+ __PACKAGE__->load_components(qw/InflateColumn::DateTime/);
__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;
@@ -115,9 +175,9 @@ Then you can use these classes in your application's code:
my $all_artists_rs = $schema->resultset('Artist');
# Output all artists names
- # $artist here is a DBIx::Class::Row, which has accessors
+ # $artist here is a DBIx::Class::Row, which has accessors
# for all its columns. Rows are also subclasses of your Result class.
- foreach $artist (@artists) {
+ foreach $artist (@all_artists) {
print $artist->name, "\n";
}
@@ -179,7 +239,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 +270,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
@@ -227,12 +298,18 @@ blblack: Brandon L. Black
bluefeet: Aran Deltac
+bphillips: Brian Phillips
+
+boghead: Bryan Beeley
+
bricas: Brian Cassidy
brunov: Bruno Vecchi
caelum: Rafael Kitover
+caldrin: Maik Hentsche
+
castaway: Jess Robinson
claco: Christopher H. Laco
@@ -243,22 +320,40 @@ 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
+Grant Street Group L
+
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
@@ -267,22 +362,32 @@ jgoulah: John Goulah
jguenther: Justin Guenther
+jhannah: Jay Hannah
+
jnapiorkowski: John Napiorkowski
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
@@ -293,8 +398,12 @@ Nniuq: Ron "Quinn" Straight"
norbi: Norbert Buchmuller
+nuba: Nuba Princigalli
+
Numa: Dan Sully
+ovid: Curtis "Ovid" Poe
+
oyse: Øystein Torget
paulm: Paul Makepeace
@@ -309,20 +418,32 @@ 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
-ribasushi: Peter Rabbitson
+ribasushi: Peter Rabbitson
rjbs: Ricardo Signes
robkinyon: Rob Kinyon
+Robert Olson
+
+Roman: Roman Filippov
+
+Sadrak: Felix Antonius Wilhelm Ostmann
+
sc_: Just Another Perl Hacker
scotty: Scotty Allen
@@ -333,14 +454,24 @@ 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
victori: Victor Igumnov
@@ -351,11 +482,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