X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=184227f9d29a36dfa85f9c693cd39344e8309464;hb=307f12659a1a370e5e41a23ef35839e2807f1ca4;hp=5da895193d9e19336685ea295a001abf4c79249a;hpb=2527233b404455c2114f90da8041f42cd957f541;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 5da8951..184227f 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -3,15 +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/DBIx::Class::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(@_); } @@ -27,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.08118_01'; +$VERSION = '0.08190'; -$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 +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; @@ -56,19 +101,32 @@ 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 -Create a schema class called MyDB/Schema.pm: +Create a schema class called MyApp/Schema.pm: - package MyDB::Schema; + package MyApp::Schema; use base qw/DBIx::Class::Schema/; __PACKAGE__->load_namespaces(); @@ -76,39 +134,39 @@ Create a schema class called MyDB/Schema.pm: 1; Create a result class to represent artists, who have many CDs, in -MyDB/Schema/Result/Artist.pm: +MyApp/Schema/Result/Artist.pm: See L for docs on defining result classes. - package MyDB::Schema::Result::Artist; + package MyApp::Schema::Result::Artist; use base qw/DBIx::Class::Core/; __PACKAGE__->table('artist'); __PACKAGE__->add_columns(qw/ artistid name /); __PACKAGE__->set_primary_key('artistid'); - __PACKAGE__->has_many(cds => 'MyDB::Schema::Result::CD'); + __PACKAGE__->has_many(cds => 'MyApp::Schema::Result::CD'); 1; A result class to represent a CD, which belongs to an artist, in -MyDB/Schema/Result/CD.pm: +MyApp/Schema/Result/CD.pm: - package MyDB::Schema::Result::CD; + package MyApp::Schema::Result::CD; use base qw/DBIx::Class::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 => 'MyApp::Schema::Result::Artist', 'artistid'); 1; Then you can use these classes in your application's code: # Connect to your database. - use MyDB::Schema; - my $schema = MyDB::Schema->connect($dbi_dsn, $user, $pass, \%dbi_params); + use MyApp::Schema; + my $schema = MyApp::Schema->connect($dbi_dsn, $user, $pass, \%dbi_params); # Query for all artists and put them in an array, # or retrieve them as a result set object. @@ -181,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. @@ -211,14 +270,26 @@ is traditional :) =head1 CONTRIBUTORS -abraxxa: Alexander Hartmaier +abraxxa: Alexander Hartmaier + +acca: Alexander Kuznetsov 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 +300,8 @@ blblack: Brandon L. Black bluefeet: Aran Deltac +bphillips: Brian Phillips + boghead: Bryan Beeley bricas: Brian Cassidy @@ -237,6 +310,8 @@ brunov: Bruno Vecchi caelum: Rafael Kitover +caldrin: Maik Hentsche + castaway: Jess Robinson claco: Christopher H. Laco @@ -247,22 +322,42 @@ 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 +felliott: Fitz Elliott + +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 @@ -279,16 +374,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 +402,8 @@ Nniuq: Ron "Quinn" Straight" norbi: Norbert Buchmuller +nuba: Nuba Princigalli + Numa: Dan Sully ovid: Curtis "Ovid" Poe @@ -317,10 +422,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 @@ -331,8 +442,12 @@ rjbs: Ricardo Signes robkinyon: Rob Kinyon +Robert Olson + Roman: Roman Filippov +Sadrak: Felix Antonius Wilhelm Ostmann + sc_: Just Another Perl Hacker scotty: Scotty Allen @@ -343,14 +458,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 +486,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