Removed 8.pm and updated Changelog.

diff --git a/Changes b/Changes
index 09cea11..c6d5249 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,10 +1,13 @@
 Revision history for DBIx::Class
 
+        - Added Oracle/WhereJoins.pm for Oracle >= 8 to support
+          Oracle <= 9i, and provide Oracle with a better join method for
+          later versions.  (I use the term better loosely.)
         - select et al weren't properly detecing when the server connection
           had timed out when not in a transaction
         - The SQL::T parser class now respects a relationship attribute of
-          is_foreign_key_constrain to allow explicit control over wether or not
-          a foreign constraint is needed
+          is_foreign_key_constrain to allow explicit control over wether or
+          not a foreign constraint is needed
 
 0.07999_02 2007-01-25 20:11:00
         - add support for binding BYTEA and similar parameters (w/Pg impl)

diff --git a/lib/DBIx/Class/Storage/DBI/Oracle/8.pm b/lib/DBIx/Class/Storage/DBI/Oracle/8.pm
deleted file mode 100644 (file)
index c395cf1..0000000
--- a/lib/DBIx/Class/Storage/DBI/Oracle/8.pm
+++ /dev/null
@@ -1,182 +0,0 @@
-package DBIx::Class::Storage::DBI::Oracle::8;
-# -*- mode: cperl; cperl-indent-level: 2 -*-
-
-use base qw( DBIx::Class::Storage::DBI::Oracle::Generic );
-
-use strict;
-use warnings;
-
-BEGIN {
-  package DBIC::SQL::Abstract::Oracle8;
-
-  use base qw( DBIC::SQL::Abstract );
-
-  sub select {
-    my ($self, $table, $fields, $where, $order, @rest) = @_;
-
-    $self->_oracle_joins($where, @{ $table });
-
-    return $self->SUPER::select($table, $fields, $where, $order, @rest);
-  }
-
-  sub _recurse_from {
-    my ($self, $from, @join) = @_;
-
-    my @sqlf = $self->_make_as($from);
-
-    foreach my $j (@join) {
-      my ($to, $on) = @{ $j };
-
-      if (ref $to eq 'ARRAY') {
-        push (@sqlf, $self->_recurse_from(@{ $to }));
-      }
-      else {
-        push (@sqlf, $self->_make_as($to));
-      }
-    }
-
-    return join q{, }, @sqlf;
-  }
-
-  sub _oracle_joins {
-    my ($self, $where, $from, @join) = @_;
-
-    foreach my $j (@join) {
-      my ($to, $on) = @{ $j };
-
-      if (ref $to eq 'ARRAY') {
-        $self->_oracle_joins($where, @{ $to });
-      }
-
-      my $to_jt      = ref $to eq 'ARRAY' ? $to->[0] : $to;
-      my $left_join  = q{};
-      my $right_join = q{};
-
-      if (ref $to_jt eq 'HASH' and exists $to_jt->{-join_type}) {
-        #TODO: Support full outer joins -- this would happen much earlier in
-        #the sequence since oracle 8's full outer join syntax is best
-        #described as INSANE.
-        die "Can't handle full outer joins in Oracle 8 yet!\n"
-          if $to_jt->{-join_type} =~ /full/i;
-
-        $left_join  = q{(+)} if $to_jt->{-join_type} =~ /right/i
-                             && $to_jt->{-join_type} !~ /inner/i;
-
-        $right_join = q{(+)} if $to_jt->{-join_type} =~ /left/i
-                             && $to_jt->{-join_type} !~ /inner/i;
-      }
-
-      foreach my $lhs (keys %{ $on }) {
-        $where->{$lhs . $left_join} = \" = $on->{ $lhs }$right_join";
-      }
-    }
-  }
-}
-
-sub sql_maker {
-  my ($self) = @_;
-
-  unless ($self->_sql_maker) {
-    $self->_sql_maker(
-      new DBIC::SQL::Abstract::Oracle8( $self->_sql_maker_args )
-    );
-  }
-
-  return $self->_sql_maker;
-}
-
-1;
-
-__END__
-
-=pod
-
-=head1 NAME
-
-DBIx::Class::Storage::DBI::Oracle::8 - Oracle 8 support (EXPERIMENTAL)
-
-=head1 SYNOPSIS
-
-When initialising your code in the base DBIx module, simply tell DBIx to use
-this as a storage class, and you're set:
-
-    use base qw( DBIx::Class::Schema );
-
-    __PACKAGE__->load_classes();
-
-=head1 DESCRIPTION
-
-This class implements support specific to Oracle 8, as Oracle does not support:
-
-    SELECT x FROM y JOIN z ON y.id = z.id
-
-Oracle requires the query by written as:
-
-    SELECT x FROM y, z WHERE y.id = z.id
-
-This module attempts to support that.  
-
-It should properly support left joins, and right joins.  Full outer joins are
-not possible due to the fact that Oracle 8 requires the entire query be
-written to union the results of a left and right join, and by the time this
-module is called to create the where query and table definition part of the
-sql query, it's already too late.
-
-=head1 METHODS
-
-This module replaces a subroutine contained in DBIC::SQL::Abstract:
-
-=over
-
-=item sql_maker
-
-=back
-
-It also creates a new module in its BEGIN { } block called
-DBIC::SQL::Abstract::Oracle8 which has the following methods:
-
-=over
-
-=item select ($\@$;$$@)
-
-Replaces DBIC::SQL::Abstract's select() method, which calls _oracle_joins()
-to modify the column and table list before calling SUPER::select().
-
-=item _recurse_from ($$\@)
-
-Recursive subroutine that builds the table list.
-
-=item _oracle_joins ($$$@)
-
-Creates the left/right relationship in the where query.
-
-=back
-
-=head1 BUGS
-
-Does not support full outer joins.
-Probably lots more.
-
-=head1 SEE ALSO
-
-=over
-
-=item L<DBIC::SQL::Abstract>
-
-=item L<DBIx::Class>
-
-=back
-
-=head1 AUTHOR
-
-Justin Wheeler C<< <justin.wheeler@caledoncard.com> >>
-
-=head1 CONTRIBUTORS
-
-David Jack Olrik C<< <djo@cpan.org> >>
-
-=head1 LICENSE
-
-This module is licensed under the same terms as Perl itself.
-
-=cut