X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=3e2002a8cf9e99fbd57059952eec49cb8970b9f1;hb=4e8ffded232d4e6db6ea08a92ae10ca86adb1fa3;hp=a2c7ce2774d39ff60c28c34239c040f3a3f9d058;hpb=3c44586e85a78d10f4eaf0ec4adf2ef9b404164b;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index a2c7ce2..3e2002a 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -6,7 +6,7 @@ use warnings; use MRO::Compat; use vars qw($VERSION); -use base qw/DBIx::Class::Componentised Class::Accessor::Grouped/; +use base qw/Class::C3::Componentised Class::Accessor::Grouped/; use DBIx::Class::StartupCheck; sub mk_classdata { @@ -24,15 +24,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.08113'; $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,34 +43,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 @@ -148,7 +115,7 @@ 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) { print $artist->name, "\n"; @@ -374,6 +341,8 @@ Todd Lipcon Tom Hukins +triode: Pete Gamache + typester: Daisuke Murase victori: Victor Igumnov