X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSQLAHacks%2FOracle.pm;h=a55936d51e0b7e97d555e991184b2eb649ac2ecd;hb=4a233f3019d2baa4bf2abee0c873c74d5cdf3a11;hp=ca6700e4ace9a56eef4c778785bfad4de4e15127;hpb=2ba03b1627e18f422a84948277b72fd1c80da3a0;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/SQLAHacks/Oracle.pm b/lib/DBIx/Class/SQLAHacks/Oracle.pm
index ca6700e..a55936d 100644
--- a/lib/DBIx/Class/SQLAHacks/Oracle.pm
+++ b/lib/DBIx/Class/SQLAHacks/Oracle.pm
@@ -1,105 +1,9 @@
 package # Hide from PAUSE
   DBIx::Class::SQLAHacks::Oracle;
 
-use base qw( DBIx::Class::SQLAHacks );
-use Carp::Clan qw/^DBIx::Class|^SQL::Abstract/;
+use warnings;
+use strict;
 
-# 
-#  TODO:
-#   - Check the parameter syntax of connect_by
-#   - Review by experienced DBIC/SQL:A developers :-)
-#   - Problem with count and connect_by look the TODO in t/73oracle.t
-# 
-
-sub select {
-    my ($self, $table, $fields, $where, $order, @rest) = @_;
-
-    $self->{_db_specific_attrs} = pop @rest;
-
-    my ($sql, @bind) = $self->SUPER::select($table, $fields, $where, $order, @rest);
-    push @bind, @{$self->{_oracle_connect_by_binds}};
-
-    return wantarray ? ($sql, @bind) : $sql;
-}
-
-sub _emulate_limit {
-    my ( $self, $syntax, $sql, $order, $rows, $offset ) = @_;
-
-    my ($cb_sql, @cb_bind) = $self->_connect_by();
-    $sql .= $cb_sql;
-    $self->{_oracle_connect_by_binds} = \@cb_bind;
-
-    return $self->SUPER::_emulate_limit($syntax, $sql, $order, $rows, $offset);
-}
-
-sub _connect_by {
-    my ($self) = @_;
-    my $attrs = $self->{_db_specific_attrs};
-    my $sql = '';
-    my @bind;
-
-    if ( ref($attrs) eq 'HASH' ) {
-        if ( $attrs->{'start_with'} ) {
-            my ($ws, @wb) = $self->_recurse_where( $attrs->{'start_with'} );
-            $sql .= $self->_sqlcase(' start with ') . $ws;
-            push @bind, @wb;
-        }
-        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')
-                    : $self->_sqlcase('connect by'),
-                $connect_by_sql,
-            );
-            push @bind, @connect_by_sql_bind;
-            # $sql .= $self->_sqlcase(' connect by');
-            #             foreach my $key ( keys %$connect_by ) {
-            #                 $sql .= " $key = " . $connect_by->{$key};
-            #             }
-        }
-        if ( $attrs->{'order_siblings_by'} ) {
-            $sql .= $self->_order_siblings_by( $attrs->{'order_siblings_by'} );
-        }
-    }
-
-    return wantarray ? ($sql, @bind) : $sql;
-}
-
-sub _order_siblings_by {
-    my ( $self, $arg ) = @_;
-
-    my ( @sql, @bind );
-    for my $c ( $self->_order_by_chunks($arg) ) {
-        $self->_SWITCH_refkind(
-            $c,
-            {
-                SCALAR   => sub { push @sql, $c },
-                ARRAYREF => sub { push @sql, shift @$c; push @bind, @$c },
-            }
-        );
-    }
-
-    my $sql =
-      @sql
-      ? sprintf( '%s %s', $self->_sqlcase(' order siblings by'), join( ', ', @sql ) )
-      : '';
-
-    return wantarray ? ( $sql, @bind ) : $sql;
-}
+use base qw( DBIx::Class::SQLMaker::Oracle );
 
 1;
-
-__END__
-
-=pod
-
-=head1 NAME
-
-DBIx::Class::SQLAHacks::Oracle - adds hierarchical query support for Oracle to SQL::Abstract
-
-=head1 DESCRIPTION
-
-See L<DBIx::Class::Storage::DBI::Oracle::Generic> for more informations about
-how to use hierarchical queries with DBIx::Class.
-
-=cut