X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=8cf7971f8f08cc1a964592fa0fd4df61fb4f3e9a;hb=582fe49d7d17c4d61a1f3d4537ac7746272eec0e;hp=a633aa72acfd0f558282692bb0b77e86b2acb58d;hpb=2bb4c37b6a5f36d851c4a8ee6f5791e179491fd0;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index a633aa7..8cf7971 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -3,56 +3,68 @@ package DBIx::Class; use strict; use warnings; +our $VERSION; +# 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 declaration must stay up here, ahead of any other package +# declarations, as to not confuse various modules attempting to determine +# this ones version, whether that be s.c.o. or Module::Metadata, etc +$VERSION = '0.08204'; + +$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases + BEGIN { - package DBIx::Class::_ENV_; + package # hide from pause + DBIx::Class::_ENV_; - if ($] < 5.009_005) { - require MRO::Compat; - *OLD_MRO = sub () { 1 }; - } - else { - require mro; - *OLD_MRO = sub () { 0 }; - } + use Config; - # ::Runmode would only be loaded by DBICTest, which in turn implies t/ - *DBICTEST = eval { DBICTest::RunMode->is_author } - ? sub () { 1 } - : sub () { 0 } - ; + use constant { - # 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} + # but of course + BROKEN_FORK => ($^O eq 'MSWin32') ? 1 : 0, - # otherwise confess that this perl is busted ONLY on smokers - : do { - if (eval { DBICTest::RunMode->is_smoker }) { + HAS_ITHREADS => $Config{useithreads} ? 1 : 0, - # leaky 5.13.6 (fixed in blead/cefd5c7c) - if ($] == '5.013006') { 1 } + # ::Runmode would only be loaded by DBICTest, which in turn implies t/ + DBICTEST => eval { DBICTest::RunMode->is_author } ? 1 : 0, - # not sure why this one leaks, but disable anyway - ANDK seems to make it weep - elsif ($] == '5.013005') { 1 } + # During 5.13 dev cycle HELEMs started to leak on copy + PEEPEENESS => + # request for all tests would force "non-leaky" illusion and vice-versa + defined $ENV{DBICTEST_ALL_LEAKS} ? !$ENV{DBICTEST_ALL_LEAKS} + # otherwise confess that this perl is busted ONLY on smokers + : eval { DBICTest::RunMode->is_smoker } && ($] >= 5.013005 and $] <= 5.013006) ? 1 + # otherwise we are good + : 0 + , - else { 0 } - } - else { 0 } - } - ) ? sub () { 1 } : sub () { 0 }; + # There was a brief period of p5p insanity when $@ was invisible in a DESTROY + INVISIBLE_DOLLAR_AT => ($] >= 5.013001 and $] <= 5.013007) ? 1 : 0, + + }; + + if ($] < 5.009_005) { + require MRO::Compat; + constant->import( OLD_MRO => 1 ); + } + else { + require mro; + constant->import( OLD_MRO => 0 ); + } } use mro 'c3'; use DBIx::Class::Optional::Dependencies; -use vars qw($VERSION); 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'); +__PACKAGE__->_skip_namespace_frames('^DBIx::Class|^SQL::Abstract|^Try::Tiny|^Class::Accessor::Grouped|^Context::Preserve'); sub mk_classdata { shift->mk_classaccessor(@_); @@ -66,13 +78,6 @@ sub mk_classaccessor { 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_01'; - -$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases - sub MODIFY_CODE_ATTRIBUTES { my ($class,$code,@attrs) = @_; $class->mk_classdata('__attr_cache' => {}) @@ -144,7 +149,7 @@ See L for docs on defining result classes. __PACKAGE__->table('artist'); __PACKAGE__->add_columns(qw/ artistid name /); __PACKAGE__->set_primary_key('artistid'); - __PACKAGE__->has_many(cds => 'MyApp::Schema::Result::CD'); + __PACKAGE__->has_many(cds => 'MyApp::Schema::Result::CD', 'artistid'); 1; @@ -240,7 +245,7 @@ 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 -L). +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. @@ -278,6 +283,8 @@ aherzog: Adam Herzog Alexander Keusch +alexrj: Alessandro Ranellucci + alnewkirk: Al Newkirk amiri: Amiri Barksdale @@ -304,6 +311,8 @@ bphillips: Brian Phillips boghead: Bryan Beeley +brd: Brad Davis + bricas: Brian Cassidy brunov: Bruno Vecchi @@ -334,6 +343,8 @@ dwc: Daniel Westermann-Clark dyfrgi: Michael Leuchtenburg +edenc: Eden Cardim + felliott: Fitz Elliott freetime: Bill Moseley @@ -394,6 +405,10 @@ michaelr: Michael Reddick milki: Jonathan Chu +mjemmeson: Michael Jemmeson + +mstratman: Mark A. Stratman + ned: Neil de Carteret nigel: Nigel Metheringham @@ -410,7 +425,7 @@ Numa: Dan Sully ovid: Curtis "Ovid" Poe -oyse: Øystein Torget +oyse: Eystein Torget paulm: Paul Makepeace @@ -420,6 +435,8 @@ perigrin: Chris Prather peter: Peter Collingbourne +Peter Valdemar MErch + phaylon: Robert Sedlacek plu: Johannes Plunien @@ -456,6 +473,8 @@ scotty: Scotty Allen semifor: Marc Mims +SineSwiper: Brendan Byrd + solomon: Jared Johnson spb: Stephen Bennett @@ -484,17 +503,21 @@ victori: Victor Igumnov wdh: Will Hawes +wesm: Wes Malone + willert: Sebastian Willert wreis: Wallace Reis +xenoterracide: Caleb Cushing + yrlnry: Mark Jason Dominus zamolxes: Bogdan Lucaciu =head1 COPYRIGHT -Copyright (c) 2005 - 2010 the DBIx::Class L and L +Copyright (c) 2005 - 2011 the DBIx::Class L and L as listed above. =head1 LICENSE