X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fdbixcsl_common_tests.pm;h=20dbb0b6815e15b5ef8f0d78090a671ae66edd47;hb=9b1dd93554ec8f70923940e2ae88e2e0260d0b55;hp=d3b87f7ece43f3447723a2dab46c0e28a43f3723;hpb=1ad8e8c3ce53cba4f8a34e37567ed1187b9e54b8;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm index d3b87f7..20dbb0b 100644 --- a/t/lib/dbixcsl_common_tests.pm +++ b/t/lib/dbixcsl_common_tests.pm @@ -15,6 +15,7 @@ use Class::Unload (); use DBIx::Class::Schema::Loader::Utils 'dumper_squashed'; use List::MoreUtils 'apply'; use DBIx::Class::Schema::Loader::Optional::Dependencies (); +use Try::Tiny; use namespace::clean; use dbixcsl_test_dir qw/$tdir/; @@ -22,7 +23,7 @@ use dbixcsl_test_dir qw/$tdir/; my $DUMP_DIR = "$tdir/common_dump"; rmtree $DUMP_DIR; -use constant RESCAN_WARNINGS => qr/(?i:loader_test)\d+ has no primary key|^Dumping manual schema|^Schema dump completed|collides with an inherited method|invalidates \d+ active statement|^Bad table or view/; +use constant RESCAN_WARNINGS => qr/(?i:loader_test|LoaderTest)\d+s? has no primary key|^Dumping manual schema|^Schema dump completed|collides with an inherited method|invalidates \d+ active statement|^Bad table or view/; sub new { my $class = shift; @@ -94,7 +95,14 @@ sub run_tests { my $extra_count = $self->{extra}{count} || 0; - plan tests => @connect_info * (181 + $extra_count + ($self->{data_type_tests}{test_count} || 0)); + my $col_accessor_map_tests = 5; + my $num_rescans = 5; + $num_rescans-- if $self->{vendor} =~ /^(?:sybase|mysql)\z/i; + $num_rescans++ if $self->{vendor} eq 'mssql'; + $num_rescans++ if $self->{vendor} eq 'Firebird'; + + plan tests => @connect_info * + (202 + $num_rescans * $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]; @@ -128,12 +136,19 @@ sub run_only_extra_tests { my $dbh = $self->dbconnect(1); $dbh->do($_) for @{ $self->{pre_create} || [] }; $dbh->do($_) for @{ $self->{extra}{create} || [] }; - $dbh->do($_) for @{ $self->{data_type_tests}{ddl} || []}; + + if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) { + $dbh->do($_) for @{ $self->{data_type_tests}{ddl} || []}; + } + $self->{_created} = 1; my $file_count = grep /CREATE (?:TABLE|VIEW)/i, @{ $self->{extra}{create} || [] }; $file_count++; # schema - $file_count++ for @{ $self->{data_type_tests}{table_names} || [] }; + + if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) { + $file_count++ for @{ $self->{data_type_tests}{table_names} || [] }; + } my $schema_class = $self->setup_schema($info, $file_count); my ($monikers, $classes) = $self->monikers_and_classes($schema_class); @@ -154,11 +169,15 @@ sub drop_extra_tables_only { my $dbh = $self->dbconnect(0); + local $^W = 0; # for ADO + $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] }; $dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] }; - foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) { - $dbh->do("DROP TABLE $data_type_table"); + if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) { + foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) { + $dbh->do("DROP TABLE $data_type_table"); + } } } @@ -174,14 +193,13 @@ sub setup_schema { my $debug = ($self->{verbose} > 1) ? 1 : 0; - if ( - $ENV{SCHEMA_LOADER_TESTS_USE_MOOSE} - && - ! 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 ($ENV{SCHEMA_LOADER_TESTS_USE_MOOSE}) { + 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')); + } + + $self->{use_moose} = 1; } my %loader_opts = ( @@ -191,8 +209,8 @@ sub setup_schema { additional_classes => 'TestAdditional', additional_base_classes => 'TestAdditionalBase', left_base_classes => [ qw/TestLeftBase/ ], - components => [ qw/TestComponent/ ], - inflect_plural => { loader_test4 => 'loader_test4zes' }, + components => [ qw/TestComponent +TestComponentFQN/ ], + inflect_plural => { loader_test4_fkid => 'loader_test4zes' }, inflect_singular => { fkid => 'fkid_singular' }, moniker_map => \&_monikerize, custom_column_info => \&_custom_column_info, @@ -201,8 +219,15 @@ sub setup_schema { dump_directory => $DUMP_DIR, datetime_timezone => 'Europe/Berlin', datetime_locale => 'de_DE', - use_moose => $ENV{SCHEMA_LOADER_TESTS_USE_MOOSE}, + $self->{use_moose} ? ( + use_moose => 1, + result_roles => 'TestRole', + result_roles_map => { LoaderTest2X => 'TestRoleForMap' }, + ) : (), col_collision_map => { '^(can)\z' => 'caught_collision_%s' }, + rel_collision_map => { '^(set_primary_key)\z' => 'caught_rel_collision_%s' }, + col_accessor_map => \&test_col_accessor_map, + result_components_map => { LoaderTest2X => 'TestComponentForMap', LoaderTest1 => '+TestComponentForMapFQN' }, %{ $self->{loader_options} || {} }, ); @@ -230,7 +255,10 @@ sub setup_schema { if ($standard_sources) { $expected_count = 36; - $expected_count++ for @{ $self->{data_type_tests}{table_names} || [] }; + + if (not ($self->{vendor} eq 'mssql' && $connect_info->[0] =~ /Sybase/)) { + $expected_count++ for @{ $self->{data_type_tests}{table_names} || [] }; + } $expected_count += grep /CREATE (?:TABLE|VIEW)/i, @{ $self->{extra}{create} || [] }; @@ -255,10 +283,14 @@ sub setup_schema { $warn_count++ for grep /\b(?!loader_test9)\w+ has no primary key/i, @loader_warnings; - $warn_count++ for grep /^Column \w+ in table \w+ collides with an inherited method\./, @loader_warnings; + $warn_count++ for grep /^Column '\w+' in table '\w+' collides with an inherited method\./, @loader_warnings; + + $warn_count++ for grep /^Relationship '\w+' in source '\w+' for columns '[^']+' collides with an inherited method\./, @loader_warnings; $warn_count++ for grep { my $w = $_; grep $w =~ $_, @{ $self->{warnings} || [] } } @loader_warnings; + $warn_count-- for grep { my $w = $_; grep $w =~ $_, @{ $self->{failtrigger_warnings} || [] } } @loader_warnings; + if ($standard_sources) { if($self->{skip_rels}) { SKIP: { @@ -284,7 +316,7 @@ sub setup_schema { } } - exit if $file_count != $expected_count; + exit if ($file_count||0) != $expected_count; return $schema_class; } @@ -328,19 +360,50 @@ sub test_schema { isa_ok( $rsobj35, "DBIx::Class::ResultSet" ); my @columns_lt2 = $class2->columns; - is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key can dbix_class_testcomponent meta/ ], "Column Ordering" ); + is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key can dbix_class_testcomponent dbix_class_testcomponentformap testcomponent_fqn meta test_role_method test_role_for_map_method/ ], "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('set_primary_key')->{accessor}, undef, - 'accessor for column name that conflicts with a result base class method removed'; + ok (exists $class2->column_info('set_primary_key')->{accessor} + && (not defined $class2->column_info('set_primary_key')->{accessor}), + 'accessor for column name that conflicts with a result base class method removed'); + + ok (exists $class2->column_info('dbix_class_testcomponent')->{accessor} + && (not defined $class2->column_info('dbix_class_testcomponent')->{accessor}), + 'accessor for column name that conflicts with a component class method removed'); + + ok (exists $class2->column_info('dbix_class_testcomponentformap')->{accessor} + && (not defined $class2->column_info('dbix_class_testcomponentformap')->{accessor}), + 'accessor for column name that conflicts with a component class method removed'); + + ok (exists $class2->column_info('testcomponent_fqn')->{accessor} + && (not defined $class2->column_info('testcomponent_fqn')->{accessor}), + 'accessor for column name that conflicts with a fully qualified component class method removed'); + + if ($self->{use_moose}) { + ok (exists $class2->column_info('meta')->{accessor} + && (not defined $class2->column_info('meta')->{accessor}), + 'accessor for column name that conflicts with Moose removed'); + + ok (exists $class2->column_info('test_role_for_map_method')->{accessor} + && (not defined $class2->column_info('test_role_for_map_method')->{accessor}), + 'accessor for column name that conflicts with a Result role removed'); - is $class2->column_info('dbix_class_testcomponent')->{accessor}, undef, - 'accessor for column name that conflicts with a component class method removed'; + ok (exists $class2->column_info('test_role_method')->{accessor} + && (not defined $class2->column_info('test_role_method')->{accessor}), + 'accessor for column name that conflicts with a Result role removed'); + } + else { + ok ((not exists $class2->column_info('meta')->{accessor}), + "not removing 'meta' accessor with use_moose disabled"); + + ok ((not exists $class2->column_info('test_role_for_map_method')->{accessor}), + 'no role method conflicts with use_moose disabled'); - is $class2->column_info('meta')->{accessor}, undef, - 'accessor for column name that conflicts with Moose removed'; + ok ((not exists $class2->column_info('test_role_method')->{accessor}), + 'no role method conflicts with use_moose disabled'); + } my %uniq1 = $class1->unique_constraints; my $uniq1_test = 0; @@ -400,6 +463,33 @@ sub test_schema { 'Additional Component' ); } + is try { $class2->dbix_class_testcomponentformap }, 'dbix_class_testcomponentformap works', + 'component from result_component_map'; + + isnt try { $class1->dbix_class_testcomponentformap }, 'dbix_class_testcomponentformap works', + 'component from result_component_map not added to not mapped Result'; + + is try { $class1->testcomponent_fqn }, 'TestComponentFQN works', + 'fully qualified component class'; + + is try { $class1->testcomponentformap_fqn }, 'TestComponentForMapFQN works', + 'fully qualified component class from result_component_map'; + + isnt try { $class2->testcomponentformap_fqn }, 'TestComponentForMapFQN works', + 'fully qualified component class from result_component_map not added to not mapped Result'; + + SKIP: { + skip 'not testing role methods with use_moose disabled', 2 + unless $self->{use_moose}; + + is try { $class1->test_role_method }, 'test_role_method works', + 'role from result_roles applied'; + + is try { $class2->test_role_for_map_method }, + 'test_role_for_map_method works', + 'role from result_roles_map applied'; + } + SKIP: { can_ok( $class1, 'loader_test1_classmeth' ) or skip "Pre-requisite test failed", 1; @@ -408,9 +498,10 @@ sub test_schema { ok( $class1->column_info('id')->{is_auto_increment}, 'is_auto_increment detection' ); - my $obj = $rsobj1->find(1); - is( $obj->id, 1, "Find got the right row" ); - is( $obj->dat, "foo", "Column value" ); + my $obj = try { $rsobj1->find(1) }; + + is( try { $obj->id }, 1, "Find got the right row" ); + is( try { $obj->dat }, "foo", "Column value" ); is( $rsobj2->count, 4, "Count" ); my $saved_id; eval { @@ -427,41 +518,45 @@ sub test_schema { my ($obj2) = $rsobj2->search({ dat => 'bbb' })->first; is( $obj2->id, 2 ); - is( - $class35->column_info('a_varchar')->{default_value}, 'foo', - 'constant character default', - ); + SKIP: { + skip 'no DEFAULT on Access', 7 if $self->{vendor} eq 'Access'; - is( - $class35->column_info('an_int')->{default_value}, 42, - 'constant integer default', - ); + is( + $class35->column_info('a_varchar')->{default_value}, 'foo', + 'constant character default', + ); - is( - $class35->column_info('a_negative_int')->{default_value}, -42, - 'constant negative integer default', - ); + is( + $class35->column_info('an_int')->{default_value}, 42, + 'constant integer default', + ); - cmp_ok( - $class35->column_info('a_double')->{default_value}, '==', 10.555, - 'constant numeric default', - ); + is( + $class35->column_info('a_negative_int')->{default_value}, -42, + 'constant negative integer default', + ); - cmp_ok( - $class35->column_info('a_negative_double')->{default_value}, '==', -10.555, - 'constant negative numeric default', - ); + is( + sprintf("%.3f", $class35->column_info('a_double')->{default_value}), '10.555', + 'constant numeric default', + ); - my $function_default = $class35->column_info('a_function')->{default_value}; + is( + sprintf("%.3f", $class35->column_info('a_negative_double')->{default_value}), -10.555, + 'constant negative numeric default', + ); - isa_ok( $function_default, 'SCALAR', 'default_value for function default' ); - is_deeply( - $function_default, \$self->{default_function}, - 'default_value for function default is correct' - ); + my $function_default = $class35->column_info('a_function')->{default_value}; + + isa_ok( $function_default, 'SCALAR', 'default_value for function default' ); + is_deeply( + $function_default, \$self->{default_function}, + 'default_value for function default is correct' + ); + } SKIP: { - skip $self->{skip_rels}, 116 if $self->{skip_rels}; + skip $self->{skip_rels}, 123 if $self->{skip_rels}; my $moniker3 = $monikers->{loader_test3}; my $class3 = $classes->{loader_test3}; @@ -585,14 +680,26 @@ sub test_schema { isa_ok( $rsobj36, "DBIx::Class::ResultSet" ); # basic rel test - my $obj4 = $rsobj4->find(123); - isa_ok( $obj4->fkid_singular, $class3); + my $obj4 = try { $rsobj4->find(123) } || $rsobj4->search({ id => 123 })->first; + isa_ok( try { $obj4->fkid_singular }, $class3); + + # test renaming rel that conflicts with a class method + ok ($obj4->has_relationship('belongs_to_rel'), 'relationship name that conflicts with a method renamed'); + + isa_ok( try { $obj4->belongs_to_rel }, $class3); + + ok ($obj4->has_relationship('caught_rel_collision_set_primary_key'), + 'relationship name that conflicts with a method renamed based on rel_collision_map'); + isa_ok( try { $obj4->caught_rel_collision_set_primary_key }, $class3); ok($class4->column_info('fkid')->{is_foreign_key}, 'Foreign key detected'); - my $obj3 = $rsobj3->find(1); - my $rs_rel4 = $obj3->search_related('loader_test4zes'); - isa_ok( $rs_rel4->first, $class4); + my $obj3 = try { $rsobj3->find(1) } || $rsobj3->search({ id => 1 })->first; + my $rs_rel4 = try { $obj3->search_related('loader_test4zes') }; + isa_ok( try { $rs_rel4->first }, $class4); + + is( $class4->column_info('crumb_crisp_coating')->{accessor}, 'trivet', + 'col_accessor_map is being run' ); # check rel naming with prepositions ok ($rsobj4->result_source->has_relationship('loader_test5s_to'), @@ -602,49 +709,58 @@ sub test_schema { "rel with preposition 'from' pluralized correctly"); # check default relationship attributes - is $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{cascade_delete}, 0, + is try { $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{cascade_delete} }, 0, 'cascade_delete => 0 on has_many by default'; - is $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{cascade_copy}, 0, + is try { $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{cascade_copy} }, 0, 'cascade_copy => 0 on has_many by default'; - ok ((not exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{on_delete}), + ok ((not try { exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{cascade_update} }), + 'has_many does not have cascade_update'); + + ok ((not try { exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{on_delete} }), 'has_many does not have on_delete'); - ok ((not exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{on_update}), + ok ((not try { exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{on_update} }), 'has_many does not have on_update'); - ok ((not exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{is_deferrable}), + ok ((not try { exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{is_deferrable} }), 'has_many does not have is_deferrable'); - is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_delete}, 'CASCADE', + is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_delete} }, 'CASCADE', "on_delete => 'CASCADE' on belongs_to by default"; - is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update}, 'CASCADE', + is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update} }, 'CASCADE', "on_update => 'CASCADE' on belongs_to by default"; - is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable}, 1, + is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable} }, 1, "is_deferrable => 1 on belongs_to by default"; - ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_delete}), + ok ((not try { exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_delete} }), 'belongs_to does not have cascade_delete'); - ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_copy}), + ok ((not try { exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_copy} }), 'belongs_to does not have cascade_copy'); - is $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{cascade_delete}, 0, + ok ((not try { exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_update} }), + 'belongs_to does not have cascade_update'); + + is try { $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{cascade_delete} }, 0, 'cascade_delete => 0 on might_have by default'; - is $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{cascade_copy}, 0, + is try { $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{cascade_copy} }, 0, 'cascade_copy => 0 on might_have by default'; - ok ((not exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{on_delete}), + is try { $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{cascade_update} }, 0, + 'cascade_update => 0 on might_have by default'; + + ok ((not try { exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{on_delete} }), 'might_have does not have on_delete'); - ok ((not exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{on_update}), + ok ((not try { exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{on_update} }), 'might_have does not have on_update'); - ok ((not exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{is_deferrable}), + ok ((not try { exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{is_deferrable} }), 'might_have does not have is_deferrable'); # find on multi-col pk @@ -658,9 +774,9 @@ sub test_schema { } # mulit-col fk def - my $obj6 = $rsobj6->find(1); - isa_ok( $obj6->loader_test2, $class2); - isa_ok( $obj6->loader_test5, $class5); + my $obj6 = try { $rsobj6->find(1) } || $rsobj6->search({ id => 1 })->first; + isa_ok( try { $obj6->loader_test2 }, $class2); + isa_ok( try { $obj6->loader_test5 }, $class5); ok($class6->column_info('loader_test2_id')->{is_foreign_key}, 'Foreign key detected'); ok($class6->column_info('id')->{is_foreign_key}, 'Foreign key detected'); @@ -670,30 +786,30 @@ sub test_schema { ok($id2_info->{is_foreign_key}, 'Foreign key detected'); # fk that references a non-pk key (UNIQUE) - my $obj8 = $rsobj8->find(1); - isa_ok( $obj8->loader_test7, $class7); + my $obj8 = try { $rsobj8->find(1) } || $rsobj8->search({ id => 1 })->first; + isa_ok( try { $obj8->loader_test7 }, $class7); ok($class8->column_info('loader_test7')->{is_foreign_key}, 'Foreign key detected'); # test double-fk 17 ->-> 16 - my $obj17 = $rsobj17->find(33); + my $obj17 = try { $rsobj17->find(33) } || $rsobj17->search({ id => 33 })->first; - my $rs_rel16_one = $obj17->loader16_one; + my $rs_rel16_one = try { $obj17->loader16_one }; isa_ok($rs_rel16_one, $class16); - is($rs_rel16_one->dat, 'y16', "Multiple FKs to same table"); + is(try { $rs_rel16_one->dat }, 'y16', "Multiple FKs to same table"); ok($class17->column_info('loader16_one')->{is_foreign_key}, 'Foreign key detected'); - my $rs_rel16_two = $obj17->loader16_two; + my $rs_rel16_two = try { $obj17->loader16_two }; isa_ok($rs_rel16_two, $class16); - is($rs_rel16_two->dat, 'z16', "Multiple FKs to same table"); + is(try { $rs_rel16_two->dat }, 'z16', "Multiple FKs to same table"); ok($class17->column_info('loader16_two')->{is_foreign_key}, 'Foreign key detected'); - my $obj16 = $rsobj16->find(2); - my $rs_rel17 = $obj16->search_related('loader_test17_loader16_ones'); - isa_ok($rs_rel17->first, $class17); - is($rs_rel17->first->id, 3, "search_related with multiple FKs from same table"); + my $obj16 = try { $rsobj16->find(2) } || $rsobj16->search({ id => 2 })->first; + my $rs_rel17 = try { $obj16->search_related('loader_test17_loader16_ones') }; + isa_ok(try { $rs_rel17->first }, $class17); + is(try { $rs_rel17->first->id }, 3, "search_related with multiple FKs from same table"); # XXX test m:m 18 <- 20 -> 19 ok($class20->column_info('parent')->{is_foreign_key}, 'Foreign key detected'); @@ -704,42 +820,42 @@ sub test_schema { ok($class22->column_info('child')->{is_foreign_key}, 'Foreign key detected'); # test double multi-col fk 26 -> 25 - my $obj26 = $rsobj26->find(33); + my $obj26 = try { $rsobj26->find(33) } || $rsobj26->search({ id => 33 })->first; - my $rs_rel25_one = $obj26->loader_test25_id_rel1; + my $rs_rel25_one = try { $obj26->loader_test25_id_rel1 }; isa_ok($rs_rel25_one, $class25); - is($rs_rel25_one->dat, 'x25', "Multiple multi-col FKs to same table"); + is(try { $rs_rel25_one->dat }, 'x25', "Multiple multi-col FKs to same table"); ok($class26->column_info('id')->{is_foreign_key}, 'Foreign key detected'); ok($class26->column_info('rel1')->{is_foreign_key}, 'Foreign key detected'); ok($class26->column_info('rel2')->{is_foreign_key}, 'Foreign key detected'); - my $rs_rel25_two = $obj26->loader_test25_id_rel2; + my $rs_rel25_two = try { $obj26->loader_test25_id_rel2 }; isa_ok($rs_rel25_two, $class25); - is($rs_rel25_two->dat, 'y25', "Multiple multi-col FKs to same table"); + is(try { $rs_rel25_two->dat }, 'y25', "Multiple multi-col FKs to same table"); - my $obj25 = $rsobj25->find(3,42); - my $rs_rel26 = $obj25->search_related('loader_test26_id_rel1s'); - isa_ok($rs_rel26->first, $class26); - is($rs_rel26->first->id, 3, "search_related with multiple multi-col FKs from same table"); + my $obj25 = try { $rsobj25->find(3,42) } || $rsobj25->search({ id1 => 3, id2 => 42 })->first; + my $rs_rel26 = try { $obj25->search_related('loader_test26_id_rel1s') }; + isa_ok(try { $rs_rel26->first }, $class26); + is(try { $rs_rel26->first->id }, 3, "search_related with multiple multi-col FKs from same table"); # test one-to-one rels - my $obj27 = $rsobj27->find(1); - my $obj28 = $obj27->loader_test28; + my $obj27 = try { $rsobj27->find(1) } || $rsobj27->search({ id => 1 })->first; + my $obj28 = try { $obj27->loader_test28 }; isa_ok($obj28, $class28); - is($obj28->get_column('id'), 1, "One-to-one relationship with PRIMARY FK"); + is(try { $obj28->get_column('id') }, 1, "One-to-one relationship with PRIMARY FK"); ok($class28->column_info('id')->{is_foreign_key}, 'Foreign key detected'); - my $obj29 = $obj27->loader_test29; + my $obj29 = try { $obj27->loader_test29 }; isa_ok($obj29, $class29); - is($obj29->id, 1, "One-to-one relationship with UNIQUE FK"); + is(try { $obj29->id }, 1, "One-to-one relationship with UNIQUE FK"); ok($class29->column_info('fk')->{is_foreign_key}, 'Foreign key detected'); - $obj27 = $rsobj27->find(2); - is($obj27->loader_test28, undef, "Undef for missing one-to-one row"); - is($obj27->loader_test29, undef, "Undef for missing one-to-one row"); + $obj27 = try { $rsobj27->find(2) } || $rsobj27->search({ id => 2 })->first; + is(try { $obj27->loader_test28 }, undef, "Undef for missing one-to-one row"); + is(try { $obj27->loader_test29 }, undef, "Undef for missing one-to-one row"); # test outer join for nullable referring columns: is $class32->column_info('rel2')->{is_nullable}, 1, @@ -748,10 +864,15 @@ sub test_schema { ok($class32->column_info('rel1')->{is_foreign_key}, 'Foreign key detected'); ok($class32->column_info('rel2')->{is_foreign_key}, 'Foreign key detected'); - my $obj32 = $rsobj32->find(1,{prefetch=>[qw/rel1 rel2/]}); - my $obj34 = $rsobj34->find( - 1,{prefetch=>[qw/loader_test33_id_rel1 loader_test33_id_rel2/]} - ); + my $obj32 = try { $rsobj32->find(1, { prefetch => [qw/rel1 rel2/] }) } + || try { $rsobj32->search({ id => 1 }, { prefetch => [qw/rel1 rel2/] })->first } + || $rsobj32->search({ id => 1 })->first; + + my $obj34 = eval { $rsobj34->find(1, { prefetch => [qw/loader_test33_id_rel1 loader_test33_id_rel2/] }) } + || eval { $rsobj34->search({ id => 1 }, { prefetch => [qw/loader_test33_id_rel1 loader_test33_id_rel2/] })->first } + || $rsobj34->search({ id => 1 })->first; + diag $@ if $@; + isa_ok($obj32,$class32); isa_ok($obj34,$class34); @@ -759,16 +880,16 @@ sub test_schema { ok($class34->column_info('rel1')->{is_foreign_key}, 'Foreign key detected'); ok($class34->column_info('rel2')->{is_foreign_key}, 'Foreign key detected'); - my $rs_rel31_one = $obj32->rel1; - my $rs_rel31_two = $obj32->rel2; + my $rs_rel31_one = try { $obj32->rel1 }; + my $rs_rel31_two = try { $obj32->rel2 }; isa_ok($rs_rel31_one, $class31); is($rs_rel31_two, undef); - my $rs_rel33_one = $obj34->loader_test33_id_rel1; - my $rs_rel33_two = $obj34->loader_test33_id_rel2; + my $rs_rel33_one = try { $obj34->loader_test33_id_rel1 }; + my $rs_rel33_two = try { $obj34->loader_test33_id_rel2 }; - isa_ok($rs_rel33_one,$class33); - is($rs_rel33_two, undef); + isa_ok($rs_rel33_one, $class33); + isa_ok($rs_rel33_two, $class33); # from Chisel's tests... my $moniker10 = $monikers->{loader_test10}; @@ -790,7 +911,7 @@ sub test_schema { $obj10->update(); ok( defined $obj10, 'Create row' ); - my $obj11 = $rsobj11->create({ loader_test10 => $obj10->id() }); + my $obj11 = $rsobj11->create({ loader_test10 => (try { $obj10->id() } || $obj10->id10) }); $obj11->update(); ok( defined $obj11, 'Create related row' ); @@ -832,13 +953,13 @@ sub test_schema { ok($class13->column_info('loader_test12')->{is_foreign_key}, 'Foreign key detected'); ok($class13->column_info('dat')->{is_foreign_key}, 'Foreign key detected'); - my $obj13 = $rsobj13->find(1); + my $obj13 = try { $rsobj13->find(1) } || $rsobj13->search({ id => 1 })->first; isa_ok( $obj13->id, $class12 ); isa_ok( $obj13->loader_test12, $class12); isa_ok( $obj13->dat, $class12); - my $obj12 = $rsobj12->find(1); - isa_ok( $obj12->loader_test13, $class13 ); + my $obj12 = try { $rsobj12->find(1) } || $rsobj12->search({ id => 1 })->first; + isa_ok( try { $obj12->loader_test13 }, $class13 ); # relname is preserved when another fk is added @@ -847,10 +968,12 @@ sub test_schema { { local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /invalidates \d+ active statement/ }; - $conn->storage->disconnect; # for mssql + $conn->storage->disconnect; # for mssql and access } - isa_ok $rsobj3->find(1)->loader_test4zes, 'DBIx::Class::ResultSet'; + isa_ok try { $rsobj3->find(1)->loader_test4zes }, 'DBIx::Class::ResultSet'; + + $conn->storage->disconnect; # for access $conn->storage->dbh->do('ALTER TABLE loader_test4 ADD fkid2 INTEGER REFERENCES loader_test3 (id)'); @@ -858,7 +981,7 @@ sub test_schema { $self->rescan_without_warnings($conn); - isa_ok eval { $rsobj3->find(1)->loader_test4zes }, 'DBIx::Class::ResultSet', + isa_ok try { $rsobj3->find(1)->loader_test4zes }, 'DBIx::Class::ResultSet', 'relationship name preserved when another foreign key is added in remote table'; } @@ -878,7 +1001,7 @@ sub test_schema { ok($class15->column_info('loader_test14')->{is_foreign_key}, 'Foreign key detected'); - my $obj15 = $rsobj15->find(1); + my $obj15 = try { $rsobj15->find(1) } || $rsobj15->search({ id => 1 })->first; isa_ok( $obj15->loader_test14, $class14 ); } } @@ -961,7 +1084,7 @@ sub test_schema { SKIP: { skip 'no rels', 2 if $self->{skip_rels}; - my $obj30 = $rsobj30->find(123); + my $obj30 = try { $rsobj30->find(123) } || $rsobj30->search({ id => 123 })->first; isa_ok( $obj30->loader_test2, $class2); ok($rsobj30->result_source->column_info('loader_test2')->{is_foreign_key}, @@ -995,24 +1118,30 @@ sub test_schema { sub test_data_types { my ($self, $conn) = @_; - if ($self->{data_type_tests}{test_count}) { - my $data_type_tests = $self->{data_type_tests}; + SKIP: { + if (my $test_count = $self->{data_type_tests}{test_count}) { + if ($self->{vendor} eq 'mssql' && $conn->storage->dbh->{Driver}{Name} eq 'Sybase') { + skip 'DBD::Sybase does not work with the data_type tests on latest SQL Server', $test_count; + } + + my $data_type_tests = $self->{data_type_tests}; - foreach my $moniker (@{ $data_type_tests->{table_monikers} }) { - my $columns = $data_type_tests->{columns}{$moniker}; + foreach my $moniker (@{ $data_type_tests->{table_monikers} }) { + my $columns = $data_type_tests->{columns}{$moniker}; - my $rsrc = $conn->resultset($moniker)->result_source; + my $rsrc = $conn->resultset($moniker)->result_source; - while (my ($col_name, $expected_info) = each %$columns) { - my %info = %{ $rsrc->column_info($col_name) }; - delete @info{qw/is_nullable timezone locale sequence/}; + while (my ($col_name, $expected_info) = each %$columns) { + my %info = %{ $rsrc->column_info($col_name) }; + delete @info{qw/is_nullable timezone locale sequence/}; - my $text_col_def = dumper_squashed \%info; + my $text_col_def = dumper_squashed \%info; - my $text_expected_info = dumper_squashed $expected_info; + my $text_expected_info = dumper_squashed $expected_info; - is_deeply \%info, $expected_info, - "test column $col_name has definition: $text_col_def expecting: $text_expected_info"; + is_deeply \%info, $expected_info, + "test column $col_name has definition: $text_col_def expecting: $text_expected_info"; + } } } } @@ -1047,15 +1176,20 @@ qq| INSERT INTO ${oqt}LoaderTest41${cqt} VALUES (1, 1) |, local $conn->_loader->{preserve_case} = 1; $conn->_loader->_setup; - $self->rescan_without_warnings($conn); if (not $self->{skip_rels}) { - is $conn->resultset('LoaderTest41')->find(1)->loader_test40->foo3_bar, 'foo', - 'rel and accessor for mixed-case column name in mixed case table'; + ok my $row = try { $conn->resultset('LoaderTest41')->find(1) }, + 'row in mixed-case table'; + ok my $related_row = try { $row->loader_test40 }, + 'rel in mixed-case table'; + is try { $related_row->foo3_bar }, 'foo', + 'accessor for mixed-case column name in mixed case table'; } else { - is $conn->resultset('LoaderTest40')->find(1)->foo3_bar, 'foo', + SKIP: { skip 'not testing mixed-case rels with skip_rels', 2 } + + is try { $conn->resultset('LoaderTest40')->find(1)->foo3_bar }, 'foo', 'accessor for mixed-case column name in mixed case table'; } } @@ -1112,7 +1246,7 @@ sub dbconnect { }, ]); - my $dbh = eval { $storage->dbh }; + my $dbh = $storage->dbh; die "Failed to connect to database: $@" if !$dbh; $self->{storage} = $storage; # storage DESTROY disconnects @@ -1170,7 +1304,11 @@ sub create { set_primary_key INTEGER $self->{null}, can INTEGER $self->{null}, dbix_class_testcomponent INTEGER $self->{null}, + dbix_class_testcomponentformap INTEGER $self->{null}, + testcomponent_fqn INTEGER $self->{null}, meta INTEGER $self->{null}, + test_role_method INTEGER $self->{null}, + test_role_for_map_method INTEGER $self->{null}, UNIQUE (dat2, dat) ) $self->{innodb} }, @@ -1195,7 +1333,8 @@ sub create { ) $self->{innodb} }, - qq{ +# Access does not support DEFAULT + $self->{vendor} ne 'Access' ? qq{ CREATE TABLE loader_test35 ( id INTEGER NOT NULL PRIMARY KEY, a_varchar VARCHAR(100) DEFAULT 'foo', @@ -1205,6 +1344,16 @@ sub create { a_negative_double DOUBLE PRECISION DEFAULT -10.555, a_function $self->{default_function_def} ) $self->{innodb} + } : qq{ + CREATE TABLE loader_test35 ( + id INTEGER NOT NULL PRIMARY KEY, + a_varchar VARCHAR(100), + an_int INTEGER, + a_negative_int INTEGER, + a_double DOUBLE, + a_negative_double DOUBLE, + a_function DATETIME + ) }, qq{ @@ -1238,14 +1387,19 @@ sub create { id INTEGER NOT NULL PRIMARY KEY, fkid INTEGER NOT NULL, dat VARCHAR(32), - FOREIGN KEY( fkid ) REFERENCES loader_test3 (id) + crumb_crisp_coating VARCHAR(32) $self->{null}, + belongs_to INTEGER $self->{null}, + set_primary_key INTEGER $self->{null}, + FOREIGN KEY( fkid ) REFERENCES loader_test3 (id), + FOREIGN KEY( belongs_to ) REFERENCES loader_test3 (id), + FOREIGN KEY( set_primary_key ) REFERENCES loader_test3 (id) ) $self->{innodb} }, - q{ INSERT INTO loader_test4 (id,fkid,dat) VALUES(123,1,'aaa') }, - q{ INSERT INTO loader_test4 (id,fkid,dat) VALUES(124,2,'bbb') }, - q{ INSERT INTO loader_test4 (id,fkid,dat) VALUES(125,3,'ccc') }, - q{ INSERT INTO loader_test4 (id,fkid,dat) VALUES(126,4,'ddd') }, + q{ INSERT INTO loader_test4 (id,fkid,dat,belongs_to,set_primary_key) VALUES(123,1,'aaa',1,1) }, + q{ INSERT INTO loader_test4 (id,fkid,dat,belongs_to,set_primary_key) VALUES(124,2,'bbb',2,2) }, + q{ INSERT INTO loader_test4 (id,fkid,dat,belongs_to,set_primary_key) VALUES(125,3,'ccc',3,3) }, + q{ INSERT INTO loader_test4 (id,fkid,dat,belongs_to,set_primary_key) VALUES(126,4,'ddd',4,4) }, qq| CREATE TABLE loader_test5 ( @@ -1480,7 +1634,7 @@ sub create { FOREIGN KEY (id,rel2) REFERENCES loader_test33(id1,id2) ) $self->{innodb} }, - q{ INSERT INTO loader_test34 (id,rel1) VALUES (1,2) }, + q{ INSERT INTO loader_test34 (id,rel1,rel2) VALUES (1,2,2) }, ); @statements_advanced = ( @@ -1493,10 +1647,11 @@ sub create { }, $make_auto_inc->(qw/loader_test10 id10/), +# Access does not support DEFAULT. qq{ CREATE TABLE loader_test11 ( id11 $self->{auto_inc_pk}, - a_message VARCHAR(8) DEFAULT 'foo', + a_message VARCHAR(8) @{[ $self->{vendor} ne 'Access' ? "DEFAULT 'foo'" : '' ]}, loader_test10 INTEGER $self->{null}, FOREIGN KEY (loader_test10) REFERENCES loader_test10 (id10) ) $self->{innodb} @@ -1591,13 +1746,23 @@ sub create { $dbh->do($_) foreach (@statements); - $dbh->do($_) foreach (@{ $self->{data_type_tests}{ddl} || [] }); + if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) { + $dbh->do($_) foreach (@{ $self->{data_type_tests}{ddl} || [] }); + } unless($self->{skip_rels}) { # hack for now, since DB2 doesn't like inline comments, and we need # to test one for mysql, which works on everyone else... # this all needs to be refactored anyways. - $dbh->do($_) for (@statements_reltests); + + for my $stmt (@statements_reltests) { + try { + $dbh->do($stmt); + } + catch { + die "Error executing '$stmt': $_\n"; + }; + } if($self->{vendor} =~ /sqlite/i) { $dbh->do($_) for (@statements_advanced_sqlite); } @@ -1693,45 +1858,49 @@ sub drop_tables { # For some reason some tests do this twice (I guess dependency issues?) # do it twice for all drops for (1,2) { - my $dbh = $self->dbconnect(0); + local $^W = 0; # for ADO - $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] }; + my $dbh = $self->dbconnect(0); - $dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] }; + $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] }; - my $drop_auto_inc = $self->{auto_inc_drop_cb} || sub {}; + $dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] }; - unless($self->{skip_rels}) { - $dbh->do("DROP TABLE $_") for (@tables_reltests); - $dbh->do("DROP TABLE $_") for (@tables_reltests); - if($self->{vendor} =~ /mysql/i) { - $dbh->do($drop_fk_mysql); - } - else { - $dbh->do($drop_fk); - } - $dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_advanced_auto_inc; - $dbh->do("DROP TABLE $_") for (@tables_advanced); + my $drop_auto_inc = $self->{auto_inc_drop_cb} || sub {}; - unless($self->{no_inline_rels}) { - $dbh->do("DROP TABLE $_") for (@tables_inline_rels); - } - unless($self->{no_implicit_rels}) { - $dbh->do("DROP TABLE $_") for (@tables_implicit_rels); + unless($self->{skip_rels}) { + $dbh->do("DROP TABLE $_") for (@tables_reltests); + $dbh->do("DROP TABLE $_") for (@tables_reltests); + if($self->{vendor} =~ /mysql/i) { + $dbh->do($drop_fk_mysql); + } + else { + $dbh->do($drop_fk); + } + $dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_advanced_auto_inc; + $dbh->do("DROP TABLE $_") for (@tables_advanced); + + unless($self->{no_inline_rels}) { + $dbh->do("DROP TABLE $_") for (@tables_inline_rels); + } + unless($self->{no_implicit_rels}) { + $dbh->do("DROP TABLE $_") for (@tables_implicit_rels); + } } - } - $dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_auto_inc; - $dbh->do("DROP TABLE $_") for (@tables, @tables_rescan); + $dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_auto_inc; + $dbh->do("DROP TABLE $_") for (@tables, @tables_rescan); - foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) { - $dbh->do("DROP TABLE $data_type_table"); - } + if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) { + foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) { + $dbh->do("DROP TABLE $data_type_table"); + } + } - my ($oqt, $cqt) = $self->get_oqt_cqt(always => 1); + my ($oqt, $cqt) = $self->get_oqt_cqt(always => 1); - $dbh->do("DROP TABLE ${oqt}${_}${cqt}") for @tables_preserve_case_tests; + $dbh->do("DROP TABLE ${oqt}${_}${cqt}") for @tables_preserve_case_tests; - $dbh->disconnect; + $dbh->disconnect; } } @@ -1859,6 +2028,20 @@ sub rescan_without_warnings { return $conn->rescan; } +sub test_col_accessor_map { + my ( $column_name, $default_name, $context ) = @_; + 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_name table_class table_moniker schema_class ); + + return 'trivet'; + } else { + return $default_name; + } +} + sub DESTROY { my $self = shift; unless ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}) {