From: Peter Rabbitson Date: Tue, 12 May 2009 16:09:14 +0000 (+0000) Subject: Some more die/croak conversions X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e8fcf76f98ebd3cc99638765220d0024380bdd02;p=dbsrgits%2FDBIx-Class-Historic.git Some more die/croak conversions --- diff --git a/lib/DBIx/Class/SQLAHacks.pm b/lib/DBIx/Class/SQLAHacks.pm index 063b909..9fb3c24 100644 --- a/lib/DBIx/Class/SQLAHacks.pm +++ b/lib/DBIx/Class/SQLAHacks.pm @@ -124,7 +124,7 @@ sub select { local $self->{rownum_hack_count} = 1 if (defined $rest[0] && $self->{limit_dialect} eq 'RowNum'); @rest = (-1) unless defined $rest[0]; - die "LIMIT 0 Does Not Compute" if $rest[0] == 0; + croak "LIMIT 0 Does Not Compute" if $rest[0] == 0; # and anyway, SQL::Abstract::Limit will cause a barf if we don't first my ($sql, @where_bind) = $self->SUPER::select( $table, $self->_recurse_fields($fields), $where, $order, @rest @@ -189,7 +189,7 @@ sub _recurse_fields { if ($func eq 'distinct') { my $_fields = $fields->{$func}; if (ref $_fields eq 'ARRAY' && @{$_fields} > 1) { - die "Unsupported syntax, please use " . + croak "Unsupported syntax, please use " . "{ group_by => [ qw/" . (join ' ', @$_fields) . "/ ] }" . " or " . "{ select => [ qw/" . (join ' ', @$_fields) . "/ ], distinct => 1 }"; @@ -212,7 +212,7 @@ sub _recurse_fields { return $self->_fold_sqlbind( $fields ); } else { - Carp::croak($ref . qq{ unexpected in _recurse_fields()}) + croak($ref . qq{ unexpected in _recurse_fields()}) } } @@ -332,8 +332,7 @@ sub _join_condition { for (keys %$cond) { my $v = $cond->{$_}; if (ref $v) { - # XXX no throw_exception() in this package and croak() fails with strange results - Carp::croak(ref($v) . qq{ reference arguments are not supported in JOINS - try using \"..." instead'}) + croak (ref($v) . qq{ reference arguments are not supported in JOINS - try using \"..." instead'}) if ref($v) ne 'SCALAR'; $j{$_} = $v; } diff --git a/lib/DBIx/Class/SQLAHacks/OracleJoins.pm b/lib/DBIx/Class/SQLAHacks/OracleJoins.pm index cd5feaa..f02a913 100644 --- a/lib/DBIx/Class/SQLAHacks/OracleJoins.pm +++ b/lib/DBIx/Class/SQLAHacks/OracleJoins.pm @@ -2,6 +2,7 @@ package # Hide from PAUSE DBIx::Class::SQLAHacks::OracleJoins; use base qw( DBIx::Class::SQLAHacks ); +use Carp::Clan qw/^DBIx::Class/; sub select { my ($self, $table, $fields, $where, $order, @rest) = @_; @@ -67,7 +68,7 @@ sub _recurse_oracle_joins { #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" + croak "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} =~ /left/i diff --git a/lib/DBIx/Class/Storage/TxnScopeGuard.pm b/lib/DBIx/Class/Storage/TxnScopeGuard.pm index e55691a..1c2a070 100644 --- a/lib/DBIx/Class/Storage/TxnScopeGuard.pm +++ b/lib/DBIx/Class/Storage/TxnScopeGuard.pm @@ -2,6 +2,7 @@ package DBIx::Class::Storage::TxnScopeGuard; use strict; use warnings; +use Carp (); sub new { my ($class, $storage) = @_;