X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSetColumn.pm;h=49adce9c581177fa84fad2352c031898fa7702fd;hb=8273e845426f0187b4ad6c4a1b42286fa09a648f;hp=08795856dcd449949e67f6d83bb897bf299d92ce;hpb=bac358c9d99a75db2d2bab8f11102ed557f523b7;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/ResultSetColumn.pm b/lib/DBIx/Class/ResultSetColumn.pm index 0879585..49adce9 100644 --- a/lib/DBIx/Class/ResultSetColumn.pm +++ b/lib/DBIx/Class/ResultSetColumn.pm @@ -4,8 +4,7 @@ use strict; use warnings; use base 'DBIx::Class'; - -use Carp::Clan qw/^DBIx::Class/; +use DBIx::Class::Carp; use DBIx::Class::Exception; # not importing first() as it will clash with our own method @@ -62,14 +61,14 @@ sub new { # 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 + my %collist = map { $_ => 1, ($_ =~ /\./) ? () : ( "$alias.$_" => 1 ) } ($rs->result_source->columns, $column) ; if ( scalar grep { ! $collist{$_->[0]} } - ( $rs->result_source->schema->storage->_extract_order_criteria ($orig_attrs->{order_by} ) ) + ( $rs->result_source->schema->storage->_extract_order_criteria ($orig_attrs->{order_by} ) ) ) { # nuke the prefetch before collapsing to sql my $subq_rs = $rs->search; @@ -150,7 +149,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 @@ -442,7 +441,7 @@ sub func_rs { See L for details. -=cut +=cut sub throw_exception { my $self=shift;