From: Peter Rabbitson Date: Sun, 24 May 2009 09:43:32 +0000 (+0000) Subject: SUPER is so last century X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c35154363b56ff97ee04888f1b6ac762f2d7468b;p=dbsrgits%2FDBIx-Class-Historic.git SUPER is so last century --- diff --git a/lib/DBIx/Class/Storage/DBI/Cursor.pm b/lib/DBIx/Class/Storage/DBI/Cursor.pm index ddad661..5800113 100644 --- a/lib/DBIx/Class/Storage/DBI/Cursor.pm +++ b/lib/DBIx/Class/Storage/DBI/Cursor.pm @@ -152,7 +152,7 @@ sub all { my ($self) = @_; if ($self->{attrs}{software_limit} && ($self->{attrs}{offset} || $self->{attrs}{rows})) { - return $self->SUPER::all; + return $self->next::method; } $self->{storage}->dbh_do($self->can('_dbh_all'), $self); } diff --git a/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm index 5aa1f0c..108b8cf 100644 --- a/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm +++ b/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm @@ -8,7 +8,7 @@ sub _prep_for_execute { my $self = shift; my ($op, $extra_bind, $ident, $args) = @_; - my ($sql, $bind) = $self->SUPER::_prep_for_execute(@_); + my ($sql, $bind) = $self->next::method (@_); $sql .= ';SELECT SCOPE_IDENTITY()' if $op eq 'insert'; return ($sql, $bind); diff --git a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm index bd3de18..2021056 100644 --- a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm +++ b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm @@ -97,7 +97,7 @@ your session. sub connected { my $self = shift; - if (not $self->SUPER::connected(@_)) { + if (not $self->next::method(@_)) { return 0; } else { @@ -127,9 +127,9 @@ sub _dbh_execute { do { eval { if ($wantarray) { - @res = $self->SUPER::_dbh_execute(@_); + @res = $self->next::method(@_); } else { - $res[0] = $self->SUPER::_dbh_execute(@_); + $res[0] = $self->next::method(@_); } }; $exception = $@;