From: Rafael Kitover <rkitover@cpan.org>
Date: Sun, 29 Nov 2009 18:32:00 +0000 (+0000)
Subject: Merge 'current' into 'back-compat'
X-Git-Tag: 0.04999_13~23^2~8
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class-Schema-Loader.git;a=commitdiff_plain;h=09c0a8522aa8dee34ce44704a202c18bc7e8a51e

Merge 'current' into 'back-compat'

r21690@hlagh (orig r7985):  caelum | 2009-11-29 09:51:18 -0500
added patch to generate POD from postgres by Andrey Kostenko (GUGU)
r21691@hlagh (orig r7986):  caelum | 2009-11-29 12:49:40 -0500
fix table count test in common tests, inc version for dev release, add extra tests for table/column comments for Pg, make tests less noisy
r21692@hlagh (orig r7987):  caelum | 2009-11-29 13:17:04 -0500
new dev release
---

09c0a8522aa8dee34ce44704a202c18bc7e8a51e
diff --cc t/lib/dbixcsl_common_tests.pm
index 509ac66,c7a78de..c15d322
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@@ -115,10 -120,21 +120,21 @@@ sub setup_schema 
         my $file_count;
         find sub { return if -d; $file_count++ }, $DUMP_DIR;
  
-        is $file_count, 34, 'correct number of files generated';
-        exit if $file_count != 34;
+        my $expected_count = 34;
+ 
+        $expected_count += @{ $self->{extra}{drop} || [] };
+ 
+        $expected_count -= grep /CREATE TABLE/, @statements_inline_rels
+            if $self->{no_inline_rels};
+ 
+        $expected_count -= grep /CREATE TABLE/, @statements_implicit_rels
+            if $self->{no_implicit_rels};
+ 
+        is $file_count, $expected_count, 'correct number of files generated';
+ 
+        exit if $file_count != $expected_count;
  
 -       my $warn_count = 2;
 +       my $warn_count = 0;
         $warn_count++ if grep /ResultSetManager/, @loader_warnings;
  
          if($self->{skip_rels}) {