PK::Auto doc patch from dwc

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

diff --git a/lib/DBIx/Class/PK/Auto/Pg.pm b/lib/DBIx/Class/PK/Auto/Pg.pm
index 3452cae..611a6e1 100644 (file)
--- a/lib/DBIx/Class/PK/Auto/Pg.pm
+++ b/lib/DBIx/Class/PK/Auto/Pg.pm
@@ -8,39 +8,52 @@ use base qw/DBIx::Class/;
 __PACKAGE__->load_components(qw/PK::Auto/);
 
 sub last_insert_id {
-  my $self=shift;
+  my $self = shift;
   $self->get_autoinc_seq unless $self->{_autoinc_seq};
   $self->storage->dbh->last_insert_id(undef,undef,undef,undef,
     {sequence=>$self->{_autoinc_seq}});
 }
 
 sub get_autoinc_seq {
-  my $self=shift;
-  my $dbh= $self->storage->dbh;
-    my $sth    = $dbh->column_info( undef, undef, $self->_table_name, '%');
-    while (my $foo = $sth->fetchrow_arrayref){
-      if(defined $foo->[12] && $foo->[12] =~ /^nextval/) {
-        ($self->{_autoinc_seq}) = $foo->[12] =~ 
-         m!^nextval\('"?([^"']+)"?'::text\)!;
-      }
-    }
+  my $self = shift;
+  
+  # return the user-defined sequence if known
+  if ($self->sequence) {
+    return $self->{_autoinc_seq} = $self->sequence;
+  }
+  
+  my @pri = keys %{ $self->_primaries };
+  my $dbh = $self->storage->dbh;
+  while (my $col = shift @pri) {
+    my $info = $dbh->column_info(undef,undef,$self->table,$col)->fetchrow_arrayref;
+    if (defined $info->[12] and $info->[12] =~ 
+      /^nextval\('"?([^"']+)"?'::(?:text|regclass)\)/)
+    {
+      $self->{_autoinc_seq} = $1;
+      last;
+    } 
+  }
 }
 
 1;
 
 =head1 NAME 
 
-DBIx::Class::PK::Auto::SQLite - Automatic Primary Key class for SQLite
+DBIx::Class::PK::Auto::Pg - Automatic Primary Key class for Postgresql
 
 =head1 SYNOPSIS
 
+    # In your table classes
+    __PACKAGE__->load_components(qw/PK::Auto::Pg Core/);
+    __PACKAGE__->set_primary_key('id');
+
 =head1 DESCRIPTION
 
-This class implements autoincrements for SQLite.
+This class implements autoincrements for Postgresql.
 
 =head1 AUTHORS
 
-Matt S. Trout <perl-stuff@trout.me.uk>
+Marcus Ramberg <m.ramberg@cpan.org>
 
 =head1 LICENSE