Fixed count subquery from disabled test case

[dbsrgits/DBIx-Class.git] / t / 73oracle.t

diff --git a/t/73oracle.t b/t/73oracle.t
index 8c94592..d6e90e3 100644 (file)
--- a/t/73oracle.t
+++ b/t/73oracle.t
@@ -570,22 +570,21 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
       is_same_sql_bind (
         $rs->as_query,
         '( 
-            SELECT * FROM (
-                  SELECT A.*, ROWNUM r FROM (
+            SELECT artistid, name, rank, charfield, parentid FROM (
+                  SELECT artistid, name, rank, charfield, parentid, ROWNUM rownum__index FROM (
                       SELECT 
-                          me.artistid AS col1,
-                          me.name AS col2,
-                          me.rank AS col3,
-                          me.charfield AS col4,
-                          me.parentid AS col5 
+                          me.artistid,
+                          me.name,
+                          me.rank,
+                          me.charfield,
+                          me.parentid 
                       FROM artist me 
                       START WITH name = ? 
                       CONNECT BY parentid = PRIOR artistid
-                      ORDER BY name ASC
-                  ) A
-                  WHERE ROWNUM < 3
-              ) B
-              WHERE r >= 1 
+                      ORDER BY name ASC 
+                  ) me 
+            ) me
+            WHERE rownum__index BETWEEN 1 AND 2
         )',
         [ [ name => 'root' ] ],
       );
@@ -606,18 +605,17 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
       #   $rs->count_rs->as_query,
       #   '( 
       #       SELECT COUNT( * ) FROM (
-      #           SELECT * FROM (
-      #               SELECT A.*, ROWNUM r FROM (
+      #           SELECT artistid FROM (
+      #               SELECT artistid, ROWNUM rownum__index FROM (
       #                   SELECT 
-      #                       me.artistid AS col1 
+      #                       me.artistid
       #                   FROM artist me 
       #                   START WITH name = ? 
       #                   CONNECT BY artistid = PRIOR parentid 
-      #               ) A
-      #               WHERE ROWNUM < 3
-      #           ) B
-      #           WHERE r >= 1
-      #       ) count_subq 
+      #               ) me
+      #           ) me 
+      #           WHERE rownum__index BETWEEN 1 AND 2
+      #       ) me
       #   )',
       #   [ [ name => 'greatgrandchild' ] ],
       # );
@@ -642,7 +640,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
     # select the whole cycle tree with nocylce
     {
       my $rs = $schema->resultset('Artist')->search({}, {
-        nocycle    => 1,
+        connect_by_nocycle    => 1,
         start_with => { name => 'cycle-root' },
         '+select'  => [ \ 'CONNECT_BY_ISCYCLE' ],
         connect_by => { parentid => { -prior => \ 'artistid' } },