[Bast-commits] r8019 - DBIx-Class/0.08/branches/mssql_rno_pagination/lib/DBIx/Class/SQLAHacks

[frew at dev.catalyst.perl.org]

Author: frew
Date: 2009-12-03 14:56:35 +0000 (Thu, 03 Dec 2009)
New Revision: 8019

Modified:
   DBIx-Class/0.08/branches/mssql_rno_pagination/lib/DBIx/Class/SQLAHacks/MSSQL.pm
Log:
fix RNO for MSSQL to not use a kludgy regexp

Modified: DBIx-Class/0.08/branches/mssql_rno_pagination/lib/DBIx/Class/SQLAHacks/MSSQL.pm
===================================================================
--- DBIx-Class/0.08/branches/mssql_rno_pagination/lib/DBIx/Class/SQLAHacks/MSSQL.pm	2009-12-03 13:39:37 UTC (rev 8018)
+++ DBIx-Class/0.08/branches/mssql_rno_pagination/lib/DBIx/Class/SQLAHacks/MSSQL.pm	2009-12-03 14:56:35 UTC (rev 8019)
@@ -5,12 +5,24 @@
 use Carp::Clan qw/^DBIx::Class|^SQL::Abstract/;
 
 sub _RowNumberOver {
-   my $self = shift;
-   my $sql  =  $self->SUPER::_RowNumberOver(@_);
-   $sql =~ s/(\s*)SELECT\s Q1\.\*,\s ROW_NUMBER\(\)\s OVER\(\s \)\s AS\s ROW_NUM\s
-             FROM\s \(\n(\s*.*)\n\s*(.*)\n\s*\)\s Q1
-             /$1SELECT Q1.*, ROW_NUMBER() OVER($3) AS ROW_NUM FROM (\n$2\n) Q1/ixm;
-   return $sql;
+  my ($self, $sql, $order, $rows, $offset ) = @_;
+
+  $offset += 1;
+  my $last = $rows + $offset - 1;
+  my ( $order_by ) = $self->_order_by( $order );
+
+  $sql = <<"SQL";
+SELECT * FROM
+(
+   SELECT Q1.*, ROW_NUMBER() OVER( $order_by ) AS ROW_NUM FROM (
+      $sql
+   ) Q1
+) Q2
+WHERE ROW_NUM BETWEEN $offset AND $last
+
+SQL
+
+  return $sql;
 }
 
 1;