Move order outside of the GenSubQ subquery, to appease retarded Sybase

diff --git a/lib/DBIx/Class/SQLAHacks.pm b/lib/DBIx/Class/SQLAHacks.pm
index faa3a48..32cc47f 100644 (file)
--- a/lib/DBIx/Class/SQLAHacks.pm
+++ b/lib/DBIx/Class/SQLAHacks.pm
@@ -466,7 +466,8 @@ sub _GenericSubQ {
   my $cmp_op = $direction eq 'desc' ? '>' : '<';
   my $count_tbl_alias = 'rownum__emulation';
 
-  my $order_group_having = $self->_parse_rs_attrs($rs_attrs);
+  my $order_sql = $self->_order_by (delete $rs_attrs->{order_by});
+  my $group_having_sql = $self->_parse_rs_attrs($rs_attrs);
 
   # add the order supplement (if any) as this is what will be used for the outer WHERE
   $in_sel .= ", $_" for keys %{$extra_order_sel||{}};
@@ -474,9 +475,10 @@ sub _GenericSubQ {
   $sql = sprintf (<<EOS,
 SELECT $out_sel
   FROM (
-    SELECT $in_sel ${sql}${order_group_having}
+    SELECT $in_sel ${sql}${group_having_sql}
   ) %s
 WHERE ( SELECT COUNT(*) FROM %s %s WHERE %s $cmp_op %s ) %s
+$order_sql
 EOS
     ( map { $self->_quote ($_) } (
       $rs_attrs->{alias},

diff --git a/t/sqlahacks/limit_dialects/generic_subq.t b/t/sqlahacks/limit_dialects/generic_subq.t
index 7f924d1..8bd47b7 100644 (file)
--- a/t/sqlahacks/limit_dialects/generic_subq.t
+++ b/t/sqlahacks/limit_dialects/generic_subq.t
@@ -28,7 +28,6 @@ is_same_sql_bind(
           FROM books me
           JOIN owners owner ON owner.id = me.owner
         WHERE ( source = ? )
-        ORDER BY me.title
       ) me
     WHERE
       (
@@ -36,6 +35,7 @@ is_same_sql_bind(
           FROM books rownum__emulation
         WHERE rownum__emulation.title < me.title
       ) < 2
+    ORDER BY me.title
   )',
   [  [ 'source', 'Library' ] ],
 );
@@ -69,7 +69,6 @@ is_same_sql_bind(
           FROM "books" "me"
           JOIN "owners" "owner" ON "owner"."id" = "me"."owner"
         WHERE ( "source" = ? )
-        ORDER BY "title" DESC
       ) "me"
     WHERE
       (
@@ -77,6 +76,7 @@ is_same_sql_bind(
           FROM "books" "rownum__emulation"
         WHERE "rownum__emulation"."title" > "me"."title"
       ) BETWEEN 1 AND 3
+    ORDER BY "title" DESC
   )',
   [ [ 'source', 'Library' ] ],
 );
@@ -104,7 +104,6 @@ is_same_sql_bind(
           FROM "books" "me"
           JOIN "owners" "owner" ON "owner"."id" = "me"."owner"
         WHERE ( "source" = ? )
-        ORDER BY "title"
       ) "me"
     WHERE
       (
@@ -112,6 +111,7 @@ is_same_sql_bind(
           FROM "books" "rownum__emulation"
         WHERE "rownum__emulation"."title" < "me"."title"
       ) BETWEEN 1 AND 4294967295
+    ORDER BY "title"
   )',
   [ [ 'source', 'Library' ] ],
 );