Revision history for DBIx::Class
+ - Fix regression on not properly throwing when $obj->relationship
+ is unresolvable
+
0.08120 2010-02-24 08:58:00 (UTC)
- Make sure possibly overwritten deployment_statements methods in
schemas get called on $schema->deploy
my $source = $self->result_source;
# condition resolution may fail if an incomplete master-object prefetch
- # is encountered
- my $cond =
- eval { $source->_resolve_condition( $rel_info->{cond}, $rel, $self ) }
- ||
- $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION
- ;
+ # is encountered - that is ok during prefetch construction (not yet in_storage)
+ my $cond = eval { $source->_resolve_condition( $rel_info->{cond}, $rel, $self ) };
+ if (my $err = $@) {
+ if ($self->in_storage) {
+ $self->throw_exception ($err);
+ }
+ else {
+ $cond = $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION;
+ }
+ }
if ($cond eq $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION) {
my $reverse = $source->reverse_relationship_info($rel);
$rs->throw_exception('column must be supplied') unless $column;
my $orig_attrs = $rs->_resolved_attrs;
+ my $alias = $rs->current_source_alias;
# 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
# 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);
+ my %collist = map
+ { $_ => 1, ($_ =~ /\./) ? () : ( "$alias.$_" => 1 ) }
+ ($rs->result_source->columns, $column)
+ ;
if (
scalar grep
{ ! $collist{$_} }
( $rs->result_source->schema->storage->_parse_order_by ($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,
- }]
- });
+ $new_parent_rs = $subq_rs->as_subselect_rs;
}
$new_parent_rs ||= $rs->search_rs;
# {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} && keys %{$orig_attrs->{collapse}}) {
+ if (!$orig_attrs->{group_by} && keys %{$orig_attrs->{collapse}}) {
# scan for a constraint that would contain our column only - that'd be proof
# enough it is unique
--- /dev/null
+use strict;
+use warnings;
+
+use Test::More;
+use Test::Exception;
+
+use lib qw(t/lib);
+use DBICTest;
+
+my $schema = DBICTest->init_schema();
+
+my $cd = $schema->resultset('CD')->search ({}, { columns => ['year'], rows => 1 })->single;
+
+
+throws_ok (
+ sub { $cd->tracks },
+ qr/Unable to resolve relationship .+ column .+ not loaded from storage/,
+ 'Correct exception on nonresolvable object-based condition'
+);
+
+done_testing;