X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=7aba89577410c77921e2a180d9a66c1e22d07433;hb=20674fcd94984d0d2be09ecda7f3c22715468936;hp=9d49b692868e172fc70c30b9f23477bf19e7e21a;hpb=7f6f5b6903a37eb52b4e08398ac4ce64ce35f8e1;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 9d49b69..7aba895 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -4,10 +4,14 @@ use strict; use warnings; use MRO::Compat; +use mro 'c3'; + +use DBIx::Class::Optional::Dependencies; use vars qw($VERSION); use base qw/DBIx::Class::Componentised Class::Accessor::Grouped/; use DBIx::Class::StartupCheck; +use Try::Tiny; sub mk_classdata { shift->mk_classaccessor(@_); @@ -24,14 +28,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.08121_01'; -$VERSION = '0.08109'; - -$VERSION = eval $VERSION; # numify for warning-free dev releases - -# what version of sqlt do we require if deploy() without a ddl_dir is invoked -# when changing also adjust $sqlt_recommends in Makefile.PL -my $minimum_sqlt_version = '0.11002'; +$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases sub MODIFY_CODE_ATTRIBUTES { my ($class,$code,@attrs) = @_; @@ -44,38 +43,16 @@ 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 }; -} - -# SQLT version handling -{ - my $_sqlt_version_ok; # private - my $_sqlt_version_error; # private - - sub _sqlt_version_ok { - if (!defined $_sqlt_version_ok) { - eval "use SQL::Translator $minimum_sqlt_version"; - if ($@) { - $_sqlt_version_ok = 0; - $_sqlt_version_error = $@; - } - else { - $_sqlt_version_ok = 1; - } - } - return $_sqlt_version_ok; - } - - sub _sqlt_version_error { - shift->_sqlt_version_ok unless defined $_sqlt_version_ok; - return $_sqlt_version_error; - } - - sub _sqlt_minimum_version { $minimum_sqlt_version }; + my $rest; + my $exception; + try { + $rest = $self->next::method; + } catch { + $exception = 1; + }; + return $exception ? $cache : { %$cache, %$rest }; } - 1; =head1 NAME @@ -86,13 +63,20 @@ 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 * IRC: L + +=item * Mailing list: L - SVN: http://dev.catalyst.perl.org/repos/bast/DBIx-Class/ +=item * RT Bug Tracker: L - SVNWeb: http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/ +=item * SVNWeb: L - IRC: irc.perl.org#dbix-class +=item * SVN: L + +=back =head1 SYNOPSIS @@ -111,9 +95,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'); @@ -125,9 +108,9 @@ 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'); @@ -148,9 +131,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"; } @@ -233,11 +216,6 @@ merged back to trunk for a major release. L lists each task you might want help on, and the modules where you will find documentation. -=head1 COPYRIGHT - -Copyright (c) 2005 - 2009 the DBIx::Class L and L -as listed below. - =head1 AUTHOR mst: Matt S. Trout @@ -247,10 +225,12 @@ is traditional :) =head1 CONTRIBUTORS -abraxxa: Alexander Hartmaier +abraxxa: Alexander Hartmaier aherzog: Adam Herzog +amoore: Andrew Moore + andyg: Andy Grundman ank: Andres Kievsky @@ -265,8 +245,12 @@ blblack: Brandon L. Black bluefeet: Aran Deltac +boghead: Bryan Beeley + bricas: Brian Cassidy +brunov: Bruno Vecchi + caelum: Rafael Kitover castaway: Jess Robinson @@ -279,20 +263,28 @@ 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 frew: Arthur Axel "fREW" Schmidt +goraxe: Gordon Irving + gphat: Cory G Watson groditi: Guillermo Roditi +hobbs: Andrew Rodland + ilmari: Dagfinn Ilmari MannsEker jasonmay: Jason May @@ -303,6 +295,8 @@ jgoulah: John Goulah jguenther: Justin Guenther +jhannah: Jay Hannah + jnapiorkowski: John Napiorkowski jon: Jon Schutz @@ -329,8 +323,12 @@ Nniuq: Ron "Quinn" Straight" norbi: Norbert Buchmuller +nuba: Nuba Princigalli + Numa: Dan Sully +ovid: Curtis "Ovid" Poe + oyse: Øystein Torget paulm: Paul Makepeace @@ -353,12 +351,14 @@ rbuels: Robert Buels rdj: Ryan D Johnson -ribasushi: Peter Rabbitson +ribasushi: Peter Rabbitson rjbs: Ricardo Signes robkinyon: Rob Kinyon +Roman: Roman Filippov + sc_: Just Another Perl Hacker scotty: Scotty Allen @@ -377,6 +377,8 @@ Todd Lipcon Tom Hukins +triode: Pete Gamache + typester: Daisuke Murase victori: Victor Igumnov @@ -389,6 +391,13 @@ wreis: Wallace Reis zamolxes: Bogdan Lucaciu +Possum: Daniel LeWarne + +=head1 COPYRIGHT + +Copyright (c) 2005 - 2010 the DBIx::Class L and L +as listed above. + =head1 LICENSE This library is free software and may be distributed under the same terms