X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSQLAHacks%2FOracle.pm;fp=lib%2FDBIx%2FClass%2FSQLAHacks%2FOracle.pm;h=0ca54b62e836e5ac2e8cb8d3435a0456c047ed9a;hb=2e4dd2413cf6add731083c60f493cc7374b3fcf8;hp=5caf0a2631ecd8206575127250c9463af10f023b;hpb=a0da03096cd65314cb337d6f4254cd1a0ce4ed7b;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/SQLAHacks/Oracle.pm b/lib/DBIx/Class/SQLAHacks/Oracle.pm
index 5caf0a2..0ca54b6 100644
--- a/lib/DBIx/Class/SQLAHacks/Oracle.pm
+++ b/lib/DBIx/Class/SQLAHacks/Oracle.pm
@@ -25,29 +25,27 @@ sub new {
 }
 
 sub select {
-    my ($self, $table, $fields, $where, $order, @rest) = @_;
+    my ($self, $table, $fields, $where, $rs_attrs, @rest) = @_;
 
-    $self->{_db_specific_attrs} = pop @rest;
-
-    my ($sql, @bind) = $self->SUPER::select($table, $fields, $where, $order, @rest);
+    my ($sql, @bind) = $self->SUPER::select($table, $fields, $where, $rs_attrs, @rest);
     push @bind, @{$self->{_oracle_connect_by_binds}};
 
     return wantarray ? ($sql, @bind) : $sql;
 }
 
 sub _emulate_limit {
-    my ( $self, $syntax, $sql, $order, $rows, $offset ) = @_;
+    my ( $self, $syntax, $sql, $rs_attrs, $rows, $offset ) = @_;
 
-    my ($cb_sql, @cb_bind) = $self->_connect_by();
+    my ($cb_sql, @cb_bind) = $self->_connect_by($rs_attrs);
     $sql .= $cb_sql;
     $self->{_oracle_connect_by_binds} = \@cb_bind;
 
-    return $self->SUPER::_emulate_limit($syntax, $sql, $order, $rows, $offset);
+    return $self->SUPER::_emulate_limit($syntax, $sql, $rs_attrs, $rows, $offset);
 }
 
 sub _connect_by {
-    my ($self) = @_;
-    my $attrs = $self->{_db_specific_attrs};
+    my ($self, $attrs) = @_;
+
     my $sql = '';
     my @bind;