0.3999_01 changes

diff --git a/META.yml b/META.yml
index 8521557..97e20a0 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -1,28 +1,32 @@
 ---
 name: DBIx-Class
-version: 0.03003
+version: 0.03999_01
 author:
   - Matt S. Trout <mst@shadowcatsystems.co.uk>
 abstract: Extensible and flexible object <-> relational mapper.
 license: perl
 requires:
+  Class::C3: 0.05
+  Class::Trigger: 0
   DBD::SQLite: 1.08
   DBI: 0
+  DBIx::ContextualFetch: 0
   Data::Page: 0
   Module::Find: 0
-  NEXT: 0
   SQL::Abstract: 1.2
   SQL::Abstract::Limit: 0.101
   Scalar::Util: 0
   Storable: 0
   Tie::IxHash: 0
   UNIVERSAL::require: 0
+recommends:
+  Data::UUID: 0
 provides:
   DBIC::SQL::Abstract:
     file: lib/DBIx/Class/Storage/DBI.pm
   DBIx::Class:
     file: lib/DBIx/Class.pm
-    version: 0.03003
+    version: 0.03999_01
   DBIx::Class::AccessorGroup:
     file: lib/DBIx/Class/AccessorGroup.pm
   DBIx::Class::CDBICompat:

diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index daaddc8..5720cb3 100644 (file)
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -6,7 +6,7 @@ use warnings;
 use vars qw($VERSION);
 use base qw/DBIx::Class::Componentised Class::Data::Inheritable/;
 
-$VERSION = '0.03004';
+$VERSION = '0.03999_01';
 
 
 1;

diff --git a/lib/DBIx/Class/Componentised.pm b/lib/DBIx/Class/Componentised.pm
index f83bd22..8ea297c 100644 (file)
--- a/lib/DBIx/Class/Componentised.pm
+++ b/lib/DBIx/Class/Componentised.pm
@@ -8,7 +8,9 @@ sub inject_base {
     no strict 'refs';
     unshift(@{"${target}::ISA"}, grep { $target ne $_ } @to_inject);
   }
-  eval "package $target; use Class::C3;";
+  my $table = { Class::C3::_dump_MRO_table };
+  eval "package $target; use Class::C3;" unless exists $table->{$target};
+  Class::C3::reinitialize() if defined $table->{$target};
 }
 
 sub load_components {

diff --git a/lib/DBIx/Class/PK/Auto.pm b/lib/DBIx/Class/PK/Auto.pm
index 94a65f8..73abb33 100644 (file)
--- a/lib/DBIx/Class/PK/Auto.pm
+++ b/lib/DBIx/Class/PK/Auto.pm
@@ -35,7 +35,7 @@ sub insert {
 
   # if all primaries are already populated, skip auto-inc
   my $populated = 0;
-  map { $populated++ if $self->has_column($_) } $self->primary_columns;
+  map { $populated++ if defined $self->get_column($_) } $self->primary_columns;
   return $ret if ( $populated == scalar $self->primary_columns );
 
   my ($pri, $too_many) =