From: Peter Rabbitson Date: Mon, 6 Sep 2010 09:41:09 +0000 (+0200) Subject: Fix failing oracle tests (extra warnings issued on lc(undef) ) X-Git-Tag: 0.07002~18 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1db660659746307859d5016253d925e2a060a2d2;p=dbsrgits%2FDBIx-Class-Schema-Loader.git Fix failing oracle tests (extra warnings issued on lc(undef) ) --- diff --git a/Changes b/Changes index 1c02978..7bd006d 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,7 @@ Revision history for Perl extension DBIx::Class::Schema::Loader - Switch to MRO::Compat + - Fix oracle common tests failure / lc(undef) warnings 0.07001 2010-07-24 21:28:08 - put is_deferrable => 1 back into default attributes for belongs_to diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm b/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm index 354963a..e625f73 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm @@ -166,7 +166,7 @@ AND upper(trigger_type) LIKE '%BEFORE EACH ROW%' AND lower(triggering_event) LIK $result->{$col_name}{is_auto_increment} = 1; if (my ($seq_schema, $seq_name) = $trigger_body =~ /(?:\."?(\w+)"?)?"?(\w+)"?\.nextval/i) { - $seq_schema = $self->_lc($seq_schema) || $self->db_schema; + $seq_schema = $self->_lc($seq_schema || $self->db_schema); $seq_name = $self->_lc($seq_name); $result->{$col_name}{sequence} = ($self->qualify_objects ? ($seq_schema . '.') : '') . $seq_name;