X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FAmbiguousGlob.pm;h=2008c54bb9cc16b3b0bd5e28ea18cfe9479aecff;hb=4b5544ade32d37fee88e543a7d182a082f1b9c48;hp=a7ed94bc946cca70f12685040c5da585fc437d9b;hpb=618a0fe35811c50a6309d51b97765dede00b80e2;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/AmbiguousGlob.pm b/lib/DBIx/Class/Storage/DBI/AmbiguousGlob.pm index a7ed94b..2008c54 100644 --- a/lib/DBIx/Class/Storage/DBI/AmbiguousGlob.pm +++ b/lib/DBIx/Class/Storage/DBI/AmbiguousGlob.pm @@ -4,10 +4,11 @@ use strict; use warnings; use base 'DBIx::Class::Storage::DBI'; +use mro 'c3'; =head1 NAME -DBIx::Class::Storage::DBI::AmbiguousGlob - Storage component for RDBMS supporting multicolumn in clauses +DBIx::Class::Storage::DBI::AmbiguousGlob - Storage component for RDBMS choking on count(*) =head1 DESCRIPTION @@ -26,6 +27,9 @@ At this point the only overriden method is C<_subq_count_select()> sub _subq_count_select { my ($self, $source, $rs_attrs) = @_; + + return $rs_attrs->{group_by} if $rs_attrs->{group_by}; + my @pcols = map { join '.', $rs_attrs->{alias}, $_ } ($source->primary_columns); return @pcols ? \@pcols : [ 1 ]; }