X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fdbixcsl_common_tests.pm;h=3d316301d4b460bb0f37b4bdbacf40d66be86e8c;hb=9ae3eecd42f2c70ee84a5322fb2754c84fae5d2c;hp=1425e2f812aa2dbaecbcb841fa5ed8f10d69870c;hpb=ce62007019b630d74636a684bbcfb0d07c81e289;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm index 1425e2f..3d31630 100644 --- a/t/lib/dbixcsl_common_tests.pm +++ b/t/lib/dbixcsl_common_tests.pm @@ -4,16 +4,17 @@ use strict; use warnings; use Test::More; +use Test::Deep; use Test::Exception; +use Test::Differences; use DBIx::Class::Schema::Loader; use Class::Unload; use File::Path 'rmtree'; +use curry; use DBI; -use Digest::MD5; use File::Find 'find'; use Class::Unload (); -use DBIx::Class::Schema::Loader::Utils qw/dumper_squashed slurp_file/; -use List::MoreUtils 'apply'; +use DBIx::Class::Schema::Loader::Utils qw/dumper_squashed slurp_file sigwarn_silencer apply/; use DBIx::Class::Schema::Loader::Optional::Dependencies (); use Try::Tiny; use File::Spec::Functions 'catfile'; @@ -43,11 +44,11 @@ sub new { my $self; if( ref($_[0]) eq 'HASH') { - my $args = shift; - $self = { (%$args) }; + my $args = shift; + $self = { (%$args) }; } else { - $self = { @_ }; + $self = { @_ }; } # Only MySQL uses this @@ -88,8 +89,11 @@ sub skip_tests { sub _monikerize { my $name = shift; - return 'LoaderTest2X' if $name =~ /^loader_test2$/i; - return undef; + my $orig = pop; + return $orig->({ + loader_test2 => 'LoaderTest2X', + LOADER_TEST2 => 'LoaderTest2X', + }); } sub run_tests { @@ -114,12 +118,9 @@ sub run_tests { 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 * - (223 + $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]; @@ -165,6 +166,7 @@ sub run_only_extra_tests { } } + $dbh->disconnect; $self->{_created} = 1; my $file_count = grep $_ =~ SOURCE_DDL, @{ $self->{extra}{create} || [] }; @@ -180,6 +182,7 @@ sub run_only_extra_tests { $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; @@ -212,7 +215,7 @@ my (@statements, @statements_reltests, @statements_advanced, sub CONSTRAINT { my $self = shift; -return qr/^(?:\S+\.)?(?:(?:$self->{vendor}|extra)[_-]?)?loader[_-]?test[0-9]+(?!.*_)/i; +return qr/^(?:(?:$self->{vendor}|extra)[_-]?)?loader[_-]?test[0-9]+(?!.*_)/i; } sub setup_schema { @@ -221,14 +224,21 @@ sub setup_schema { 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; } + $self->{col_accessor_map_tests_run} = 0; + my %loader_opts = ( constraint => $self->CONSTRAINT, result_namespace => RESULT_NAMESPACE, @@ -238,7 +248,7 @@ sub setup_schema { 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, @@ -255,7 +265,7 @@ sub setup_schema { 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 => $self->curry::weak::test_col_accessor_map, result_components_map => { LoaderTest2X => 'TestComponentForMap', LoaderTest1 => '+TestComponentForMapFQN' }, uniq_to_primary => 1, %{ $self->{loader_options} || {} }, @@ -269,13 +279,13 @@ sub setup_schema { { my @loader_warnings; local $SIG{__WARN__} = sub { push(@loader_warnings, @_); }; - eval qq{ - package @{[SCHEMA_CLASS]}; - use base qw/DBIx::Class::Schema::Loader/; + eval qq{ + package @{[SCHEMA_CLASS]}; + use base qw/DBIx::Class::Schema::Loader/; - __PACKAGE__->loader_options(\%loader_opts); - __PACKAGE__->connection(\@\$connect_info); - }; + __PACKAGE__->loader_options(\%loader_opts); + __PACKAGE__->connection(\@\$connect_info); + }; ok(!$@, "Loader initialization") or diag $@; @@ -284,7 +294,7 @@ sub setup_schema { my $standard_sources = not defined $expected_count; if ($standard_sources) { - $expected_count = 37; + $expected_count = 41; if (not ($self->{vendor} eq 'mssql' && $connect_info->[0] =~ /Sybase/)) { $expected_count++ for @{ $self->{data_type_tests}{table_names} || [] }; @@ -415,7 +425,7 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent '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'; @@ -465,8 +475,8 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent foreach my $ucname (keys %uniq1) { my $cols_arrayref = $uniq1{$ucname}; if(@$cols_arrayref == 1 && $cols_arrayref->[0] eq 'dat') { - $uniq1_test = 1; - last; + $uniq1_test = 1; + last; } } ok($uniq1_test, "Unique constraint"); @@ -477,9 +487,10 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent my $uniq2_test = 0; foreach my $ucname (keys %uniq2) { my $cols_arrayref = $uniq2{$ucname}; - if(@$cols_arrayref == 2 - && $cols_arrayref->[0] eq 'dat2' - && $cols_arrayref->[1] eq 'dat') { + if (@$cols_arrayref == 2 + && $cols_arrayref->[0] eq 'dat2' + && $cols_arrayref->[1] eq 'dat' + ) { $uniq2_test = 2; last; } @@ -618,6 +629,9 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent 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'; @@ -625,7 +639,7 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent 'is_nullable=1 detection'; SKIP: { - skip $self->{skip_rels}, 137 if $self->{skip_rels}; + skip $self->{skip_rels}, 143 if $self->{skip_rels}; my $moniker3 = $monikers->{loader_test3}; my $class3 = $classes->{loader_test3}; @@ -723,6 +737,22 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent my $class36 = $classes->{loader_test36}; my $rsobj36 = $conn->resultset($moniker36); + my $moniker37 = $monikers->{loader_test37}; + my $class37 = $classes->{loader_test37}; + my $rsobj37 = $conn->resultset($moniker37); + + my $moniker42 = $monikers->{loader_test42}; + my $class42 = $classes->{loader_test42}; + my $rsobj42 = $conn->resultset($moniker42); + + my $moniker43 = $monikers->{loader_test43}; + my $class43 = $classes->{loader_test43}; + my $rsobj43 = $conn->resultset($moniker43); + + my $moniker44 = $monikers->{loader_test44}; + my $class44 = $classes->{loader_test44}; + my $rsobj44 = $conn->resultset($moniker44); + isa_ok( $rsobj3, "DBIx::Class::ResultSet" ); isa_ok( $rsobj4, "DBIx::Class::ResultSet" ); isa_ok( $rsobj5, "DBIx::Class::ResultSet" ); @@ -747,6 +777,10 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent isa_ok( $rsobj33, "DBIx::Class::ResultSet" ); isa_ok( $rsobj34, "DBIx::Class::ResultSet" ); isa_ok( $rsobj36, "DBIx::Class::ResultSet" ); + isa_ok( $rsobj37, "DBIx::Class::ResultSet" ); + isa_ok( $rsobj42, "DBIx::Class::ResultSet" ); + isa_ok( $rsobj43, "DBIx::Class::ResultSet" ); + isa_ok( $rsobj44, "DBIx::Class::ResultSet" ); # basic rel test my $obj4 = try { $rsobj4->find(123) } || $rsobj4->search({ id => 123 })->single; @@ -840,7 +874,7 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent is $obj5->i_d2, 1, 'Find on multi-col PK'; } else { - my $obj5 = $rsobj5->find({id1 => 1, id2 => 1}); + my $obj5 = $rsobj5->find({id1 => 1, id2 => 1}); is $obj5->id2, 1, 'Find on multi-col PK'; } @@ -852,25 +886,29 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent ok($class6->column_info('loader_test2_id')->{is_foreign_key}, 'Foreign key detected'); ok($class6->column_info('id')->{is_foreign_key}, 'Foreign key detected'); - my $id2_info = try { $class6->column_info('id2') } || - $class6->column_info('Id2'); + my $id2_info = try { $class6->column_info('id2') } || + $class6->column_info('Id2'); ok($id2_info->{is_foreign_key}, 'Foreign key detected'); unlike slurp_file $conn->_loader->get_dump_filename($class6), -qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( - \s+ "(\w+?)" - .*? - \n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( - \s+ "\1"/xs, -'did not create two relationships with the same name'; + qr{ + \n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( + \s+ "(\w+?)" + .*? + \n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( + \s+ "\1" + }xs, + 'did not create two relationships with the same name'; unlike slurp_file $conn->_loader->get_dump_filename($class8), -qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( - \s+ "(\w+?)" - .*? - \n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( - \s+ "\1"/xs, -'did not create two relationships with the same name'; + qr{ + \n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( + \s+ "(\w+?)" + .*? + \n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( + \s+ "\1" + }xs, + 'did not create two relationships with the same name'; # check naming of ambiguous relationships my $rel_info = $class6->relationship_info('lovely_loader_test7') || {}; @@ -915,28 +953,106 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( isa_ok(try { $rs_rel17->single }, $class17); is(try { $rs_rel17->single->id }, 3, "search_related with multiple FKs from same table"); - # XXX test m:m 18 <- 20 -> 19 + # test many_to_many detection 18 -> 20 -> 19 and 19 -> 20 -> 18 ok($class20->column_info('parent')->{is_foreign_key}, 'Foreign key detected'); ok($class20->column_info('child')->{is_foreign_key}, 'Foreign key detected'); - # XXX test double-fk m:m 21 <- 22 -> 21 + cmp_deeply( + $class18->_m2m_metadata->{children}, + superhashof({ + relation => 'loader_test20s', + foreign_relation => 'child', + attrs => superhashof({ order_by => 'me.id' }) + }), + 'children m2m correct with ordering' + ); + + cmp_deeply( + $class19->_m2m_metadata->{parents}, + superhashof({ + relation => 'loader_test20s', + foreign_relation => 'parent', + attrs => superhashof({ order_by => 'me.id' }) + }), + 'parents m2m correct with ordering' + ); + + + # test double-fk m:m 21 <- 22 -> 21 ok($class22->column_info('parent')->{is_foreign_key}, 'Foreign key detected'); ok($class22->column_info('child')->{is_foreign_key}, 'Foreign key detected'); + is_deeply( + $class21->relationship_info("loader_test22_parents")->{cond}, + { 'foreign.parent' => 'self.id' }, + 'rel to foreign.parent correct' + ); + is_deeply( + $class21->relationship_info("loader_test22_children")->{cond}, + { 'foreign.child' => 'self.id' }, + 'rel to foreign.child correct' + ); - # test many_to_many detection 18 -> 20 -> 19 and 19 -> 20 -> 18 - my $m2m; + cmp_deeply( + $class21->_m2m_metadata, + { + parents => superhashof({ + accessor => 'parents', + relation => 'loader_test22_children', + foreign_relation => 'parent', + }), + children => superhashof({ + accessor => 'children', + relation => 'loader_test22_parents', + foreign_relation => 'child', + }), + }, + 'self-m2m correct' + ); - ok($m2m = (try { $class18->_m2m_metadata->{children} }), 'many_to_many created'); + ok( $class37->relationship_info('parent'), 'parents rel created' ); + ok( $class37->relationship_info('child'), 'child rel created' ); - is $m2m->{relation}, 'loader_test20s', 'm2m near has_many rel'; - is $m2m->{foreign_relation}, 'child', 'm2m far rel'; - is $m2m->{attrs}->{order_by}, 'me.id', 'm2m bridge attrs'; + is_deeply($class32->_m2m_metadata, {}, 'many_to_many not created for might_have'); + is_deeply($class34->_m2m_metadata, {}, 'many_to_many not created for might_have'); - ok($m2m = (try { $class19->_m2m_metadata->{parents} }), 'many_to_many created'); + # test m2m with overlapping compound keys + is_deeply( + $class44->relationship_info('loader_test42')->{cond}, + { + 'foreign.id1' => 'self.id42', + 'foreign.id2' => 'self.id2', + }, + 'compound belongs_to key detected for overlapping m2m', + ); + is_deeply( + $class44->relationship_info('loader_test43')->{cond}, + { + 'foreign.id1' => 'self.id43', + 'foreign.id2' => 'self.id2', + }, + 'compound belongs_to key detected for overlapping m2m', + ); + cmp_deeply( + $class42->_m2m_metadata, + { + loader_test43s => superhashof({ + accessor => "loader_test43s", + foreign_relation => "loader_test43", + }), + }, + 'm2m created for overlapping multi-column foreign keys' + ); - is $m2m->{relation}, 'loader_test20', 'm2m near might_have rel'; - is $m2m->{foreign_relation}, 'parent', 'm2m far rel'; - is $m2m->{attrs}->{order_by}, 'me.id', 'm2m bridge attrs'; + cmp_deeply( + $class43->_m2m_metadata, + { + loader_test42s => superhashof({ + accessor => "loader_test42s", + foreign_relation => "loader_test42", + }), + }, + 'm2m created for overlapping multi-column foreign keys' + ); # test double multi-col fk 26 -> 25 my $obj26 = try { $rsobj26->find(33) } || $rsobj26->search({ id => 33 })->single; @@ -978,7 +1094,7 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( # test outer join for nullable referring columns: is $class32->column_info('rel2')->{is_nullable}, 1, - 'is_nullable detection'; + 'is_nullable detection'; ok($class32->column_info('rel1')->{is_foreign_key}, 'Foreign key detected'); ok($class32->column_info('rel2')->{is_foreign_key}, 'Foreign key detected'); @@ -1083,7 +1199,7 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( # relname is preserved when another fk is added { - local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /invalidates \d+ active statement/ }; + local $SIG{__WARN__} = sigwarn_silencer(qr/invalidates \d+ active statement/); $conn->storage->disconnect; # for mssql and access } @@ -1164,8 +1280,8 @@ EOF q{ INSERT INTO loader_test30 (id,loader_test2) VALUES(321, 2) }, ); - # get md5 - my $digest = Digest::MD5->new; + # get contents + my %contents; my $find_cb = sub { return if -d; @@ -1173,18 +1289,18 @@ EOF open my $fh, '<', $_ or die "Could not open $_ for reading: $!"; binmode $fh; - $digest->addfile($fh); + local $/; + $contents{$File::Find::name} = <$fh>; }; find $find_cb, DUMP_DIR; + my %contents_before = %contents; # system "rm -rf /tmp/before_rescan /tmp/after_rescan"; # system "mkdir /tmp/before_rescan"; # system "mkdir /tmp/after_rescan"; # system "cp -a @{[DUMP_DIR]} /tmp/before_rescan"; - my $before_digest = $digest->b64digest; - $conn->storage->disconnect; # needed for Firebird and Informix my $dbh = $self->dbconnect(1); $dbh->do($_) for @statements_rescan; @@ -1198,12 +1314,21 @@ EOF # system "cp -a @{[DUMP_DIR]} /tmp/after_rescan"; - $digest = Digest::MD5->new; + undef %contents; find $find_cb, DUMP_DIR; - my $after_digest = $digest->b64digest; - - is $before_digest, $after_digest, - 'dumped files are not rewritten when there is no modification'; + my %contents_after = %contents; + + subtest 'dumped files are not rewritten when there is no modification' => sub { + plan tests => 1 + scalar keys %contents_before; + is_deeply + [sort keys %contents_before], + [sort keys %contents_after], + 'same files dumped'; + for my $file (sort keys %contents_before) { + eq_or_diff $contents_before{$file}, $contents_after{$file}, + "$file not rewritten"; + } + }; my $rsobj30 = $conn->resultset('LoaderTest30'); isa_ok($rsobj30, 'DBIx::Class::ResultSet'); @@ -1214,8 +1339,8 @@ EOF my $obj30 = try { $rsobj30->find(123) } || $rsobj30->search({ id => 123 })->single; isa_ok( $obj30->loader_test2, $class2); - ok($rsobj30->result_source->column_info('loader_test2')->{is_foreign_key}, - 'Foreign key detected'); + ok $rsobj30->result_source->column_info('loader_test2')->{is_foreign_key}, + 'Foreign key detected'; } $conn->storage->disconnect; # for Firebird @@ -1245,20 +1370,18 @@ TODO: { ok eval { my %opts = ( - naming => 'current', - constraint => $self->CONSTRAINT, - dump_directory => DUMP_DIR, - debug => ($ENV{SCHEMA_LOADER_TESTS_DEBUG}||0) + naming => 'current', + constraint => $self->CONSTRAINT, + dump_directory => DUMP_DIR, + debug => ($ENV{SCHEMA_LOADER_TESTS_DEBUG}||0) ); my $guard = $conn->txn_scope_guard; - my $warn_handler = $SIG{__WARN__} || sub { warn @_ }; - local $SIG{__WARN__} = sub { - $warn_handler->(@_) - unless $_[0] =~ RESCAN_WARNINGS - || $_[0] =~ /commit ineffective with AutoCommit enabled/; # FIXME - }; + my $rescan_warnings = RESCAN_WARNINGS; + local $SIG{__WARN__} = sigwarn_silencer( + qr/$rescan_warnings|commit ineffective with AutoCommit enabled/ # FIXME + ); my $schema_from = DBIx::Class::Schema::Loader::make_schema_at( "TestSchemaFromAnother", \%opts, [ sub { $conn->storage->dbh } ] @@ -1272,9 +1395,9 @@ TODO: { 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 { @@ -1468,7 +1591,7 @@ sub create { 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}, @@ -1483,6 +1606,7 @@ sub create { 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} }, @@ -1726,7 +1850,7 @@ sub create { qq{ CREATE TABLE loader_test20 ( parent INTEGER NOT NULL, - child INTEGER NOT NULL UNIQUE, + child INTEGER NOT NULL, PRIMARY KEY (parent, child), FOREIGN KEY (parent) REFERENCES loader_test18 (id), FOREIGN KEY (child) REFERENCES loader_test19 (id) @@ -1763,7 +1887,7 @@ sub create { q{ INSERT INTO loader_test22 (parent, child) VALUES (11,13)}, q{ INSERT INTO loader_test22 (parent, child) VALUES (13,17)}, - qq{ + qq{ CREATE TABLE loader_test25 ( id1 INTEGER NOT NULL, id2 INTEGER NOT NULL, @@ -1854,6 +1978,42 @@ sub create { ) $self->{innodb} }, q{ INSERT INTO loader_test34 (id,rel1,rel2) VALUES (1,2,2) }, + + qq{ + CREATE TABLE loader_test37 ( + parent INTEGER NOT NULL, + child INTEGER NOT NULL UNIQUE, + PRIMARY KEY (parent, child), + FOREIGN KEY (parent) REFERENCES loader_test32 (id), + FOREIGN KEY (child) REFERENCES loader_test34 (id) + ) $self->{innodb} + }, + q{ INSERT INTO loader_test37 (parent, child) VALUES (1,1) }, + + qq{ + CREATE TABLE loader_test42 ( + id1 INTEGER NOT NULL, + id2 INTEGER NOT NULL, + PRIMARY KEY (id1, id2) + ) $self->{innodb} + }, + qq{ + CREATE TABLE loader_test43 ( + id1 INTEGER NOT NULL, + id2 INTEGER NOT NULL, + PRIMARY KEY (id1, id2) + ) $self->{innodb} + }, + qq{ + CREATE TABLE loader_test44 ( + id42 INTEGER NOT NULL, + id43 INTEGER NOT NULL, + id2 INTEGER NOT NULL, + PRIMARY KEY (id42, id43, id2), + FOREIGN KEY (id42, id2) REFERENCES loader_test42 (id1, id2), + FOREIGN KEY (id43, id2) REFERENCES loader_test43 (id1, id2) + ) $self->{innodb} + }, ); @statements_advanced = ( @@ -2046,10 +2206,14 @@ sub drop_tables { loader_test28 loader_test29 loader_test27 + loader_test37 loader_test32 loader_test31 loader_test34 loader_test33 + loader_test44 + loader_test43 + loader_test42 /; my @tables_advanced = qw/ @@ -2209,8 +2373,10 @@ sub setup_data_type_tests { @first_table_types = grep !/$split_off_re/, @types; } - @types = +{ map +($_, $types->{$_}), @first_table_types }, - map +{ $_, $types->{$_} }, @split_off_types; + @types = ( + +{ map +($_, $types->{$_}), @first_table_types }, + map +{ $_, $types->{$_} }, @split_off_types, + ); my $test_count = 0; my $table_num = 10000; @@ -2284,29 +2450,37 @@ sub setup_data_type_tests { sub rescan_without_warnings { my ($self, $conn) = @_; - local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ RESCAN_WARNINGS }; + local $SIG{__WARN__} = sigwarn_silencer(RESCAN_WARNINGS); return $conn->rescan; } 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', + }, + }); } } sub DESTROY { my $self = shift; unless ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}) { - $self->drop_tables if $self->{_created}; - rmtree DUMP_DIR + $self->drop_tables if $self->{_created}; + rmtree DUMP_DIR } }