From: Rafael Kitover <rkitover@cpan.org>
Date: Mon, 12 Mar 2012 16:45:45 +0000 (-0400)
Subject: make Ordered support skimming (eg. TOP) limits
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=37beb70f841027368caa2121c08106148cdee78c;p=dbsrgits%2FDBIx-Class-Historic.git

make Ordered support skimming (eg. TOP) limits

Skimming limits like TOP now require a unique key in the order_by clause
for stability, but Ordered only uses the position column in its order_by
clauses, while Result classes using Ordered generally have a compound
unique constraint on the grouping column and position column.

Append the grouping column to the end of the Ordered order_by clauses so
that it uses the full unique constraint and satisfy the skimming limit
stability requirements. This is harmless as the rows will still be
ordered on the position column.
---

diff --git a/lib/DBIx/Class/Ordered.pm b/lib/DBIx/Class/Ordered.pm
index 05da117..58dbc8e 100644
--- a/lib/DBIx/Class/Ordered.pm
+++ b/lib/DBIx/Class/Ordered.pm
@@ -152,7 +152,9 @@ a resultset with no ordering applied use L</_siblings>
 =cut
 sub siblings {
     my $self = shift;
-    return $self->_siblings->search ({}, { order_by => $self->position_column } );
+    return $self->_siblings->search ({}, {
+      order_by => [ $self->position_column, $self->grouping_column ],
+    });
 }
 
 =head2 previous_siblings
@@ -205,10 +207,15 @@ if the current object is the first one.
 sub previous_sibling {
     my $self = shift;
     my $position_column = $self->position_column;
+    my $grouping_column = $self->grouping_column;
 
     my $psib = $self->previous_siblings->search(
         {},
-        { rows => 1, order_by => { '-desc' => $position_column } },
+        { rows => 1, order_by => [
+          { '-desc' => $position_column },
+          $grouping_column,
+        ],
+        },
     )->single;
 
     return defined $psib ? $psib : 0;
@@ -226,10 +233,15 @@ is this sibling.
 sub first_sibling {
     my $self = shift;
     my $position_column = $self->position_column;
+    my $grouping_column = $self->grouping_column;
 
     my $fsib = $self->previous_siblings->search(
         {},
-        { rows => 1, order_by => { '-asc' => $position_column } },
+        { rows => 1, order_by => [
+          { '-asc' => $position_column },
+          $grouping_column,
+        ],
+        },
     )->single;
 
     return defined $fsib ? $fsib : 0;
@@ -247,9 +259,14 @@ if the current object is the last one.
 sub next_sibling {
     my $self = shift;
     my $position_column = $self->position_column;
+    my $grouping_column = $self->grouping_column;
     my $nsib = $self->next_siblings->search(
         {},
-        { rows => 1, order_by => { '-asc' => $position_column } },
+        { rows => 1, order_by => [
+          { '-asc' => $position_column },
+          $grouping_column,
+        ],
+        },
     )->single;
 
     return defined $nsib ? $nsib : 0;
@@ -267,9 +284,14 @@ sibling.
 sub last_sibling {
     my $self = shift;
     my $position_column = $self->position_column;
+    my $grouping_column = $self->grouping_column;
     my $lsib = $self->next_siblings->search(
         {},
-        { rows => 1, order_by => { '-desc' => $position_column } },
+        { rows => 1, order_by => [
+          { '-desc' => $position_column },
+          $grouping_column,
+        ],
+        },
     )->single;
 
     return defined $lsib ? $lsib : 0;
@@ -279,10 +301,14 @@ sub last_sibling {
 sub _last_sibling_posval {
     my $self = shift;
     my $position_column = $self->position_column;
+    my $grouping_column = $self->grouping_column;
 
     my $cursor = $self->next_siblings->search(
         {},
-        { rows => 1, order_by => { '-desc' => $position_column }, select => $position_column },
+        { rows => 1, order_by => [
+          { '-desc' => $position_column },
+          $grouping_column
+        ], select => $position_column },
     )->cursor;
 
     my ($pos) = $cursor->next;