X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=184227f9d29a36dfa85f9c693cd39344e8309464;hb=307f12659a1a370e5e41a23ef35839e2807f1ca4;hp=7de97c0808c4a76ba6be3877981b89fd046dc1db;hpb=630ba6e5b8cb098e3991e34f6d4ac7e9234639b1;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 7de97c0..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,7 +69,7 @@ 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.08124'; +$VERSION = '0.08190'; $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases @@ -82,9 +124,9 @@ The community can be found via: =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(); @@ -92,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::Result::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. @@ -230,6 +272,8 @@ is traditional :) abraxxa: Alexander Hartmaier +acca: Alexander Kuznetsov + aherzog: Adam Herzog Alexander Keusch @@ -256,6 +300,8 @@ blblack: Brandon L. Black bluefeet: Aran Deltac +bphillips: Brian Phillips + boghead: Bryan Beeley bricas: Brian Cassidy @@ -264,6 +310,8 @@ brunov: Bruno Vecchi caelum: Rafael Kitover +caldrin: Maik Hentsche + castaway: Jess Robinson claco: Christopher H. Laco @@ -286,12 +334,18 @@ 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 @@ -302,6 +356,8 @@ ilmari: Dagfinn Ilmari MannsEker initself: Mike Baas +jawnsy: Jonathan Yu + jasonmay: Jason May jesper: Jesper Krogh @@ -318,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 @@ -378,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 @@ -390,8 +458,14 @@ solomon: Jared Johnson spb: Stephen Bennett +Squeeks + sszabo: Stephan Szabo +talexb: Alex Beamish + +tamias: Ronald J Kimball + teejay : Aaron Trevena Todd Lipcon