minor changes

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / AmbiguousGlob.pm

diff --git a/lib/DBIx/Class/Storage/DBI/AmbiguousGlob.pm b/lib/DBIx/Class/Storage/DBI/AmbiguousGlob.pm
index c848fc1..37d1bd6 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/AmbiguousGlob.pm
+++ b/lib/DBIx/Class/Storage/DBI/AmbiguousGlob.pm
@@ -1,43 +1,44 @@
-package DBIx::Class::Storage::DBI::AmbiguousGlob;\r
-\r
-use strict;\r
-use warnings;\r
-\r
-use base 'DBIx::Class::Storage::DBI';\r
-\r
-=head1 NAME\r
-\r
-DBIx::Class::Storage::DBI::AmbiguousGlob - Storage component for RDBMS supporting multicolumn in clauses\r
-\r
-=head1 DESCRIPTION\r
-\r
-Some servers choke on things like:\r
-\r
-  COUNT(*) FROM (SELECT tab1.col, tab2.col FROM tab1 JOIN tab2 ... )\r
-\r
-claiming that col is a duplicate column (it loses the table specifiers by\r
-the time it gets to the *). Thus for any subquery count we select only the\r
-primary keys of the main table in the inner query. This hopefully still\r
-hits the indexes and keeps the server happy.\r
-\r
-At this point the only overriden method is C<_grouped_count_select()>\r
-\r
-=cut\r
-\r
-sub _grouped_count_select {\r
-  my ($self, $source, $rs_args) = @_;\r
-  my @pcols = map { join '.', $rs_args->{alias}, $_ } ($source->primary_columns);\r
-  return @pcols ? \@pcols : $rs_args->{group_by};\r
-}\r
-\r
-=head1 AUTHORS\r
-\r
-See L<DBIx::Class/CONTRIBUTORS>\r
-\r
-=head1 LICENSE\r
-\r
-You may distribute this code under the same terms as Perl itself.\r
-\r
-=cut\r
-\r
-1;\r
+package DBIx::Class::Storage::DBI::AmbiguousGlob;
+
+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
+
+=head1 DESCRIPTION
+
+Some servers choke on things like:
+
+  COUNT(*) FROM (SELECT tab1.col, tab2.col FROM tab1 JOIN tab2 ... )
+
+claiming that col is a duplicate column (it loses the table specifiers by
+the time it gets to the *). Thus for any subquery count we select only the
+primary keys of the main table in the inner query. This hopefully still
+hits the indexes and keeps the server happy.
+
+At this point the only overriden method is C<_subq_count_select()>
+
+=cut
+
+sub _subq_count_select {
+  my ($self, $source, $rs_attrs) = @_;
+  my @pcols = map { join '.', $rs_attrs->{alias}, $_ } ($source->primary_columns);
+  return @pcols ? \@pcols : [ 1 ];
+}
+
+=head1 AUTHORS
+
+See L<DBIx::Class/CONTRIBUTORS>
+
+=head1 LICENSE
+
+You may distribute this code under the same terms as Perl itself.
+
+=cut
+
+1;