X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsqlmaker%2Flimit_dialects%2Frownum.t;h=2f46599e4dcf0c2e9445cac6162fa048255bb788;hb=5f11e54f1dc812354b8d160d5b286502cc227cbf;hp=d9bc1a49f9d2fc821a717b85e3e34904d6c04e9e;hpb=f74d22e2933e0ffed5955df8f35b47a4b096d6ef;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/sqlmaker/limit_dialects/rownum.t b/t/sqlmaker/limit_dialects/rownum.t
index d9bc1a4..2f46599 100644
--- a/t/sqlmaker/limit_dialects/rownum.t
+++ b/t/sqlmaker/limit_dialects/rownum.t
@@ -8,63 +8,173 @@ use DBICTest;
 use DBIC::SqlMakerTest;
 use DBIx::Class::SQLMaker::LimitDialects;
 
-my ($TOTAL, $OFFSET) = (
+my ($TOTAL, $OFFSET, $ROWS) = (
    DBIx::Class::SQLMaker::LimitDialects->__total_bindtype,
    DBIx::Class::SQLMaker::LimitDialects->__offset_bindtype,
+   DBIx::Class::SQLMaker::LimitDialects->__rows_bindtype,
 );
 
 my $s = DBICTest->init_schema (no_deploy => 1, );
 $s->storage->sql_maker->limit_dialect ('RowNum');
 
-my $rs = $s->resultset ('CD');
+my $rs = $s->resultset ('CD')->search({ id => 1 });
 
-is_same_sql_bind (
-  $rs->search ({}, { rows => 1, offset => 3,columns => [
-      { id => 'foo.id' },
-      { 'bar.id' => 'bar.id' },
-      { bleh => \ 'TO_CHAR (foo.womble, "blah")' },
-    ]})->as_query,
-  '(
-    SELECT id, bar__id, bleh
+my $where_bind = [ { dbic_colname => 'id' }, 1 ];
+
+for my $test_set (
+  {
+    name => 'Rownum subsel aliasing works correctly',
+    rs => $rs->search_rs(undef, {
+      rows => 1,
+      offset => 3,
+      columns => [
+        { id => 'foo.id' },
+        { 'bar.id' => 'bar.id' },
+        { bleh => \'TO_CHAR (foo.womble, "blah")' },
+      ]
+    }),
+    sql => '(
+      SELECT id, bar__id, bleh
       FROM (
         SELECT id, bar__id, bleh, ROWNUM rownum__index
-          FROM (
-            SELECT foo.id AS id, bar.id AS bar__id, TO_CHAR(foo.womble, "blah") AS bleh
-              FROM cd me
-          ) me
+        FROM (
+          SELECT foo.id AS id, bar.id AS bar__id, TO_CHAR (foo.womble, "blah") AS bleh
+            FROM cd me
+          WHERE id = ?
+        ) me
+      ) me WHERE rownum__index BETWEEN ? AND ?
+    )',
+    binds => [
+      $where_bind,
+      [ $OFFSET => 4 ],
+      [ $TOTAL => 4 ],
+    ],
+  }, {
+    name => 'Rownum subsel aliasing works correctly with unique order_by',
+    rs => $rs->search_rs(undef, {
+      rows => 1,
+      offset => 3,
+      columns => [
+        { id => 'foo.id' },
+        { 'bar.id' => 'bar.id' },
+        { bleh => \'TO_CHAR (foo.womble, "blah")' },
+      ],
+      order_by => [qw( artist title )],
+    }),
+    sql => '(
+      SELECT id, bar__id, bleh
+      FROM (
+        SELECT id, bar__id, bleh, ROWNUM rownum__index
+        FROM (
+          SELECT foo.id AS id, bar.id AS bar__id, TO_CHAR(foo.womble, "blah") AS bleh
+            FROM cd me
+          WHERE id = ?
+          ORDER BY artist, title
+        ) me
         WHERE ROWNUM <= ?
       ) me
-    WHERE rownum__index >= ?
-  )',
-  [
-    [ $TOTAL => 4 ],
-    [ $OFFSET => 4 ],
-  ],
-  'Rownum subsel aliasing works correctly'
-);
-
-is_same_sql_bind (
-  $rs->search ({}, { rows => 2, offset => 3,columns => [
-      { id => 'foo.id' },
-      { 'ends_with_me.id' => 'ends_with_me.id' },
-    ]})->as_query,
-  '(SELECT id, ends_with_me__id
+      WHERE rownum__index >= ?
+    )',
+    binds => [
+      $where_bind,
+      [ $TOTAL => 4 ],
+      [ $OFFSET => 4 ],
+    ],
+  },
+ {
+    name => 'Rownum subsel aliasing works correctly with non-unique order_by',
+    rs => $rs->search_rs(undef, {
+      rows => 1,
+      offset => 3,
+      columns => [
+        { id => 'foo.id' },
+        { 'bar.id' => 'bar.id' },
+        { bleh => \'TO_CHAR (foo.womble, "blah")' },
+      ],
+      order_by => 'artist',
+    }),
+    sql => '(
+      SELECT id, bar__id, bleh
+      FROM (
+        SELECT id, bar__id, bleh, ROWNUM rownum__index
+        FROM (
+          SELECT foo.id AS id, bar.id AS bar__id, TO_CHAR(foo.womble, "blah") AS bleh
+            FROM cd me
+          WHERE id = ?
+          ORDER BY artist
+        ) me
+      ) me
+      WHERE rownum__index BETWEEN ? and ?
+    )',
+    binds => [
+      $where_bind,
+      [ $OFFSET => 4 ],
+      [ $TOTAL => 4 ],
+    ],
+  }, {
+    name => 'Rownum subsel aliasing #2 works correctly',
+    rs => $rs->search_rs(undef, {
+      rows => 2,
+      offset => 3,
+      columns => [
+        { id => 'foo.id' },
+        { 'ends_with_me.id' => 'ends_with_me.id' },
+      ]
+    }),
+    sql => '(
+      SELECT id, ends_with_me__id
       FROM (
         SELECT id, ends_with_me__id, ROWNUM rownum__index
-          FROM (
-            SELECT foo.id AS id, ends_with_me.id AS ends_with_me__id
-              FROM cd me
-          ) me
+        FROM (
+          SELECT foo.id AS id, ends_with_me.id AS ends_with_me__id
+            FROM cd me
+          WHERE id = ?
+        ) me
+      ) me WHERE rownum__index BETWEEN ? AND ?
+    )',
+    binds => [
+      $where_bind,
+      [ $OFFSET => 4 ],
+      [ $TOTAL => 5 ],
+    ],
+  }, {
+    name => 'Rownum subsel aliasing #2 works correctly with unique order_by',
+    rs => $rs->search_rs(undef, {
+      rows => 2,
+      offset => 3,
+      columns => [
+        { id => 'foo.id' },
+        { 'ends_with_me.id' => 'ends_with_me.id' },
+      ],
+      order_by => [qw( artist title )],
+    }),
+    sql => '(
+      SELECT id, ends_with_me__id
+      FROM (
+        SELECT id, ends_with_me__id, ROWNUM rownum__index
+        FROM (
+          SELECT foo.id AS id, ends_with_me.id AS ends_with_me__id
+            FROM cd me
+          WHERE id = ?
+          ORDER BY artist, title
+        ) me
         WHERE ROWNUM <= ?
       ) me
-    WHERE rownum__index >= ?
-  )',
-  [
-    [ $TOTAL => 5 ],
-    [ $OFFSET => 4 ],
-  ],
-  'Rownum subsel aliasing works correctly'
-);
+      WHERE rownum__index >= ?
+    )',
+    binds => [
+      $where_bind,
+      [ $TOTAL => 5 ],
+      [ $OFFSET => 4 ],
+    ],
+  }
+) {
+  is_same_sql_bind(
+    $test_set->{rs}->as_query,
+    $test_set->{sql},
+    $test_set->{binds},
+    $test_set->{name});
+}
 
 {
 my $subq = $s->resultset('Owners')->search({
@@ -94,15 +204,14 @@ is_same_sql_bind(
               JOIN owners owner ON owner.id = me.owner
             WHERE ( source = ? )
           ) me
-        WHERE ROWNUM <= ?
       ) me
-    WHERE rownum__index >= ?
+    WHERE rownum__index BETWEEN ? AND ?
   )',
   [
     [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }
       => 'Library' ],
-    [ $TOTAL => 5 ],
     [ $OFFSET => 4 ],
+    [ $TOTAL => 5 ],
   ],
 
   'pagination with subquery works'
@@ -134,20 +243,19 @@ my $rs_selectas_rel = $s->resultset('BooksInLibrary')->search( { -exists => $sub
 
 is_same_sql_bind(
   $rs_selectas_rel->as_query,
-  '(  SELECT id, owner FROM (
-     SELECT me.id, me.owner
-     FROM books me
-     WHERE ( ( (EXISTS (SELECT COUNT( * ) FROM owners owner WHERE ( books.owner = owner.id ))) AND source = ? ) )
-   ) me WHERE ROWNUM <= ?
- )',
+  '(
+    SELECT me.id, me.owner FROM (
+      SELECT me.id, me.owner  FROM books me WHERE ( ( (EXISTS (SELECT COUNT( * ) FROM owners owner WHERE ( books.owner = owner.id ))) AND source = ? ) )
+    ) me
+    WHERE ROWNUM <= ?
+  )',
   [
     [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' } => 'Library' ],
-    [ $TOTAL => 1 ],
+    [ $ROWS => 1 ],
   ],
   'Pagination with sub-query in WHERE works'
 );
 
 }
 
-
 done_testing;