X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSetColumn.pm;h=92abc07aa8d307bc68d254bfeff93808aa7c86b6;hb=f9080e4502d65c87e9c2486ca6a76b166cf1ca8f;hp=78ac9ba54fda2a0446065540042f40abc2e52e7f;hpb=22e40557eee805a1f3269981bc205a6afb159b1f;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/ResultSetColumn.pm b/lib/DBIx/Class/ResultSetColumn.pm index 78ac9ba..92abc07 100644 --- a/lib/DBIx/Class/ResultSetColumn.pm +++ b/lib/DBIx/Class/ResultSetColumn.pm @@ -4,10 +4,10 @@ use strict; use warnings; use base 'DBIx::Class'; +use DBIx::Class::Carp; -use Carp::Clan qw/^DBIx::Class/; -use DBIx::Class::Exception; -use List::Util; +# not importing first() as it will clash with our own method +use List::Util (); =head1 NAME @@ -44,7 +44,9 @@ sub new { $rs->throw_exception('column must be supplied') unless $column; - my $orig_attrs = $rs->_resolved_attrs_copy; + my $orig_attrs = $rs->_resolved_attrs; + my $alias = $rs->current_source_alias; + my $rsrc = $rs->result_source; # If $column can be found in the 'as' list of the parent resultset, use the # corresponding element of its 'select' list (to keep any custom column @@ -55,29 +57,29 @@ sub new { my $as_index = List::Util::first { ($as_list->[$_] || "") eq $column } 0..$#$as_list; my $select = defined $as_index ? $select_list->[$as_index] : $column; - my $new_parent_rs; + my ($new_parent_rs, $colmap); + for ($rsrc->columns, $column) { + if ($_ =~ /^ \Q$alias\E \. ([^\.]+) $ /x) { + $colmap->{$_} = $1; + } + elsif ($_ !~ /\./) { + $colmap->{"$alias.$_"} = $_; + $colmap->{$_} = $_; + } + } + # analyze the order_by, and see if it is done over a function/nonexistentcolumn # if this is the case we will need to wrap a subquery since the result of RSC # *must* be a single column select - my %collist = map { $_ => 1 } ($rs->result_source->columns, $column); if ( scalar grep - { ! $collist{$_} } - ( $rs->result_source->schema->storage->_parse_order_by ($orig_attrs->{order_by} ) ) + { ! exists $colmap->{$_->[0]} } + ( $rsrc->schema->storage->_extract_order_criteria ($orig_attrs->{order_by} ) ) ) { - my $alias = $rs->current_source_alias; # nuke the prefetch before collapsing to sql my $subq_rs = $rs->search; - $subq_rs->{attrs}{join} = $subq_rs->_merge_attr( $subq_rs->{attrs}{join}, delete $subq_rs->{attrs}{prefetch} ); - - $new_parent_rs = $rs->result_source->resultset->search ( {}, { - alias => $alias, - from => [{ - $alias => $subq_rs->as_query, - -alias => $alias, - -source_handle => $rs->result_source->handle, - }] - }); + $subq_rs->{attrs}{join} = $subq_rs->_merge_joinpref_attr( $subq_rs->{attrs}{join}, delete $subq_rs->{attrs}{prefetch} ); + $new_parent_rs = $subq_rs->as_subselect_rs; } $new_parent_rs ||= $rs->search_rs; @@ -87,30 +89,17 @@ sub new { # rs via the _resolved_attrs trick - we need to retain the separation between # +select/+as and select/as. At the same time we want to preserve any joins that the # prefetch would otherwise generate. - $new_attrs->{join} = $rs->_merge_attr( $new_attrs->{join}, delete $new_attrs->{prefetch} ); + $new_attrs->{join} = $rs->_merge_joinpref_attr( $new_attrs->{join}, delete $new_attrs->{prefetch} ); # {collapse} would mean a has_many join was injected, which in turn means # we need to group *IF WE CAN* (only if the column in question is unique) - if (!$new_attrs->{group_by} && $orig_attrs->{collapse}) { - - # scan for a constraint that would contain our column only - that'd be proof - # enough it is unique - my $constraints = { $rs->result_source->unique_constraints }; - for my $constraint_columns ( values %$constraints ) { - - next unless @$constraint_columns == 1; + if (!$orig_attrs->{group_by} && keys %{$orig_attrs->{collapse}}) { - my $col = $constraint_columns->[0]; - my $fqcol = join ('.', $new_attrs->{alias}, $col); - - if ($col eq $select or $fqcol eq $select) { - $new_attrs->{group_by} = [ $select ]; - delete $new_attrs->{distinct}; # it is ignored when group_by is present - last; - } + if ($colmap->{$select} and $rsrc->_identifying_column_set([$colmap->{$select}])) { + $new_attrs->{group_by} = [ $select ]; + delete $new_attrs->{distinct}; # it is ignored when group_by is present } - - if (!$new_attrs->{group_by}) { + else { carp ( "Attempting to retrieve non-unique column '$column' on a resultset containing " . 'one-to-many joins will return duplicate results.' @@ -128,7 +117,7 @@ sub new { =item Arguments: none -=item Return Value: \[ $sql, @bind ] +=item Return Value: \[ $sql, L<@bind_values|DBIx::Class::ResultSet/DBIC BIND VALUES> ] =back @@ -153,7 +142,7 @@ sub as_query { return shift->_resultset->as_query(@_) } Returns the next value of the column in the resultset (or C if there is none). -Much like L but just returning the +Much like L but just returning the one value. =cut @@ -181,7 +170,7 @@ Returns all values of the column in the resultset (or C if there are none). Much like L but returns values rather -than row objects. +than result objects. =cut @@ -296,7 +285,7 @@ sub min { =item Arguments: none -=item Return Value: $resultset +=item Return Value: L<$resultset|DBIx::Class::ResultSet> =back @@ -335,7 +324,7 @@ sub max { =item Arguments: none -=item Return Value: $resultset +=item Return Value: L<$resultset|DBIx::Class::ResultSet> =back @@ -374,7 +363,7 @@ sub sum { =item Arguments: none -=item Return Value: $resultset +=item Return Value: L<$resultset|DBIx::Class::ResultSet> =back @@ -423,7 +412,7 @@ sub func { =item Arguments: $function -=item Return Value: $resultset +=item Return Value: L<$resultset|DBIx::Class::ResultSet> =back @@ -445,10 +434,10 @@ sub func_rs { See L for details. -=cut +=cut sub throw_exception { - my $self=shift; + my $self = shift; if (ref $self && $self->{_parent_resultset}) { $self->{_parent_resultset}->throw_exception(@_); @@ -482,11 +471,9 @@ sub _resultset { 1; -=head1 AUTHORS - -Luke Saunders +=head1 AUTHOR AND CONTRIBUTORS -Jess Robinson +See L and L in DBIx::Class =head1 LICENSE