[Bast-commits] r9371 - in DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121: lib/DBIx/Class/SQLAHacks lib/DBIx/Class/Storage/DBI/Oracle t

[rbo at dev.catalyst.perl.org]

Author: rbo
Date: 2010-05-14 22:35:33 +0100 (Fri, 14 May 2010)
New Revision: 9371

Modified:
   DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/lib/DBIx/Class/SQLAHacks/Oracle.pm
   DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
   DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/t/73oracle.t
Log:
Rename option nocycle to connect_by_nocycle


Modified: DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/lib/DBIx/Class/SQLAHacks/Oracle.pm
===================================================================
--- DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/lib/DBIx/Class/SQLAHacks/Oracle.pm	2010-05-14 21:27:13 UTC (rev 9370)
+++ DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/lib/DBIx/Class/SQLAHacks/Oracle.pm	2010-05-14 21:35:33 UTC (rev 9371)
@@ -11,7 +11,6 @@
 #  TODO:
 #   - Review by experienced DBIC/SQL:A developers :-)
 #   - Problem with count and connect_by look the TODO in t/73oracle.t
-#   - Rename option nocycle to connect_by_nocycle
 # 
 
 sub new {
@@ -59,7 +58,7 @@
         if ( my $connect_by = $attrs->{'connect_by'} ) {
             my ($connect_by_sql, @connect_by_sql_bind) = $self->_recurse_where( $attrs->{'connect_by'} );
             $sql .= sprintf(" %s %s",
-                ( $attrs->{'nocycle'} ) ? $self->_sqlcase('connect by nocycle')
+                ( $attrs->{'connect_by_nocycle'} ) ? $self->_sqlcase('connect by nocycle')
                     : $self->_sqlcase('connect by'),
                 $connect_by_sql,
             );

Modified: DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
===================================================================
--- DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm	2010-05-14 21:27:13 UTC (rev 9370)
+++ DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm	2010-05-14 21:35:33 UTC (rev 9371)
@@ -442,7 +442,7 @@
   # CONNECT BY
   #     parentid = prior persionid
 
-=head2 nocycle
+=head2 connect_by_nocycle
 
 =over 4
 
@@ -453,7 +453,7 @@
 If you want to use NOCYCLE set to 1.
 
     connect_by => { parentid => 'prior personid' },
-    nocycle    => 1
+    connect_by_nocycle => 1
 
     # adds a connect by statement to the query:
     # SELECT

Modified: DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/t/73oracle.t
===================================================================
--- DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/t/73oracle.t	2010-05-14 21:27:13 UTC (rev 9370)
+++ DBIx-Class/0.08/branches/oracle_hierarchical_queries_rt39121/t/73oracle.t	2010-05-14 21:35:33 UTC (rev 9371)
@@ -641,7 +641,7 @@
     # 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' } },