use DBIx::Class::Schema::Loader;
use Class::Unload;
use File::Path 'rmtree';
+use curry;
use DBI;
use File::Find 'find';
use Class::Unload ();
$self->test_data_types($conn);
$self->{extra}{run}->($conn, $monikers, $classes, $self) if $self->{extra}{run};
+ $conn->storage->disconnect;
if (not ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} && $info_idx == $#$connect_info)) {
$self->drop_extra_tables_only;
rmtree DUMP_DIR;
}
- $conn->storage->disconnect;
}
}
my $debug = ($self->{verbose} > 1) ? 1 : 0;
if ($ENV{SCHEMA_LOADER_TESTS_USE_MOOSE}) {
+ # on travis, we require the intersection of both sets of prereqs
if (not DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose')) {
die sprintf ("Missing dependencies for SCHEMA_LOADER_TESTS_USE_MOOSE: %s\n",
DBIx::Class::Schema::Loader::Optional::Dependencies->req_missing_for('use_moose'));
}
+ if (not DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose_only_autoclean')) {
+ die sprintf ("Missing dependencies for SCHEMA_LOADER_TESTS_USE_MOOSE: %s\n",
+ DBIx::Class::Schema::Loader::Optional::Dependencies->req_missing_for('use_moose_only_autoclean'));
+ }
$self->{use_moose} = 1;
}
additional_classes => 'TestAdditional',
additional_base_classes => 'TestAdditionalBase',
left_base_classes => [ qw/TestLeftBase/ ],
- components => [ qw/TestComponent +TestComponentFQN IntrospectableM2M/ ],
+ components => [ qw/TestComponent +TestComponentFQN +IntrospectM2M/ ],
inflect_plural => { loader_test4_fkid => 'loader_test4zes' },
inflect_singular => { fkid => 'fkid_singular' },
moniker_map => \&_monikerize,
col_collision_map => { '^(can)\z' => 'caught_collision_%s' },
rel_collision_map => { '^(set_primary_key)\z' => 'caught_rel_collision_%s' },
relationship_attrs => { many_to_many => { order_by => 'me.id' } },
- col_accessor_map => sub { $self->test_col_accessor_map(@_) },
+ col_accessor_map => $self->curry::weak::test_col_accessor_map,
result_components_map => { LoaderTest2X => 'TestComponentForMap', LoaderTest1 => '+TestComponentForMapFQN' },
uniq_to_primary => 1,
%{ $self->{loader_options} || {} },
'is_nullable=1 detection';
SKIP: {
- skip $self->{skip_rels}, 149 if $self->{skip_rels};
+ skip $self->{skip_rels}, 143 if $self->{skip_rels};
my $moniker3 = $monikers->{loader_test3};
my $class3 = $classes->{loader_test3};
diag $@ if $@ && (not $TODO);
}
- $self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP};
-
$conn->storage->disconnect;
+
+ $self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP};
}
sub test_data_types {