From: Peter Rabbitson <ribasushi@cpan.org>
Date: Fri, 19 Feb 2010 09:08:26 +0000 (+0000)
Subject: Merge 'trunk' into 'pri_key_refactor'
X-Git-Tag: v0.08120~27^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2e4ec773b3ab085e8813c15df03d9b4c1f4bf3dc;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'pri_key_refactor'

r8720@Thesaurus (orig r8707):  ribasushi | 2010-02-15 10:28:22 +0100
Final POD touches
r8721@Thesaurus (orig r8708):  ribasushi | 2010-02-15 10:31:38 +0100
Spellcheck (jawnsy++)
r8722@Thesaurus (orig r8709):  ribasushi | 2010-02-15 10:32:24 +0100
One more
r8723@Thesaurus (orig r8710):  ribasushi | 2010-02-15 14:49:26 +0100
Release 0.08119
r8725@Thesaurus (orig r8712):  ribasushi | 2010-02-15 14:50:56 +0100
Bump trunl version
r8726@Thesaurus (orig r8713):  rafl | 2010-02-15 15:49:55 +0100
Make sure we actually run all tests, given we're using done_testing.
r8727@Thesaurus (orig r8714):  rafl | 2010-02-15 15:50:01 +0100
Make sure overriding deployment_statements is possible from within schemas.
r8728@Thesaurus (orig r8715):  rafl | 2010-02-15 15:56:06 +0100
Changelogging.
r8729@Thesaurus (orig r8716):  rafl | 2010-02-15 15:58:09 +0100
Make some cookbook code compile.
r8730@Thesaurus (orig r8717):  nuba | 2010-02-15 16:11:52 +0100
spelling fixes in the documaentation, sholud be gud now ;)
r8732@Thesaurus (orig r8719):  caelum | 2010-02-16 11:09:58 +0100
use OO interface of Hash::Merge for ::DBI::Replicated
r8734@Thesaurus (orig r8721):  ribasushi | 2010-02-16 11:41:06 +0100
Augment did-author-run-makefile check to include OptDeps
r8735@Thesaurus (orig r8722):  ribasushi | 2010-02-16 12:16:06 +0100
Reorg support section, add live-chat link
r8739@Thesaurus (orig r8726):  caelum | 2010-02-16 14:51:58 +0100
set behavior for Hash::Merge in ::DBI::Replicated, otherwise it uses the global setting
r8740@Thesaurus (orig r8727):  caelum | 2010-02-16 15:43:25 +0100
POD touchups
r8759@Thesaurus (orig r8746):  ribasushi | 2010-02-19 00:30:37 +0100
Fix bogus test
r8760@Thesaurus (orig r8747):  ribasushi | 2010-02-19 00:34:22 +0100
Retire useless abstraction (all rdbms need this anyway)
r8761@Thesaurus (orig r8748):  ribasushi | 2010-02-19 00:35:01 +0100
Fix count of group_by over aliased function
---

2e4ec773b3ab085e8813c15df03d9b4c1f4bf3dc
diff --cc lib/DBIx/Class/ResultSet.pm
index ef7055e,4e399a3..036cb38
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@@ -1261,10 -1261,10 +1261,10 @@@ sub _count_subq_rs 
    # if we multi-prefetch we group_by primary keys only as this is what we would
    # get out of the rs via ->next/->all. We *DO WANT* to clobber old group_by regardless
    if ( keys %{$attrs->{collapse}}  ) {
 -    $sub_attrs->{group_by} = [ map { "$attrs->{alias}.$_" } ($rsrc->primary_columns) ]
 +    $sub_attrs->{group_by} = [ map { "$attrs->{alias}.$_" } ($rsrc->_pri_cols) ]
    }
  
-   $sub_attrs->{select} = $rsrc->storage->_subq_count_select ($rsrc, $sub_attrs);
+   $sub_attrs->{select} = $rsrc->storage->_subq_count_select ($rsrc, $attrs);
  
    # this is so that the query can be simplified e.g.
    # * ordering can be thrown away in things like Top limit