X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FPg.pm;h=6636201f42377a0b713dabd713471c850bf891ff;hb=d88ecca6486a2b1c4b6e2f0440165b186aab39bc;hp=10a82f5b926963d7d4a6133dd11319b80adcbe96;hpb=7c0176a11f99fc644e129ef2016debc59672700b;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Pg.pm b/lib/DBIx/Class/Storage/DBI/Pg.pm index 10a82f5..6636201 100644 --- a/lib/DBIx/Class/Storage/DBI/Pg.pm +++ b/lib/DBIx/Class/Storage/DBI/Pg.pm @@ -19,90 +19,120 @@ sub with_deferred_fk_checks { $sub->(); } -sub _dbh_last_insert_id { - my ($self, $dbh, $seq) = @_; - $dbh->last_insert_id(undef, undef, undef, undef, {sequence => $seq}); -} - sub last_insert_id { - my ($self,$source,$col) = @_; - my $seq = ($source->column_info($col)->{sequence} ||= $self->get_autoinc_seq($source,$col)); - $self->throw_exception("could not fetch primary key for " . $source->name . ", could not " - . "get autoinc sequence for $col (check that table and column specifications are correct " - . "and in the correct case)") unless defined $seq; - $self->dbh_do('_dbh_last_insert_id', $seq); -} + my ($self,$source,@cols) = @_; -sub _get_pg_search_path { - my ($self,$dbh) = @_; - # cache the search path as ['schema','schema',...] in the storage - # obj - $self->{_pg_search_path} ||= do { - my @search_path; - my ($sp_string) = $dbh->selectrow_array('SHOW search_path'); - while( $sp_string =~ s/("[^"]+"|[^,]+),?// ) { - unless( defined $1 and length $1 ) { - $self->throw_exception("search path sanity check failed: '$1'") - } - push @search_path, $1; - } - \@search_path - }; -} + my @values; -sub _dbh_get_autoinc_seq { - my ($self, $dbh, $schema, $table, @pri) = @_; - - # get the list of postgres schemas to search. if we have a schema - # specified, use that. otherwise, use the search path - my @search_path; - if( defined $schema and length $schema ) { - @search_path = ( $schema ); - } else { - @search_path = @{ $self->_get_pg_search_path($dbh) }; - } + for my $col (@cols) { + my $seq = ( $source->column_info($col)->{sequence} ||= $self->dbh_do('_dbh_get_autoinc_seq', $source, $col) ) + or $self->throw_exception( sprintf( + 'could not determine sequence for column %s.%s, please consider adding a schema-qualified sequence to its column info', + $source->name, + $col, + )); - foreach my $search_schema (@search_path) { - foreach my $col (@pri) { - my $info = $dbh->column_info(undef,$search_schema,$table,$col)->fetchrow_hashref; - if($info) { - # if we get here, we have definitely found the right - # column. - if( defined $info->{COLUMN_DEF} and - $info->{COLUMN_DEF} - =~ /^nextval\(+'([^']+)'::(?:text|regclass)\)/i - ) { - my $seq = $1; - return $seq =~ /\./ ? $seq : $info->{TABLE_SCHEM} . "." . $seq; - } else { - # we have found the column, but cannot figure out - # the nextval seq - return; - } - } - } + push @values, $self->_dbh_last_insert_id ($self->_dbh, $seq); } - return; + + return @values; +} + +# there seems to be absolutely no reason to have this as a separate method, +# but leaving intact in case someone is already overriding it +sub _dbh_last_insert_id { + my ($self, $dbh, $seq) = @_; + $dbh->last_insert_id(undef, undef, undef, undef, {sequence => $seq}); } -sub get_autoinc_seq { - my ($self,$source,$col) = @_; - my @pri = $source->primary_columns; +sub _dbh_get_autoinc_seq { + my ($self, $dbh, $source, $col) = @_; my $schema; my $table = $source->name; - if (ref $table eq 'SCALAR') { - $table = $$table; + # deref table name if it needs it + $table = $$table + if ref $table eq 'SCALAR'; + + # parse out schema name if present + if( $table =~ /^(.+)\.(.+)$/ ) { + ( $schema, $table ) = ( $1, $2 ); } - elsif ($table =~ /^(.+)\.(.+)$/) { - ($schema, $table) = ($1, $2); + + # get the column default using a Postgres-specific pg_catalog query + my $seq_expr = $self->_dbh_get_column_default( $dbh, $schema, $table, $col ); + + # if no default value is set on the column, or if we can't parse the + # default value as a sequence, throw. + unless ( defined $seq_expr and $seq_expr =~ /^nextval\(+'([^']+)'::(?:text|regclass)\)/i ) { + $seq_expr = '' unless defined $seq_expr; + $schema = "$schema." if defined $schema && length $schema; + $self->throw_exception( sprintf ( + 'no sequence found for %s%s.%s, check the RDBMS table definition or explicitly set the '. + "'sequence' for this column in %s", + $schema ? "$schema." : '', + $table, + $col, + $source->source_name, + )); } - $self->dbh_do('_dbh_get_autoinc_seq', $schema, $table, @pri); + return $1; +} + +# custom method for fetching column default, since column_info has a +# bug with older versions of DBD::Pg +sub _dbh_get_column_default { + my ( $self, $dbh, $schema, $table, $col ) = @_; + + # Build and execute a query into the pg_catalog to find the Pg + # expression for the default value for this column in this table. + # If the table name is schema-qualified, query using that specific + # schema name. + + # Otherwise, find the table in the standard Postgres way, using the + # search path. This is done with the pg_catalog.pg_table_is_visible + # function, which returns true if a given table is 'visible', + # meaning the first table of that name to be found in the search + # path. + + # I *think* we can be assured that this query will always find the + # correct column according to standard Postgres semantics. + # + # -- rbuels + + my $sqlmaker = $self->sql_maker; + local $sqlmaker->{bindtype} = 'normal'; + + my ($where, @bind) = $sqlmaker->where ({ + 'a.attnum' => {'>', 0}, + 'c.relname' => $table, + 'a.attname' => $col, + -not_bool => 'a.attisdropped', + (defined $schema && length $schema) + ? ( 'n.nspname' => $schema ) + : ( -bool => \'pg_catalog.pg_table_is_visible(c.oid)' ) + }); + + my ($seq_expr) = $dbh->selectrow_array(<load_components(qw/PK::Auto Core/); + # In your result (table) classes + use base 'DBIx::Class::Core'; __PACKAGE__->set_primary_key('id'); __PACKAGE__->sequence('mysequence'); @@ -168,13 +200,17 @@ This class implements autoincrements for PostgreSQL. =head1 POSTGRESQL SCHEMA SUPPORT -This supports multiple PostgreSQL schemas, with one caveat: for -performance reasons, the schema search path is queried the first time it is -needed and CACHED for subsequent uses. +This driver supports multiple PostgreSQL schemas, with one caveat: for +performance reasons, data about the search path, sequence names, and +so forth is queried as needed and CACHED for subsequent uses. -For this reason, you should do any necessary manipulation of the -PostgreSQL search path BEFORE instantiating your schema object, or as -part of the on_connect_do option to connect(), for example: +For this reason, once your schema is instantiated, you should not +change the PostgreSQL schema search path for that schema's database +connection. If you do, Bad Things may happen. + +You should do any necessary manipulation of the search path BEFORE +instantiating your schema object, or as part of the on_connect_do +option to connect(), for example: my $schema = My::Schema->connect ( $dsn,$user,$pass, @@ -183,13 +219,9 @@ part of the on_connect_do option to connect(), for example: }, ); -=head1 CONTRIBUTORS - -Robert Buels - -=head1 AUTHOR +=head1 AUTHORS -Marcus Ramberg +See L =head1 LICENSE