X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=f83e278eaed04ea4120c1fc2ad5bd35fb39a745f;hb=f181e8fecf545cf39de6975fc6187f72437e9af9;hp=62e3cc4e594d4442168129a25240ad6487f57636;hpb=b38e10bd665f8e7131c9e17069a23060935c328b;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 62e3cc4..f83e278 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -4,6 +4,9 @@ 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/; @@ -24,15 +27,10 @@ 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.08109'; +$VERSION = '0.08119'; $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'; - sub MODIFY_CODE_ATTRIBUTES { my ($class,$code,@attrs) = @_; $class->mk_classdata('__attr_cache' => {}) @@ -48,34 +46,6 @@ sub _attr_cache { 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 }; -} - - 1; =head1 NAME @@ -111,9 +81,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 +94,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 +117,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"; } @@ -260,8 +229,12 @@ blblack: Brandon L. Black bluefeet: Aran Deltac +boghead: Bryan Beeley + bricas: Brian Cassidy +brunov: Bruno Vecchi + caelum: Rafael Kitover castaway: Jess Robinson @@ -274,6 +247,8 @@ da5id: David Jack Olrik debolaz: Anders Nor Berle +dew: Dan Thomas + dkubb: Dan Kubb dnm: Justin Wheeler @@ -284,6 +259,8 @@ dyfrgi: Michael Leuchtenburg frew: Arthur Axel "fREW" Schmidt +goraxe: Gordon Irving + gphat: Cory G Watson groditi: Guillermo Roditi @@ -298,6 +275,8 @@ jgoulah: John Goulah jguenther: Justin Guenther +jhannah: Jay Hannah + jnapiorkowski: John Napiorkowski jon: Jon Schutz @@ -326,6 +305,8 @@ norbi: Norbert Buchmuller Numa: Dan Sully +ovid: Curtis "Ovid" Poe + oyse: Øystein Torget paulm: Paul Makepeace @@ -348,12 +329,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 @@ -372,6 +355,8 @@ Todd Lipcon Tom Hukins +triode: Pete Gamache + typester: Daisuke Murase victori: Victor Igumnov