X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsearch%2Fdistinct.t;h=4a80267696c25069b109072d7fb13e478f738d43;hb=a5a7bb733a940db710b7408508374833683a2e79;hp=106054118e967425d9598c0278786e8de53cd443;hpb=a0034ff6946ef2782a34d5c1f333eb448833e46f;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/search/distinct.t b/t/search/distinct.t
index 1060541..4a80267 100644
--- a/t/search/distinct.t
+++ b/t/search/distinct.t
@@ -4,28 +4,111 @@ use warnings;
 use Test::More;
 
 use lib qw(t/lib);
-use DBIC::SqlMakerTest;
-use DBICTest;
+use DBICTest ':DiffSQL';
 
 my $schema = DBICTest->init_schema();
 
 # make sure order + distinct do not double-inject group criteria
-my $year_rs = $schema->resultset ('CD')->search ({}, {
+my $rs = $schema->resultset ('CD')->search ({}, {
   distinct => 1,
-  columns => [qw/year/],
-  order_by => 'year',
+  columns => 'title',
 });
 
+# title + cdid == unique constraint
+my $unique_rs = $rs->search ({}, {
+  '+columns' => 'cdid',
+});
+
+is_same_sql_bind (
+  $rs->search({}, { order_by => 'title' })->as_query,
+  '(
+    SELECT me.title
+      FROM cd me
+    GROUP BY me.title
+    ORDER BY title
+  )',
+  [],
+  'Correct GROUP BY on selection+order_by on same column',
+);
+
+is_same_sql_bind (
+  $rs->search({}, { order_by => 'year' })->as_query,
+  '(
+    SELECT me.title
+      FROM cd me
+    GROUP BY me.title
+    ORDER BY MIN(year)
+  )',
+  [],
+  'Correct GROUP BY on non-unique selection and order by a different column',
+);
+
 is_same_sql_bind (
-  $year_rs->as_query,
+  $unique_rs->search({}, { order_by => 'year' })->as_query,
   '(
-    SELECT me.year
+    SELECT me.title, me.cdid
       FROM cd me
-    GROUP BY me.year
+    GROUP BY me.title, me.cdid, me.year
     ORDER BY year
   )',
   [],
-  'Correct GROUP BY',
+  'Correct GROUP BY on unique selection and order by a different column',
+);
+
+is_same_sql_bind (
+  $rs->search({}, { order_by => 'artist.name', join => 'artist'  })->as_query,
+  '(
+    SELECT me.title
+      FROM cd me
+      JOIN artist artist
+        ON artist.artistid = me.artist
+    GROUP BY me.title
+    ORDER BY MIN(artist.name)
+  )',
+  [],
+  'Correct GROUP BY on non-unique selection and external single order_by',
+);
+
+is_same_sql_bind (
+  $unique_rs->search({}, { order_by => 'artist.name', join => 'artist'  })->as_query,
+  '(
+    SELECT me.title, me.cdid
+      FROM cd me
+      JOIN artist artist
+        ON artist.artistid = me.artist
+    GROUP BY me.title, me.cdid, artist.name
+    ORDER BY artist.name
+  )',
+  [],
+  'Correct GROUP BY on unique selection and external single order_by',
+);
+
+is_same_sql_bind (
+  $rs->search({}, { order_by => 'tracks.title', join => 'tracks'  })->as_query,
+  '(
+    SELECT me.title
+      FROM cd me
+      LEFT JOIN track tracks
+        ON tracks.cd = me.cdid
+    GROUP BY me.title
+    ORDER BY MIN(tracks.title)
+  )',
+  [],
+  'Correct GROUP BY on non-unique selection and external multi order_by',
+);
+
+is_same_sql_bind (
+  $unique_rs->search({}, { order_by => 'tracks.title', join => 'tracks'  })->as_query,
+  '(
+    SELECT me.title, me.cdid
+      FROM cd me
+      LEFT JOIN track tracks
+        ON tracks.cd = me.cdid
+    GROUP BY me.title, me.cdid
+    ORDER BY MIN(tracks.title)
+  )',
+  [],
+  'Correct GROUP BY on unique selection and external multi order_by',
 );
 
 done_testing;