X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=93a519431d6d62e198cef04710c006bdd380f08a;hb=9d885c4eed122f29c4b86cde0bba1d888e56bf6a;hp=e8c8b4a3496c66653b157aea791892826cf84eb1;hpb=ce699b20a16c0ff149d09b1988e2a3e0d45b1d89;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index e8c8b4a..93a5194 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -4,6 +4,7 @@ use strict; use warnings; use MRO::Compat; +use mro 'c3'; use vars qw($VERSION); use base qw/DBIx::Class::Componentised Class::Accessor::Grouped/; @@ -24,15 +25,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.08111'; +$VERSION = '0.08116'; $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 the corresponding author_require in Makefile.PL -my $minimum_sqlt_version = '0.11002'; - sub MODIFY_CODE_ATTRIBUTES { my ($class,$code,@attrs) = @_; $class->mk_classdata('__attr_cache' => {}) @@ -48,47 +44,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 }; -} - -# Pretty printer for debug messages -sub _pretty_print { - - require Data::Dumper; - local $Data::Dumper::Terse = 1; - local $Data::Dumper::Indent = 1; - local $Data::Dumper::Useqq = 1; - local $Data::Dumper::Quotekeys = 0; - local $Data::Dumper::Sortkeys = 1; - - return Data::Dumper::Dumper ($_[1]); -} - - 1; =head1 NAME @@ -124,9 +79,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'); @@ -138,9 +92,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'); @@ -161,9 +115,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"; } @@ -273,6 +227,8 @@ blblack: Brandon L. Black bluefeet: Aran Deltac +boghead: Bryan Beeley + bricas: Brian Cassidy brunov: Bruno Vecchi @@ -313,6 +269,8 @@ jgoulah: John Goulah jguenther: Justin Guenther +jhannah: Jay Hannah + jnapiorkowski: John Napiorkowski jon: Jon Schutz @@ -341,6 +299,8 @@ norbi: Norbert Buchmuller Numa: Dan Sully +ovid: Curtis "Ovid" Poe + oyse: Øystein Torget paulm: Paul Makepeace @@ -363,12 +323,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 @@ -387,6 +349,8 @@ Todd Lipcon Tom Hukins +triode: Pete Gamache + typester: Daisuke Murase victori: Victor Igumnov