my $extra_count = $self->{extra}{count} || 0;
my $col_accessor_map_tests = 6;
- my $num_rescans = 6;
- $num_rescans++ if $self->{vendor} eq 'mssql';
- $num_rescans++ if $self->{vendor} eq 'Firebird';
plan tests => @connect_info *
- (232 + $num_rescans * $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0));
+ (233 + $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0));
foreach my $info_idx (0..$#connect_info) {
my $info = $connect_info[$info_idx];
}
}
+ $dbh->disconnect;
$self->{_created} = 1;
my $file_count = grep $_ =~ SOURCE_DDL, @{ $self->{extra}{create} || [] };
$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;
$self->{use_moose} = 1;
}
+ $self->{col_accessor_map_tests_run} = 0;
+
my %loader_opts = (
constraint => $self->CONSTRAINT,
result_namespace => RESULT_NAMESPACE,
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 => \&test_col_accessor_map,
+ col_accessor_map => sub { $self->test_col_accessor_map(@_) },
result_components_map => { LoaderTest2X => 'TestComponentForMap', LoaderTest1 => '+TestComponentForMapFQN' },
uniq_to_primary => 1,
%{ $self->{loader_options} || {} },
'fully qualified schema component works';
my @columns_lt2 = $class2->columns;
- is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key can dbix_class_testcomponent dbix_class_testcomponentmap testcomponent_fqn meta test_role_method test_role_for_map_method crumb_crisp_coating/ ], "Column Ordering" );
+ is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key can dbix_class_testcomponent dbix_class_testcomponentmap testcomponent_fqn meta test_role_method test_role_for_map_method crumb_crisp_coating sticky_filling/ ], "Column Ordering" );
is $class2->column_info('can')->{accessor}, 'caught_collision_can',
'accessor for column name that conflicts with a UNIVERSAL method renamed based on col_collision_map';
is( $class2->column_info('crumb_crisp_coating')->{accessor}, 'trivet',
'col_accessor_map is being run' );
+ is( $class2->column_info('sticky_filling')->{accessor}, 'goo',
+ 'multi-level hash col_accessor_map works' );
+
is $class1->column_info('dat')->{is_nullable}, 0,
'is_nullable=0 detection';
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 {
q{ INSERT INTO loader_test1s (dat) VALUES('baz') },
# also test method collision
- # crumb_crisp_coating is for col_accessor_map tests
+ # crumb_crisp_coating and sticky_filling are for col_accessor_map tests
qq{
CREATE TABLE loader_test2 (
id $self->{auto_inc_pk},
test_role_method INTEGER $self->{null},
test_role_for_map_method INTEGER $self->{null},
crumb_crisp_coating VARCHAR(32) $self->{null},
+ sticky_filling VARCHAR(32) $self->{null},
UNIQUE (dat2, dat)
) $self->{innodb}
},
}
sub test_col_accessor_map {
- my ( $column_name, $default_name, $context ) = @_;
+ my ( $self, $column_name, $default_name, $context, $default_map ) = @_;
if( lc($column_name) eq 'crumb_crisp_coating' ) {
- is( $default_name, 'crumb_crisp_coating', 'col_accessor_map was passed the default name' );
- ok( $context->{$_}, "col_accessor_map func was passed the $_" )
- for qw( table table_name table_class table_moniker schema_class );
-
+ unless ($self->{col_accessor_map_tests_run}++) {
+ is( $default_name, 'crumb_crisp_coating', 'col_accessor_map was passed the default name' );
+ ok( $context->{$_}, "col_accessor_map func was passed the $_" )
+ for qw( table table_name table_class table_moniker schema_class );
+ }
return 'trivet';
} else {
- return $default_name;
+ return $default_map->({
+ LOADER_TEST2 => {
+ sticky_filling => 'goo',
+ },
+ loader_test2 => {
+ sticky_filling => 'goo',
+ },
+ });
}
}