use Try::Tiny;
use List::Util qw(first max);
-use B 'perlstring';
use DBIx::Class::ResultSource::RowParser::Util qw(
assemble_simple_parser
assemble_collapsing_parser
);
+use DBIx::Class::Carp;
+
use namespace::clean;
-# Accepts one or more relationships for the current source and returns an
-# array of column names for each of those relationships. Column names are
-# prefixed relative to the current source, in accordance with where they appear
-# in the supplied relationships.
-sub _resolve_prefetch {
- my ($self, $pre, $alias, $alias_map, $order, $pref_path) = @_;
+# Accepts a prefetch map (one or more relationships for the current source),
+# returns a set of select/as pairs for each of those relationships. Columns
+# are fully qualified inflation_slot names
+sub _resolve_selection_from_prefetch {
+ my ($self, $pre, $alias_map, $pref_path) = @_;
+
+ # internal recursion marker
$pref_path ||= [];
if (not defined $pre or not length $pre) {
return ();
}
elsif( ref $pre eq 'ARRAY' ) {
- return
- map { $self->_resolve_prefetch( $_, $alias, $alias_map, $order, [ @$pref_path ] ) }
- @$pre;
+ map { $self->_resolve_selection_from_prefetch( $_, $alias_map, [ @$pref_path ] ) }
+ @$pre;
}
elsif( ref $pre eq 'HASH' ) {
- my @ret =
map {
- $self->_resolve_prefetch($_, $alias, $alias_map, $order, [ @$pref_path ] ),
- $self->related_source($_)->_resolve_prefetch(
- $pre->{$_}, "${alias}.$_", $alias_map, $order, [ @$pref_path, $_] )
+ $self->_resolve_selection_from_prefetch($_, $alias_map, [ @$pref_path ] ),
+ $self->related_source($_)->_resolve_selection_from_prefetch(
+ $pre->{$_}, $alias_map, [ @$pref_path, $_] )
} keys %$pre;
- return @ret;
}
elsif( ref $pre ) {
$self->throw_exception(
}
else {
my $p = $alias_map;
- $p = $p->{$_} for (@$pref_path, $pre);
+ $p = $p->{$_} for @$pref_path, $pre;
$self->throw_exception (
"Unable to resolve prefetch '$pre' - join alias map does not contain an entry for path: "
. join (' -> ', @$pref_path, $pre)
) if (ref $p->{-join_aliases} ne 'ARRAY' or not @{$p->{-join_aliases}} );
- my $as = shift @{$p->{-join_aliases}};
-
- my $rel_info = $self->relationship_info( $pre );
- $self->throw_exception( $self->source_name . " has no such relationship '$pre'" )
- unless $rel_info;
+ # this shift() is critical - it is what allows prefetch => [ (foo) x 2 ] to work
+ my $src_alias = shift @{$p->{-join_aliases}};
+
+ # ordered [select => as] pairs
+ map { [
+ "${src_alias}.$_" => join ( '.',
+ @$pref_path,
+ $pre,
+ $_,
+ )
+ ] } $self->related_source($pre)->columns;
+ }
+}
- my $as_prefix = ($alias =~ /^.*?\.(.+)$/ ? $1.'.' : '');
+sub _resolve_prefetch {
+ carp_unique(
+ 'There is no good reason to call this internal deprecated method - '
+ . 'please open a ticket detailing your usage, so that a better plan can '
+ . 'be devised for your case. In either case _resolve_prefetch() is '
+ . 'deprecated in favor of _resolve_selection_from_prefetch(), which has '
+ . 'a greatly simplified arglist.'
+ );
- return map { [ "${as}.$_", "${as_prefix}${pre}.$_", ] }
- $self->related_source($pre)->columns;
- }
+ $_[0]->_resolve_selection_from_prefetch( $_[1], $_[3] );
}
+
# Takes an arrayref of {as} dbic column aliases and the collapse and select
# attributes from the same $rs (the selector requirement is a temporary
# workaround... I hope), and returns a coderef capable of:
# any sort of adjustment/rewrite should be relatively easy (fsvo relatively)
#
sub _mk_row_parser {
- # $args and $attrs are seperated to delineate what is core collapser stuff and
+ # $args and $attrs are separated to delineate what is core collapser stuff and
# what is dbic $rs specific
my ($self, $args, $attrs) = @_;
},
);
- my $src = $args->{collapse}
- ? assemble_collapsing_parser({
+ my $check_null_columns;
+
+ my $src = (! $args->{collapse} ) ? assemble_simple_parser(\%common) : do {
+ my $collapse_map = $self->_resolve_collapse ({
+ # FIXME
+ # only consider real columns (not functions) during collapse resolution
+ # this check shouldn't really be here, as fucktards are not supposed to
+ # alias random crap to existing column names anyway, but still - just in
+ # case
+ # FIXME !!!! - this does not yet deal with unbalanced selectors correctly
+ # (it is now trivial as the attrs specify where things go out of sync
+ # needs MOAR tests)
+ as => { map
+ { ref $attrs->{select}[$common{val_index}{$_}] ? () : ( $_ => $common{val_index}{$_} ) }
+ keys %{$common{val_index}}
+ },
+ premultiplied => $args->{premultiplied},
+ });
+
+ $check_null_columns = $collapse_map->{-identifying_columns}
+ if @{$collapse_map->{-identifying_columns}};
+
+ assemble_collapsing_parser({
%common,
- collapse_map => $self->_resolve_collapse ({
- # FIXME
- # only consider real columns (not functions) during collapse resolution
- # this check shouldn't really be here, as fucktards are not supposed to
- # alias random crap to existing column names anyway, but still - just in
- # case
- # FIXME !!!! - this does not yet deal with unbalanced selectors correctly
- # (it is now trivial as the attrs specify where things go out of sync
- # needs MOAR tests)
- as => { map
- { ref $attrs->{select}[$common{val_index}{$_}] ? () : ( $_ => $common{val_index}{$_} ) }
- keys %{$common{val_index}}
- },
- premultiplied => $args->{premultiplied},
- })
- })
- : assemble_simple_parser(
- \%common
- )
- ;
-
- return $args->{eval}
- ? ( eval "sub $src" || die $@ )
- : $src
- ;
+ collapse_map => $collapse_map,
+ });
+ };
+
+ utf8::upgrade($src)
+ if DBIx::Class::_ENV_::STRESSTEST_UTF8_UPGRADE_GENERATED_COLLAPSER_SOURCE;
+
+ return (
+ $args->{eval} ? ( eval "sub $src" || die $@ ) : $src,
+ $check_null_columns,
+ );
}
if $args->{_parent_info}{collapser_reusable};
}
- # Still dont know how to collapse - try to resolve based on our columns (plus already inserted FK bridges)
+ # Still don't know how to collapse - try to resolve based on our columns (plus already inserted FK bridges)
if (
! $collapse_map->{-identifying_columns}
and
# if we got here - we are good to go, but the construction is tricky
# since our children will want to include our collapse criteria - we
# don't give them anything (safe, since they are all collapsible on their own)
- # in addition we record the individual collapse posibilities
+ # in addition we record the individual collapse possibilities
# of all left children node collapsers, and merge them in the rowparser
# coderef later
$collapse_map->{-identifying_columns} = [];
projects / dbsrgits/DBIx-Class.git / blobdiff