switch distinct resolution to using dq code

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index c16b278..346b50e 100644 (file)
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -6,6 +6,7 @@ use base qw/DBIx::Class/;
 use DBIx::Class::Carp;
 use DBIx::Class::Exception;
 use DBIx::Class::ResultSetColumn;
+use Data::Query::Constants qw(DQ_JOIN DQ_IDENTIFIER DQ_ALIAS DQ_LITERAL);
 use Scalar::Util qw/blessed weaken/;
 use Try::Tiny;
 use Data::Compare (); # no imports!!! guard against insane architecture
@@ -260,6 +261,63 @@ sub _order_by_dq {
   return undef;
 }
 
+sub _distinct_group_by {
+  my ($self, $attrs) = @_;
+  my $conv = $self->_sqla_converter;
+  my $from_dq = $conv->_table_to_dq($attrs->{from});
+  my %source_map =
+    map +($_->name => $_),
+      map $self->result_source->schema->source($_),
+        $self->result_source->schema->sources;
+  my %col_map;
+  {
+    my @recurse = $from_dq;
+    while (my $next = shift @recurse) {
+      if ($next->{type} eq DQ_JOIN) {
+        push @recurse, @{$next->{join}};
+        next;
+      }
+      if ($next->{type} eq DQ_ALIAS) {
+        if ($next->{alias}{type} eq DQ_IDENTIFIER) {
+          my $name = join('.',@{$next->{alias}{elements}});
+          my @cols = $source_map{$name}->columns;
+          @col_map{@cols} = ($next->{as}) x @cols;
+        }
+      }
+    }
+  }
+  my $select_list = $conv->_select_field_list_to_dq($attrs->{select});
+  my (@group_by, %group_seen);
+  foreach my $entry (@$select_list) {
+    $entry = $entry->{alias} if $entry->{type} eq DQ_ALIAS;
+    if ($entry->{type} eq DQ_IDENTIFIER) {
+      push @group_by, \$entry;
+      $group_seen{join('.',@{$entry->{elements}})} = 1;
+      if (my @el = @{$entry->{elements}} == 1) {
+        if (my $alias = $col_map{$el[0]}) {
+          $group_seen{join('.',$col_map{$el[0]},$el[0])} = 1;
+        }
+      }
+    } elsif ($entry->{type} eq DQ_LITERAL) {
+      # assuming you knew what you were doing, please brace for impact
+      push @group_by, \$entry;
+    }
+  }
+  if ($attrs->{order_by}) {
+    my $order_dq = $conv->_order_by_to_dq($attrs->{order_by});
+    while ($order_dq) {
+      if ($order_dq->{by}{type} eq DQ_IDENTIFIER) {
+        my @el = @{$order_dq->{by}{elements}};
+        unshift @el, $col_map{$el[0]} if @el == 1 and $col_map{$el[0]};
+        push @group_by, \$order_dq->{by}
+          unless $group_seen{join('.',@el)};
+      }
+      $order_dq = $order_dq->{from};
+    }
+  }
+  \@group_by;
+}
+
 =head2 search
 
 =over 4
@@ -2330,6 +2388,7 @@ sub _merge_with_rscond {
 
   my $alias = $self->{attrs}{alias};
 
+  no warnings 'once'; # piss off
   if (! defined $self->{cond}) {
     # just massage $data below
   }
@@ -3413,11 +3472,7 @@ sub _resolved_attrs {
     else {
       # distinct affects only the main selection part, not what prefetch may
       # add below.
-      $attrs->{group_by} = $source->storage->_group_over_selection (
-        $attrs->{from},
-        $attrs->{select},
-        $attrs->{order_by},
-      );
+      $attrs->{group_by} = $self->_distinct_group_by($attrs);
     }
   }
 

diff --git a/lib/DBIx/Class/SQLMaker/Converter.pm b/lib/DBIx/Class/SQLMaker/Converter.pm
index f492971..46650af 100644 (file)
--- a/lib/DBIx/Class/SQLMaker/Converter.pm
+++ b/lib/DBIx/Class/SQLMaker/Converter.pm
@@ -47,7 +47,7 @@ around _select_field_to_dq => sub {
 
     my $field_dq = $self->_op_to_dq(
       apply => $self->_ident_to_dq(uc($func)),
-      $self->_select_field_list_to_dq($args),
+      @{$self->_select_field_list_to_dq($args)},
     );
 
     return $field_dq unless $as;
@@ -80,7 +80,7 @@ sub _group_by_to_dq {
   my ($self, $group, $from) = @_;
   +{
     type => DQ_GROUP,
-    by => [ $self->_select_field_list_to_dq($group) ],
+    by => $self->_select_field_list_to_dq($group),
     from => $from,
   };
 }