register sources on schema class, never instance

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / lib / dbixcsl_dumper_tests.pm

diff --git a/t/lib/dbixcsl_dumper_tests.pm b/t/lib/dbixcsl_dumper_tests.pm
index 32bf28c..d37900c 100644 (file)
--- a/t/lib/dbixcsl_dumper_tests.pm
+++ b/t/lib/dbixcsl_dumper_tests.pm
@@ -8,6 +8,7 @@ use IO::Handle;
 use List::MoreUtils 'any';
 use DBIx::Class::Schema::Loader::Utils 'dumper_squashed';
 use DBIx::Class::Schema::Loader ();
+use Class::Unload ();
 use namespace::clean;
 
 use dbixcsl_test_dir '$tdir';
@@ -18,12 +19,24 @@ sub cleanup {
     rmtree($DUMP_PATH, 1, 1);
 }
 
-sub append_to_class {
-    my ($self, $class, $string) = @_;
+sub class_file {
+    my ($self, $class) = @_;
+
     $class =~ s{::}{/}g;
     $class = $DUMP_PATH . '/' . $class . '.pm';
+
+    return $class;
+}
+
+sub append_to_class {
+    my ($self, $class, $string) = @_;
+
+    $class = $self->class_file($class);
+
     open(my $appendfh, '>>', $class) or die "Failed to open '$class' for append: $!";
+
     print $appendfh $string;
+
     close($appendfh);
 }
 
@@ -35,12 +48,8 @@ sub dump_test {
     $tdata{options}{use_namespaces} ||= 0;
 
     SKIP: for my $dumper (\&_dump_directly, \&_dump_dbicdump) {
-        skip 'fucking pigs broke my Win32 perl', 1,
-            if $dumper == \&_dump_dbicdump
-                && $^O eq 'MSWin32'
-                && $ENV{FUCKING_PIGS}
-                && (  (any { ref $_ } values %{ $tdata{options} })
-                    || any { ref $_ } _get_connect_info(\%tdata));
+        skip 'skipping dbicdump tests on Win32', 1,
+            if $dumper == \&_dump_dbicdump && $^O eq 'MSWin32';
 
         _test_dumps(\%tdata, $dumper->(%tdata));
     }
@@ -66,8 +75,7 @@ sub _dump_directly {
     };
     my $err = $@;
 
-    $schema_class->storage->disconnect if !$err && $schema_class->storage;
-    undef *{$schema_class};
+    Class::Unload->unload($schema_class);
 
     _check_error($err, $tdata{error});
 
@@ -84,7 +92,14 @@ sub _dump_dbicdump {
 
     while (my ($opt, $val) = each(%{ $tdata{options} })) {
         $val = dumper_squashed $val if ref $val;
-        push @cmd, '-o', "$opt=$val";
+
+        my $param = "$opt=$val";
+
+        if ($^O eq 'MSWin32') {
+            $param = q{"} . $param . q{"}; # that's not nearly enough...
+        }
+
+        push @cmd, '-o', $param;
     }
 
     my @connect_info = _get_connect_info(\%tdata);