remove_columns now deletes columns from _columns fixing has_columns false positives

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / PK / Auto.pm

diff --git a/lib/DBIx/Class/PK/Auto.pm b/lib/DBIx/Class/PK/Auto.pm
index 24f8810..41c14a6 100644 (file)
--- a/lib/DBIx/Class/PK/Auto.pm
+++ b/lib/DBIx/Class/PK/Auto.pm
@@ -5,7 +5,7 @@ use base qw/DBIx::Class/;
 use strict;
 use warnings;
 
-=head1 NAME 
+=head1 NAME
 
 DBIx::Class::PK::Auto - Automatic primary key class
 
@@ -21,7 +21,8 @@ keys.
 
   __PACKAGE__->load_components(qw/PK::Auto Core/);
 
-Note that C<PK::Auto> is specified as the leftmost argument.
+Note that C<PK::Auto> is specified as the left of the Core component.
+See L<DBIx::Class::Manual::Component> for details of component interactions.
 
 =head1 LOGIC
 
@@ -41,13 +42,15 @@ sub insert {
   my ($self, @rest) = @_;
   my $ret = $self->next::method(@rest);
 
-  my ($pri, $too_many) = grep { !defined $self->get_column($_) } $self->primary_columns;
+  my ($pri, $too_many) = grep { !defined $self->get_column($_) || 
+                                    ref($self->get_column($_)) eq 'SCALAR'} $self->primary_columns;
   return $ret unless defined $pri; # if all primaries are already populated, skip auto-inc
   $self->throw_exception( "More than one possible key found for auto-inc on ".ref $self )
     if defined $too_many;
 
   my $storage = $self->result_source->storage;
-  $self->throw_exception( "Missing primary key but Storage doesn't support last_insert_id" ) unless $storage->can('last_insert_id');
+  $self->throw_exception( "Missing primary key but Storage doesn't support last_insert_id" )
+    unless $storage->can('last_insert_id');
   my $id = $storage->last_insert_id($self->result_source,$pri);
   $self->throw_exception( "Can't get last insert id" ) unless $id;
   $self->store_column($pri => $id);