Patch + test for more informative exceptions on load_namespace a non-rs class

[dbsrgits/DBIx-Class-Historic.git] / lib / DBIx / Class / SQLAHacks.pm

diff --git a/lib/DBIx/Class/SQLAHacks.pm b/lib/DBIx/Class/SQLAHacks.pm
index f9a5675..2aca425 100644 (file)
--- a/lib/DBIx/Class/SQLAHacks.pm
+++ b/lib/DBIx/Class/SQLAHacks.pm
@@ -5,7 +5,6 @@ use base qw/SQL::Abstract::Limit/;
 use strict;
 use warnings;
 use Carp::Clan qw/^DBIx::Class/;
-use Scalar::Util();
 
 sub new {
   my $self = shift->SUPER::new(@_);
@@ -99,11 +98,16 @@ sub _Top {
   croak '$order supplied to SQLAHacks limit emulators must be a hash'
     if (ref $order ne 'HASH');
 
+  $order = { %$order }; #copy
+
   my $last = $rows + $offset;
 
   my $req_order = $self->_order_by ($order->{order_by});
   my $limit_order = $req_order ? $order->{order_by} : $order->{_virtual_order_by};
 
+  delete $order->{$_} for qw/order_by _virtual_order_by/;
+  my $grpby_having = $self->_order_by ($order);
+
   my ( $order_by_inner, $order_by_outer ) = $self->_order_directions($limit_order);
 
   $sql =~ s/^\s*(SELECT|select)//;
@@ -113,7 +117,7 @@ sub _Top {
   (
     SELECT TOP $rows * FROM
     (
-        SELECT TOP $last $sql $order_by_inner
+        SELECT TOP $last $sql $grpby_having $order_by_inner
     ) AS foo
     $order_by_outer
   ) AS bar