use base 'DBIx::Class';
use DBIx::Class::Carp;
-use DBIx::Class::_Util 'fail_on_internal_wantarray';
+use DBIx::Class::_Util 'fail_on_internal_call';
use namespace::clean;
-# not importing first() as it will clash with our own method
-use List::Util ();
-
=head1 NAME
DBIx::Class::ResultSetColumn - helpful methods for messing
# (to create a new column definition on-the-fly).
my $as_list = $orig_attrs->{as} || [];
my $select_list = $orig_attrs->{select} || [];
- my $as_index = List::Util::first { ($as_list->[$_] || "") eq $column } 0..$#$as_list;
+ my ($as_index) = grep { ($as_list->[$_] || "") eq $column } 0..$#$as_list;
my $select = defined $as_index ? $select_list->[$as_index] : $column;
my $colmap;
}
}
- # collapse the selector to a literal so that it survives a possible distinct parse
- # if it turns out to be an aggregate - at least the user will get a proper exception
- # instead of silent drop of the group_by altogether
- my $new = bless {
- _select => \ $rsrc->storage->sql_maker->_recurse_fields($select),
+ return bless {
+ _select => $select,
_as => $column,
- _parent_resultset => $new_parent_rs }, $class;
- return $new;
+ _parent_resultset => $new_parent_rs
+ }, $class;
}
=head2 as_query
=cut
sub next {
- my $self = shift;
+ #my $self = shift;
# using cursor so we don't inflate anything
- my ($row) = $self->_resultset->cursor->next;
-
- return $row;
+ ($_[0]->_resultset->cursor->next)[0];
}
=head2 all
=cut
sub all {
- my $self = shift;
+ #my $self = shift;
# using cursor so we don't inflate anything
- return map { $_->[0] } $self->_resultset->cursor->all;
+ map { $_->[0] } $_[0]->_resultset->cursor->all;
}
=head2 reset
=cut
sub reset {
- my $self = shift;
- $self->_resultset->cursor->reset;
- return $self;
+ #my $self = shift;
+
+ $_[0]->_resultset->reset;
+ $_[0];
}
=head2 first
=cut
-sub first {
- my $self = shift;
+sub first :DBIC_method_is_indirect_sugar {
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
# using cursor so we don't inflate anything
- $self->_resultset->cursor->reset;
- my ($row) = $self->_resultset->cursor->next;
-
- return $row;
+ my $cursor = $_[0]->_resultset->cursor;
+ $cursor->reset;
+ ($cursor->next)[0];
}
=head2 single
=cut
sub single {
- my $self = shift;
+ #my $self = shift;
- my $attrs = $self->_resultset->_resolved_attrs;
- my ($row) = $self->_resultset->result_source->storage->select_single(
- $attrs->{from}, $attrs->{select}, $attrs->{where}, $attrs
- );
+ my $rs = $_[0]->_resultset;
- return $row;
+ my $attrs = $rs->_resolved_attrs;
+ ($rs->result_source->schema->storage->select_single(
+ $attrs->{from}, $attrs->{select}, $attrs->{where}, $attrs
+ ))[0];
}
=head2 min
=cut
-sub min {
- return shift->func('MIN');
+sub min :DBIC_method_is_indirect_sugar {
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
+ $_[0]->func('MIN');
}
=head2 min_rs
=cut
-sub min_rs { return shift->func_rs('MIN') }
+sub min_rs :DBIC_method_is_indirect_sugar {
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
+ $_[0]->func_rs('MIN')
+}
=head2 max
=cut
-sub max {
- return shift->func('MAX');
+sub max :DBIC_method_is_indirect_sugar {
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
+ $_[0]->func('MAX');
}
=head2 max_rs
=cut
-sub max_rs { return shift->func_rs('MAX') }
+sub max_rs :DBIC_method_is_indirect_sugar {
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
+ $_[0]->func_rs('MAX')
+}
=head2 sum
=cut
-sub sum {
- return shift->func('SUM');
+sub sum :DBIC_method_is_indirect_sugar {
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
+ $_[0]->func('SUM');
}
=head2 sum_rs
=cut
-sub sum_rs { return shift->func_rs('SUM') }
+sub sum_rs :DBIC_method_is_indirect_sugar {
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
+ $_[0]->func_rs('SUM')
+}
=head2 func
=cut
-sub func {
- my ($self,$function) = @_;
- my $cursor = $self->func_rs($function)->cursor;
+sub func :DBIC_method_is_indirect_sugar{
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
- if( wantarray ) {
- DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_WANTARRAY and my $sog = fail_on_internal_wantarray($self);
- return map { $_->[ 0 ] } $cursor->all;
- }
+ #my ($self,$function) = @_;
+ my $cursor = $_[0]->func_rs($_[1])->cursor;
- return ( $cursor->next )[ 0 ];
+ wantarray
+ ? map { $_->[ 0 ] } $cursor->all
+ : ( $cursor->next )[ 0 ]
+ ;
}
=head2 func_rs
$rs = $rs->as_subselect_rs;
}
- $rs->search( undef, {
+ # FIXME - remove at some point in the future (2018-ish)
+ wantarray
+ and
+ carp_unique(
+ 'Starting with DBIC@0.082900 func_rs() always returns a ResultSet '
+ . 'instance regardless of calling context. Please force scalar() context to '
+ . 'silence this warning'
+ );
+
+ $rs->search_rs( undef, {
columns => { $self->{_as} => { $function => $select } }
} );
}
sub _resultset {
my $self = shift;
- return $self->{_resultset} ||= $self->{_parent_resultset}->search(undef,
- {
- select => [$self->{_select}],
- as => [$self->{_as}]
+ return $self->{_resultset} ||= do {
+
+ my $select = $self->{_select};
+
+ if ($self->{_parent_resultset}{attrs}{distinct}) {
+ my $alias = $self->{_parent_resultset}->current_source_alias;
+ my $rsrc = $self->{_parent_resultset}->result_source;
+ my %cols = map { $_ => 1, "$alias.$_" => 1 } $rsrc->columns;
+
+ unless( $cols{$select} ) {
+ carp_unique(
+ 'Use of distinct => 1 while selecting anything other than a column '
+ . 'declared on the primary ResultSource is deprecated (you selected '
+ . "'$self->{_as}') - please supply an explicit group_by instead"
+ );
+
+ # collapse the selector to a literal so that it survives the distinct parse
+ # if it turns out to be an aggregate - at least the user will get a proper exception
+ # instead of silent drop of the group_by altogether
+ $select = \[ $rsrc->schema->storage->sql_maker->_recurse_fields($select) ];
+ }
}
- );
-}
-1;
+ $self->{_parent_resultset}->search_rs(undef, {
+ columns => { $self->{_as} => $select }
+ });
+ };
+}
-=head1 AUTHOR AND CONTRIBUTORS
+=head1 FURTHER QUESTIONS?
-See L<AUTHOR|DBIx::Class/AUTHOR> and L<CONTRIBUTORS|DBIx::Class/CONTRIBUTORS> in DBIx::Class
+Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.
-=head1 LICENSE
+=head1 COPYRIGHT AND LICENSE
-You may distribute this code under the same terms as Perl itself.
+This module is free software L<copyright|DBIx::Class/COPYRIGHT AND LICENSE>
+by the L<DBIx::Class (DBIC) authors|DBIx::Class/AUTHORS>. You can
+redistribute it and/or modify it under the same terms as the
+L<DBIx::Class library|DBIx::Class/COPYRIGHT AND LICENSE>.
=cut
+
+1;
+