From: Jay Hannah <jay@jays.net>
Date: Wed, 30 Dec 2009 03:34:04 +0000 (+0000)
Subject: Suppress 2nd warning below which makes the test fail.
X-Git-Tag: 0.04999_13~15^2~5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=00fb16783c7708f8811d22d71e0e01a0682bbdec;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

Suppress 2nd warning below which makes the test fail.

not ok 3 - Expected loader warning
#   Failed test 'Expected loader warning'
#   at t/lib/dbixcsl_common_tests.pm line 149.
#          got: '4'
#     expected: '3'
# DBIx::Class::Schema::Loader::connection(): loader_test9 has no primary key at (eval 57)[t/lib/dbixcsl_common_te
# Use of uninitialized value in string ne at lib/DBIx/Class/Schema/Loader/Base.pm line 454.
# Dumping manual schema for DBIXCSL_Test::Schema to directory ./t/_common_dump ...
# Schema dump completed.
---

diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index 516a402..8cb3bf6 100644
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -453,7 +453,7 @@ sub _find_file_in_inc {
         my $fullpath = File::Spec->catfile($prefix, $file);
         return $fullpath if -f $fullpath
             and Cwd::abs_path($fullpath) ne
-                Cwd::abs_path(File::Spec->catfile($self->dump_directory, $file)) || '';
+               (Cwd::abs_path(File::Spec->catfile($self->dump_directory, $file)) || '');
     }
 
     return;