X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSet.pm;h=4343a4f4ed027939dc86312e04fb0c1e51aba8f5;hb=8ea691c3672ff983feff498248e885ba59ea16a6;hp=3805812baac33d94ec9666d69807727f5e265179;hpb=336feb8ef85d16d22ae0b131b0c7a85abc9e9435;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 3805812..4343a4f 100644
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -1138,7 +1138,9 @@ in the original source class will not run.
 sub result_class {
   my ($self, $result_class) = @_;
   if ($result_class) {
-    $self->ensure_class_loaded($result_class);
+    unless (ref $result_class) { # don't fire this for an object
+      $self->ensure_class_loaded($result_class);
+    }
     $self->_result_class($result_class);
     $self->{attrs}{result_class} = $result_class if ref $self;
   }
@@ -1289,11 +1291,6 @@ sub _count_subq_rs {
     $sub_attrs->{select} = @pcols ? \@pcols : [ 1 ];
   }
 
-
-  # this is so that the query can be simplified e.g.
-  # * ordering can be thrown away in things like Top limit
-  $sub_attrs->{-for_count_only} = 1;
-
   return $rsrc->resultset_class
                ->new ($rsrc, $sub_attrs)
                 ->as_subselect_rs
@@ -1429,7 +1426,7 @@ sub _rs_update_delete {
   my $cond = $rsrc->schema->storage->_strip_cond_qualifiers ($self->{cond});
 
   my $needs_group_by_subq = $self->_has_resolved_attr (qw/collapse group_by -join/);
-  my $needs_subq = $needs_group_by_subq || (not defined $cond) || $self->_has_resolved_attr(qw/row offset/);
+  my $needs_subq = $needs_group_by_subq || (not defined $cond) || $self->_has_resolved_attr(qw/rows offset/);
 
   if ($needs_group_by_subq or $needs_subq) {
 
@@ -2684,15 +2681,22 @@ sub as_subselect_rs {
 
   my $attrs = $self->_resolved_attrs;
 
-  return $self->result_source->resultset->search( undef, {
+  my $fresh_rs = (ref $self)->new (
+    $self->result_source
+  );
+
+  # these pieces will be locked in the subquery
+  delete $fresh_rs->{cond};
+  delete @{$fresh_rs->{attrs}}{qw/where bind/};
+
+  return $fresh_rs->search( {}, {
     from => [{
       $attrs->{alias} => $self->as_query,
       -alias         => $attrs->{alias},
       -source_handle => $self->result_source->handle,
     }],
-    map { $_ => $attrs->{$_} } qw/select as alias/
-
-   });
+    alias => $attrs->{alias},
+  });
 }
 
 # This code is called by search_related, and makes sure there