Unify the MSSQL and DB2 RNO implementations - they are the same

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / MSSQL.pm

diff --git a/lib/DBIx/Class/Storage/DBI/MSSQL.pm b/lib/DBIx/Class/Storage/DBI/MSSQL.pm
index 4add28c..28b87f2 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/MSSQL.pm
+++ b/lib/DBIx/Class/Storage/DBI/MSSQL.pm
@@ -185,20 +185,30 @@ sub last_insert_id { shift->_identity }
 sub _select_args_to_query {
   my $self = shift;
 
+  # _select_args does some shady action at a distance
+  # see DBI.pm for more info
   my $sql_maker = $self->sql_maker;
-  my ($op, $bind, $ident, $bind_attrs, $select, $cond, $order) = $self->_select_args(@_);
+  my ($op, $bind, $ident, $bind_attrs, $select, $cond, $order, $rows, $offset);
+  {
+    local $sql_maker->{_dbic_rs_attrs};
+    ($op, $bind, $ident, $bind_attrs, $select, $cond, $order, $rows, $offset) = $self->_select_args(@_);
+  }
 
-  if (not scalar $sql_maker->_order_by_chunks ($order->{order_by}) ) {
-    # no ordering, just short circuit
+  if (
+    ($rows || $offset)
+      ||
+    not scalar $sql_maker->_order_by_chunks ($order->{order_by})
+  ) {
+    # either limited RS or no ordering, just short circuit
     return $self->next::method (@_);
   }
 
-  my ($sql, $bind, @rest) = $self->next::method (@_);
+  my ($sql, $prep_bind, @rest) = $self->next::method (@_);
   $sql =~ s/^ \s* SELECT \s/SELECT TOP 100 PERCENT /xi;
 
   return wantarray
-    ? ($sql, $bind, @rest)
-    : \[ "($sql)", @$bind ]
+    ? ($sql, $prep_bind, @rest)
+    : \[ "($sql)", @$prep_bind ]
   ;
 }