X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FPg.pm;h=8e024f02e74c1a81599f667e9cf84263caaeb691;hb=777f75276c79ae7d418ae1e75ab654aebb8e530a;hp=4dd6ea85f7864bb25a70b3b0d20f58544bf49c6a;hpb=fd159e2ae6b4ac59be0107572345dbf53a821fde;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Pg.pm b/lib/DBIx/Class/Storage/DBI/Pg.pm index 4dd6ea8..8e024f0 100644 --- a/lib/DBIx/Class/Storage/DBI/Pg.pm +++ b/lib/DBIx/Class/Storage/DBI/Pg.pm @@ -21,7 +21,7 @@ sub with_deferred_fk_checks { sub last_insert_id { my ($self,$source,$col) = @_; - my $seq = ($source->column_info($col)->{sequence} ||= $self->get_autoinc_seq($source,$col)) + my $seq = ( $source->column_info($col)->{sequence} ||= $self->dbh_do('_dbh_get_autoinc_seq', $source, $col) ) or $self->throw_exception( "could not determine sequence for " . $source->name . ".$col, please consider adding a " @@ -39,110 +39,93 @@ sub _dbh_last_insert_id { } -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 - }; -} - sub _dbh_get_autoinc_seq { - my ($self, $dbh, $schema, $table, $col) = @_; - - # 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) }; - } + my ($self, $dbh, $source, $col) = @_; - # find the sequence(s) of the column in question (should have nextval declared on it) - my @sequence_names; - foreach my $search_schema (@search_path) { - my $info = $dbh->column_info(undef,$search_schema,$table,$col)->fetchrow_hashref; - if($info && defined $info->{COLUMN_DEF} - && $info->{COLUMN_DEF} =~ /^nextval\(+'([^']+)'::(?:text|regclass)\)/i - ) { - push @sequence_names, $1; - } - } + my $schema; + my $table = $source->name; + + # deref table name if it needs it + $table = $$table + if ref $table eq 'SCALAR'; - if (@sequence_names != 1) { - $self->throw_exception (sprintf - q|Unable to reliably determine autoinc sequence name for '%s'.'%s' (possible candidates: %s)|, - $table, - $col, - join (', ', (@sequence_names ? @sequence_names : 'none found') ), - ); + # parse out schema name if present + if( $table =~ /^(.+)\.(.+)$/ ) { + ( $schema, $table ) = ( $1, $2 ); } - my $seq = $sequence_names[0]; - - if( $seq !~ /\./ ) { - my $sth = $dbh->prepare ( - 'SELECT * FROM "information_schema"."sequences" WHERE "sequence_name" = ?' - ); - $sth->execute ($seq); - - my @seen_in_schemas; - while (my $h = $sth->fetchrow_hashref) { - push @seen_in_schemas, $h->{sequence_schema}; - } - - if (not @seen_in_schemas) { - $self->throw_exception (sprintf - q|Automatically determined autoinc sequence name '%s' for '%s'.'%s' does not seem to exist...'|, - $seq, - $table, - $col, - ); - } - elsif (@seen_in_schemas > 1) { - $self->throw_exception (sprintf - q|Unable to reliably fully-qualify automatically determined autoinc sequence name '%s' for '%s'.'%s' (same name exist in schemas: %s)|, - $seq, - $table, - $col, - join (', ', (@seen_in_schemas)), - ); - } - else { - my $sql_maker = $self->sql_maker; - $seq = join ('.', map { $sql_maker->_quote ($_) } ($seen_in_schemas[0], $seq) ); - } + my $seq_expr = $DBD::Pg::VERSION > 2.015001 + # use DBD::Pg to fetch the column info if it is recent enough to work + ? eval{ $dbh->column_info(undef,$schema,$table,$col)->fetchrow_hashref->{COLUMN_DEF} } + # otherwise, use a custom SQL method + : $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( "no sequence found for $schema$table.$col, check table definition, " + . "or explicitly set the 'sequence' for this column in the " + . $source->source_name + . " class" + ); } - return $seq; + return $1; } -sub get_autoinc_seq { - my ($self,$source,$col) = @_; - - my $schema; - my $table = $source->name; - - if (ref $table eq 'SCALAR') { - $table = $$table; - } - elsif ($table =~ /^(.+)\.(.+)$/) { - ($schema, $table) = ($1, $2); - } - - $self->dbh_do('_dbh_get_autoinc_seq', $schema, $table, $col); +# 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(<connect ( $dsn,$user,$pass,