X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=e0b01538d55e51aa67049198b81c7341b237db6e;hb=43517a6060dea655760748851c33117f1d99e241;hp=530bac2c2ce14f935b665e955960d58862b5bcb9;hpb=763026c15bf2047020c261f430bd782bb5180850;p=dbsrgits%2FDBIx-Class.git
diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index 530bac2..e0b0153 100644
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -4,9 +4,12 @@ use strict;
use warnings;
use MRO::Compat;
+use mro 'c3';
+
+use DBIx::Class::Optional::Dependencies;
use vars qw($VERSION);
-use base qw/Class::C3::Componentised Class::Accessor::Grouped/;
+use base qw/DBIx::Class::Componentised Class::Accessor::Grouped/;
use DBIx::Class::StartupCheck;
sub mk_classdata {
@@ -24,9 +27,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.08112';
+$VERSION = '0.08123_01';
-$VERSION = eval $VERSION; # numify for warning-free dev releases
+$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
sub MODIFY_CODE_ATTRIBUTES {
my ($class,$code,@attrs) = @_;
@@ -39,21 +42,11 @@ 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 };
-}
-
-# 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]);
+ return {
+ %$cache,
+ %{ $self->maybe::next::method || {} },
+ };
}
1;
@@ -66,13 +59,24 @@ 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: irc.perl.org#dbix-class
+
+=for html
+(click for instant chatroom login)
+
+=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 * gitweb: L
- IRC: irc.perl.org#dbix-class
+=item * git: L
+
+=item * twitter L
+
+=back
=head1 SYNOPSIS
@@ -91,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');
@@ -105,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');
@@ -128,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";
}
@@ -222,10 +225,16 @@ is traditional :)
=head1 CONTRIBUTORS
-abraxxa: Alexander Hartmaier
+abraxxa: Alexander Hartmaier
aherzog: Adam Herzog
+Alexander Keusch
+
+amiri: Amiri Barksdale
+
+amoore: Andrew Moore
+
andyg: Andy Grundman
ank: Andres Kievsky
@@ -240,6 +249,8 @@ blblack: Brandon L. Black
bluefeet: Aran Deltac
+boghead: Bryan Beeley
+
bricas: Brian Cassidy
brunov: Bruno Vecchi
@@ -256,20 +267,30 @@ 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
+Haarg: Graham Knop
+
+hobbs: Andrew Rodland
+
ilmari: Dagfinn Ilmari MannsEker
jasonmay: Jason May
@@ -280,6 +301,8 @@ jgoulah: John Goulah
jguenther: Justin Guenther
+jhannah: Jay Hannah
+
jnapiorkowski: John Napiorkowski
jon: Jon Schutz
@@ -306,8 +329,12 @@ Nniuq: Ron "Quinn" Straight"
norbi: Norbert Buchmuller
+nuba: Nuba Princigalli
+
Numa: Dan Sully
+ovid: Curtis "Ovid" Poe
+
oyse: Øystein Torget
paulm: Paul Makepeace
@@ -322,20 +349,28 @@ phaylon: Robert Sedlacek
plu: Johannes Plunien
+Possum: Daniel LeWarne
+
quicksilver: Jules Bean
rafl: Florian Ragwitz
+rainboxx: Matthias Dietrich
+
+rbo: Robert Bohne
+
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
@@ -354,6 +389,10 @@ Todd Lipcon
Tom Hukins
+tonvoon: Ton Voon
+
+triode: Pete Gamache
+
typester: Daisuke Murase
victori: Victor Igumnov
@@ -368,7 +407,7 @@ zamolxes: Bogdan Lucaciu
=head1 COPYRIGHT
-Copyright (c) 2005 - 2009 the DBIx::Class L and L
+Copyright (c) 2005 - 2010 the DBIx::Class L and L
as listed above.
=head1 LICENSE