From: Brandon Black <blblack@gmail.com>
Date: Thu, 27 Jul 2006 16:23:17 +0000 (+0000)
Subject: 22dump.t fixed for Win32 + removed bad warning + release 0.03007
X-Git-Tag: 0.03007
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e682950b7639702c19753fd0d9a80778083c6bd7;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

22dump.t fixed for Win32 + removed bad warning + release 0.03007
---

diff --git a/Changes b/Changes
index cb8d62e..4f93414 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
+0.03007 Thu Jul 27 16:19:59 UTC 2006
+        - Kill erroneous warning about connect/loader_options order (the real
+          case is warned about elsewhere)
+        - Fix t/22dump to work around ActiveState issues
+
 0.03006 Wed Jul 26 00:14:58 UTC 2006
         - Fixed column-case issue w/ columns_info_for
 
diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
index bd2f8df..07dca92 100644
--- a/lib/DBIx/Class/Schema/Loader.pm
+++ b/lib/DBIx/Class/Schema/Loader.pm
@@ -12,7 +12,7 @@ use Scalar::Util qw/ weaken /;
 # Always remember to do all digits for the version even if they're 0
 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
 # brain damage and presumably various other packaging systems too
-our $VERSION = '0.03006';
+our $VERSION = '0.03007';
 
 __PACKAGE__->mk_classaccessor('dump_to_dir');
 __PACKAGE__->mk_classaccessor('loader');
@@ -162,10 +162,6 @@ sub connection {
     if($self->_loader_args && !$class->loader) {
         $self->_invoke_loader
     }
-    else {
-        warn "loader_options should be set before connecting the "
-           . "schema, see the DBIx::Class::Schema::Loader docs";
-    }
 
     return $self;
 }
diff --git a/t/22dump.t b/t/22dump.t
index 5d32c90..47106a9 100644
--- a/t/22dump.t
+++ b/t/22dump.t
@@ -34,20 +34,25 @@ ok(!$@, 'no death with dump_directory set') or diag "Dump failed: $@";
 
 DBICTest::Schema::1->loader(undef);
 
-my @warn_output;
-{
-    local $SIG{__WARN__} = sub { push(@warn_output, @_) };
-    DBICTest::Schema::1->connect($make_dbictest_db::dsn);
-}
-my @warnings_regexes = (
-    qr|Dumping manual schema|,
-    (qr|DBICTest/Schema/1.*?.pm exists, will not overwrite|) x 3,
-    qr|Schema dump completed|,
-);
+SKIP: {
+  skip "ActiveState perl produces additional warnings", 5
+    if ($^O eq 'MSWin32');
 
-like(shift @warn_output, $_) foreach (@warnings_regexes);
+  my @warn_output;
+  {
+      local $SIG{__WARN__} = sub { push(@warn_output, @_) };
+      DBICTest::Schema::1->connect($make_dbictest_db::dsn);
+  }
+  my @warnings_regexes = (
+      qr|Dumping manual schema|,
+      (qr|DBICTest/Schema/1.*?.pm exists, will not overwrite|) x 3,
+      qr|Schema dump completed|,
+  );
 
-rmtree($dump_path, 1, 1);
+  like(shift @warn_output, $_) foreach (@warnings_regexes);
+
+  rmtree($dump_path, 1, 1);
+}
 
 eval { DBICTest::Schema::2->connect($make_dbictest_db::dsn) };
 ok(!$@, 'no death with dump_directory set (overwrite1)')