X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=3b715967adc33792bc620d879602c3ffaa373027;hb=0ac0af6c62637a5fdb06ecfb8ba4b60f93bf9d75;hp=88e3c3f579b751742f256cf22ae6f12e47ed4562;hpb=59f27fc338728ada2cc29e392412720ccea4fb3a;p=dbsrgits%2FDBIx-Class.git
diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index 88e3c3f..3b71596 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,14 +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.08124';
-$VERSION = '0.08111';
-
-$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 +42,13 @@ 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 };
+ return {
+ %$cache,
+ %{ $self->maybe::next::method || {} },
+ };
}
-
1;
=head1 NAME
@@ -86,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
- SVN: http://dev.catalyst.perl.org/repos/bast/DBIx-Class/
+=item * IRC: irc.perl.org#dbix-class
- SVNWeb: http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/
+=for html
+(click for instant chatroom login)
- IRC: irc.perl.org#dbix-class
+=item * Mailing list: L
+
+=item * RT Bug Tracker: L
+
+=item * gitweb: L
+
+=item * git: L
+
+=item * twitter 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";
}
@@ -242,14 +225,22 @@ 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
+arc: Aaron Crane
+
arcanez: Justin Hunter
ash: Ash Berlin
@@ -260,8 +251,12 @@ blblack: Brandon L. Black
bluefeet: Aran Deltac
+boghead: Bryan Beeley
+
bricas: Brian Cassidy
+brunov: Bruno Vecchi
+
caelum: Rafael Kitover
castaway: Jess Robinson
@@ -274,22 +269,34 @@ 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
+initself: Mike Baas
+
jasonmay: Jason May
jesper: Jesper Krogh
@@ -298,6 +305,8 @@ jgoulah: John Goulah
jguenther: Justin Guenther
+jhannah: Jay Hannah
+
jnapiorkowski: John Napiorkowski
jon: Jon Schutz
@@ -324,8 +333,12 @@ Nniuq: Ron "Quinn" Straight"
norbi: Norbert Buchmuller
+nuba: Nuba Princigalli
+
Numa: Dan Sully
+ovid: Curtis "Ovid" Poe
+
oyse: Øystein Torget
paulm: Paul Makepeace
@@ -340,20 +353,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
@@ -372,6 +393,10 @@ Todd Lipcon
Tom Hukins
+tonvoon: Ton Voon
+
+triode: Pete Gamache
+
typester: Daisuke Murase
victori: Victor Igumnov
@@ -382,11 +407,13 @@ willert: Sebastian Willert
wreis: Wallace Reis
+yrlnry: Mark Jason Dominus
+
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