Merge f4a09c8 into e63de95

frioux · Nov 3, 2014 · 748675c · 748675c
2 parents e63de95 + f4a09c8
commit 748675c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/lib/Web/Util/ExtPaging.pm b/lib/Web/Util/ExtPaging.pm
@@ -23,7 +23,9 @@ sub ext_paginate {
    }
 
    return ext_parcel(
-      [map $_->$method, $resultset->all],
+      $resultset->result_class->isa('DBIx::Class::ResultClass::HashRefInflator') ?
+         [$resultset->all] :
+         [map $_->$method, $resultset->all],
       $resultset->is_paged
          ? ($resultset->pager->total_entries)
          : (),

diff --git a/t/basic.t b/t/basic.t
@@ -71,6 +71,28 @@ my $rs = $schema->resultset('Stations')->search(undef, {
    }, 'ext_paginate with coderef correctly builds structure';
 }
 
+{
+   my $rs = $schema->resultset('Stations')->search(undef, {
+      columns => ['id'],
+      order_by => 'id',
+      rows => 3,
+      page => 1,
+      result_class => 'DBIx::Class::ResultClass::HashRefInflator',
+   });
+   my $data = ext_paginate($rs);
+
+   cmp_deeply $data, {
+       total => 9,
+       data=> set({
+          id => 1,
+       },{
+          id => 2,
+       },{
+          id => 3,
+       })
+   }, 'ext_paginate passes through HRI resultset';
+}
+
 {
    my $data = ext_parcel(
       [ map +{ id => $_->id }, $rs->all ],