X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FPK%2FAuto.pm;h=e2f717f677b64612bec4422c136ad7c8e90af18e;hb=d88ecca6486a2b1c4b6e2f0440165b186aab39bc;hp=94a65f83e6332676c636373120ab4e0c47d2f422;hpb=8294874d21acf4dfc75765a0359ffd2d0f9c016b;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/PK/Auto.pm b/lib/DBIx/Class/PK/Auto.pm
index 94a65f8..e2f717f 100644
--- a/lib/DBIx/Class/PK/Auto.pm
+++ b/lib/DBIx/Class/PK/Auto.pm
@@ -1,72 +1,55 @@
 package DBIx::Class::PK::Auto;
 
-use base qw/DBIx::Class::PK/;
+#use base qw/DBIx::Class::PK/;
+use base qw/DBIx::Class/;
 use strict;
 use warnings;
 
-=head1 NAME 
+=head1 NAME
 
-DBIx::Class::PK::Auto - Automatic Primary Key class
+DBIx::Class::PK::Auto - Automatic primary key class
 
 =head1 SYNOPSIS
 
+use base 'DBIx::Class::Core';
+__PACKAGE__->set_primary_key('id');
+
 =head1 DESCRIPTION
 
-This class overrides the insert method to get automatically
-incremented primary keys.
+This class overrides the insert method to get automatically incremented primary
+keys.
 
-You don't want to be using this directly - instead load the appropriate
-one for your database, e.g. PK::Auto::SQLite
+PK::Auto is now part of Core.
 
-=head1 METHODS
+See L<DBIx::Class::Manual::Component> for details of component interactions.
 
-=over 4
+=head1 LOGIC
 
-=item insert
+C<PK::Auto> does this by letting the database assign the primary key field and
+fetching the assigned value afterwards.
 
-Overrides insert so that it will get the value of autoincremented
-primary keys.
+=head1 METHODS
 
-=cut
+=head2 insert
 
-sub insert {
-  my ($self, @rest) = @_;
-  my $ret = $self->next::method(@rest);
-
-  # if all primaries are already populated, skip auto-inc
-  my $populated = 0;
-  map { $populated++ if $self->has_column($_) } $self->primary_columns;
-  return $ret if ( $populated == scalar $self->primary_columns );
-
-  my ($pri, $too_many) =
-    (grep { $self->column_info($_)->{'auto_increment'} }
-       $self->primary_columns)
-    || $self->primary_columns;
-  $self->throw( "More than one possible key found for auto-inc on ".ref $self )
-    if $too_many;
-  unless (defined $self->get_column($pri)) {
-    $self->throw( "Can't auto-inc for $pri on ".ref $self.": no _last_insert_id method" )
-      unless $self->can('last_insert_id');
-    my $id = $self->last_insert_id;
-    $self->throw( "Can't get last insert id" ) unless $id;
-    $self->store_column($pri => $id);
-  }
-  return $ret;
-}
+The code that was handled here is now in Row for efficiency.
 
-=item sequence
+=head2 sequence
 
 Manually define the correct sequence for your table, to avoid the overhead
 associated with looking up the sequence automatically.
 
 =cut
 
-__PACKAGE__->mk_classdata('sequence');
+sub sequence {
+    my ($self,$seq) = @_;
+    foreach my $pri ($self->primary_columns) {
+        $self->column_info($pri)->{sequence} = $seq;
+    }
+}
 
 1;
 
-=back
-
 =head1 AUTHORS
 
 Matt S. Trout <mst@shadowcatsystems.co.uk>
@@ -76,4 +59,3 @@ Matt S. Trout <mst@shadowcatsystems.co.uk>
 You may distribute this code under the same terms as Perl itself.
 
 =cut
-