X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=184227f9d29a36dfa85f9c693cd39344e8309464;hb=307f12659a1a370e5e41a23ef35839e2807f1ca4;hp=b0612ae8b62fe6b40e072045f7675ca1712ea662;hpb=d9a78ae5f1f0095d2a1224090654214cd61cfb3e;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index b0612ae..184227f 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -3,18 +3,64 @@ package DBIx::Class; use strict; use warnings; +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 { +sub mk_classdata { shift->mk_classaccessor(@_); } sub mk_classaccessor { my $self = shift; - $self->mk_group_accessors('inherited', $_[0]); + $self->mk_group_accessors('inherited', $_[0]); $self->set_inherited(@_) if @_ > 1; } @@ -23,10 +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.08190'; -$VERSION = '0.08099_07'; - -$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,64 +101,86 @@ 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) - SVN: http://dev.catalyst.perl.org/repos/bast/DBIx-Class/ +=item * Mailing list: L - SVNWeb: http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/ +=item * RT Bug Tracker: L - IRC: irc.perl.org#dbix-class +=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(); 1; -Create a table class to represent artists, who have many CDs, in -MyDB/Schema/Result/Artist.pm: +Create a result class to represent artists, who have many CDs, in +MyApp/Schema/Result/Artist.pm: + +See L for docs on defining result classes. - package MyDB::Schema::Result::Artist; - use base qw/DBIx::Class/; + package MyApp::Schema::Result::Artist; + 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'); - __PACKAGE__->has_many(cds => 'MyDB::Schema::Result::CD'); + __PACKAGE__->has_many(cds => 'MyApp::Schema::Result::CD'); 1; -A table class to represent a CD, which belongs to an artist, in -MyDB/Schema/Result/CD.pm: +A result class to represent a CD, which belongs to an artist, in +MyApp/Schema/Result/CD.pm: - package MyDB::Schema::Result::CD; - use base qw/DBIx::Class/; + package MyApp::Schema::Result::CD; + 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 => '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. + # $schema->resultset returns a DBIx::Class::ResultSet my @all_artists = $schema->resultset('Artist')->all; my $all_artists_rs = $schema->resultset('Artist'); + # Output all artists names + # $artist here is a DBIx::Class::Row, which has accessors + # for all its columns. Rows are also subclasses of your Result class. + foreach $artist (@all_artists) { + print $artist->name, "\n"; + } + # Create a result set to search for artists. # This does not query the DB. my $johns_rs = $schema->resultset('Artist')->search( @@ -169,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. @@ -199,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 @@ -217,11 +300,17 @@ blblack: Brandon L. Black bluefeet: Aran Deltac +bphillips: Brian Phillips + +boghead: Bryan Beeley + bricas: Brian Cassidy +brunov: Bruno Vecchi + caelum: Rafael Kitover -captainL: Luke Saunders +caldrin: Maik Hentsche castaway: Jess Robinson @@ -233,46 +322,92 @@ 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 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 ningu: David Kamholz +Nniuq: Ron "Quinn" Straight" + +norbi: Norbert Buchmuller + +nuba: Nuba Princigalli + Numa: Dan Sully +ovid: Curtis "Ovid" Poe + oyse: Øystein Torget paulm: Paul Makepeace @@ -281,36 +416,66 @@ penguin: K J Cheetham perigrin: Chris Prather +peter: Peter Collingbourne + 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 semifor: Marc Mims +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 @@ -321,12 +486,18 @@ willert: Sebastian Willert wreis: Wallace Reis +yrlnry: Mark Jason Dominus + zamolxes: Bogdan Lucaciu -norbi: Norbert Buchmuller +=head1 COPYRIGHT + +Copyright (c) 2005 - 2010 the DBIx::Class L and L +as listed above. =head1 LICENSE -You may distribute this code under the same terms as Perl itself. +This library is free software and may be distributed under the same terms +as perl itself. =cut