X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fdbixcsl_common_tests.pm;h=e4aa0d284c9ede41f12a291b02f8fbd15bfb652d;hb=3b29d0ac123eb9c259f687278ece7f2a98c8cb71;hp=bd5ae52b135bea9d897c477f54f39c315691ea7c;hpb=7cb9244f9742355f71a24efa0d6d4c076c8a5bf3;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm index bd5ae52..e4aa0d2 100644 --- a/t/lib/dbixcsl_common_tests.pm +++ b/t/lib/dbixcsl_common_tests.pm @@ -4,10 +4,16 @@ use strict; use warnings; use Test::More; +use Test::Exception; use DBIx::Class::Schema::Loader; use Class::Unload; use File::Path; use DBI; +use Digest::MD5; +use File::Find 'find'; +use Class::Unload (); +use Data::Dumper::Concise; +use List::MoreUtils 'apply'; my $DUMP_DIR = './t/_common_dump'; rmtree $DUMP_DIR; @@ -28,7 +34,7 @@ sub new { # Only MySQL uses this $self->{innodb} ||= ''; - # DB2 doesn't support this + # DB2 and Firebird don't support 'field type NULL' $self->{null} = 'NULL' unless defined $self->{null}; $self->{verbose} = $ENV{TEST_VERBOSE} || 0; @@ -36,7 +42,17 @@ sub new { # Optional extra tables and tests $self->{extra} ||= {}; - return bless $self => $class; + $self->{date_datatype} ||= 'DATE'; + + # Not all DBS do SQL-standard CURRENT_TIMESTAMP + $self->{default_function} ||= "current_timestamp"; + $self->{default_function_def} ||= "timestamp default $self->{default_function}"; + + $self = bless $self, $class; + + $self->setup_data_type_tests; + + return $self; } sub skip_tests { @@ -54,26 +70,106 @@ sub _monikerize { sub run_tests { my $self = shift; - plan tests => 3 + 134 + ($self->{extra}->{count} || 0); + my @connect_info; + + if ($self->{dsn}) { + push @connect_info, [ @{$self}{qw/dsn user password connect_info_opts/ } ]; + } + else { + foreach my $info (@{ $self->{connect_info} || [] }) { + push @connect_info, [ @{$info}{qw/dsn user password connect_info_opts/ } ]; + } + } + + if ($ENV{SCHEMA_LOADER_TESTS_EXTRA_ONLY}) { + $self->run_only_extra_tests(\@connect_info); + return; + } + + my $extra_count = $self->{extra}{count} || 0; - $self->create(); + plan tests => @connect_info * (178 + $extra_count + ($self->{data_type_tests}{test_count} || 0)); - my @connect_info = ( - $self->{dsn}, - $self->{user}, - $self->{password}, - $self->{connect_info_opts}, - ); + foreach my $info_idx (0..$#connect_info) { + my $info = $connect_info[$info_idx]; - # First, with in-memory classes - my $schema_class = $self->setup_schema(@connect_info); - $self->test_schema($schema_class); - $self->drop_tables; + @{$self}{qw/dsn user password connect_info_opts/} = @$info; + + $self->create(); + + my $schema_class = $self->setup_schema($info); + $self->test_schema($schema_class); + + rmtree $DUMP_DIR + unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} && $info_idx == $#connect_info; + } } -sub setup_schema { +sub run_only_extra_tests { + my ($self, $connect_info) = @_; + + plan tests => @$connect_info * (4 + ($self->{extra}{count} || 0) + ($self->{data_type_tests}{test_count} || 0)); + + rmtree $DUMP_DIR; + + foreach my $info_idx (0..$#$connect_info) { + my $info = $connect_info->[$info_idx]; + + @{$self}{qw/dsn user password connect_info_opts/} = @$info; + + $self->drop_extra_tables_only; + + my $dbh = $self->dbconnect(1); + { + # Silence annoying but harmless postgres "NOTICE: CREATE TABLE..." + local $SIG{__WARN__} = sub { + my $msg = shift; + warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE}; + }; + + + $dbh->do($_) for @{ $self->{extra}{create} || [] }; + $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++ if $self->{data_type_tests}{ddl}; + + my $schema_class = $self->setup_schema($info, $file_count); + my ($monikers, $classes) = $self->monikers_and_classes($schema_class); + my $conn = $schema_class->clone; + + $self->test_data_types($conn); + $self->{extra}{run}->($conn, $monikers, $classes) if $self->{extra}{run}; + + if (not ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} && $info_idx == $#$connect_info)) { + $self->drop_extra_tables_only; + rmtree $DUMP_DIR; + } + } +} + +sub drop_extra_tables_only { my $self = shift; - my @connect_info = @_; + + my $dbh = $self->dbconnect(0); + $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"); + } +} + +# defined in sub create +my (@statements, @statements_reltests, @statements_advanced, + @statements_advanced_sqlite, @statements_inline_rels, + @statements_implicit_rels); + +sub setup_schema { + my ($self, $connect_info, $expected_count) = @_; my $schema_class = 'DBIXCSL_Test::Schema'; @@ -81,7 +177,7 @@ sub setup_schema { my %loader_opts = ( constraint => - qr/^(?:\S+\.)?(?:$self->{vendor}_)?loader_test[0-9]+(?!.*_)/i, + qr/^(?:\S+\.)?(?:(?:$self->{vendor}|extra)_)?loader_test[0-9]+(?!.*_)/i, relationships => 1, additional_classes => 'TestAdditional', additional_base_classes => 'TestAdditionalBase', @@ -91,44 +187,91 @@ sub setup_schema { inflect_plural => { loader_test4 => 'loader_test4zes' }, inflect_singular => { fkid => 'fkid_singular' }, moniker_map => \&_monikerize, + custom_column_info => \&_custom_column_info, debug => $debug, + use_namespaces => 0, dump_directory => $DUMP_DIR, + datetime_timezone => 'Europe/Berlin', + datetime_locale => 'de_DE', + %{ $self->{loader_options} || {} }, ); $loader_opts{db_schema} = $self->{db_schema} if $self->{db_schema}; - { - my @loader_warnings; - local $SIG{__WARN__} = sub { push(@loader_warnings, $_[0]); }; - eval qq{ - package $schema_class; - use base qw/DBIx::Class::Schema::Loader/; - - __PACKAGE__->loader_options(\%loader_opts); - __PACKAGE__->connection(\@connect_info); - }; + Class::Unload->unload($schema_class); + my $file_count; + { + my @loader_warnings; + local $SIG{__WARN__} = sub { push(@loader_warnings, $_[0]); }; + eval qq{ + package $schema_class; + use base qw/DBIx::Class::Schema::Loader/; + + __PACKAGE__->loader_options(\%loader_opts); + __PACKAGE__->connection(\@\$connect_info); + }; + ok(!$@, "Loader initialization") or diag $@; - my $warn_count = 2; - $warn_count++ if grep /ResultSetManager/, @loader_warnings; + find sub { return if -d; $file_count++ }, $DUMP_DIR; - if($self->{skip_rels}) { - SKIP: { - is(scalar(@loader_warnings), $warn_count, "No loader warnings") + my $standard_sources = not defined $expected_count; + + if ($standard_sources) { + $expected_count = 36 + ($self->{data_type_tests}{test_count} ? 1 : 0); + + $expected_count += grep /CREATE (?:TABLE|VIEW)/i, + @{ $self->{extra}{create} || [] }; + + $expected_count -= grep /CREATE TABLE/, @statements_inline_rels + if $self->{skip_rels} || $self->{no_inline_rels}; + + $expected_count -= grep /CREATE TABLE/, @statements_implicit_rels + if $self->{skip_rels} || $self->{no_implicit_rels}; + + $expected_count -= grep /CREATE TABLE/, ($self->{vendor} =~ /sqlite/ ? @statements_advanced_sqlite : @statements_advanced), @statements_reltests + if $self->{skip_rels}; + } + + is $file_count, $expected_count, 'correct number of files generated'; + + my $warn_count = 2; + $warn_count++ if grep /ResultSetManager/, @loader_warnings; + + $warn_count++ for grep /^Bad table or view/, @loader_warnings; + + $warn_count++ for grep /renaming \S+ relation/, @loader_warnings; + + $warn_count++ for grep /\b(?!loader_test9)\w+ has no primary key/i, @loader_warnings; + + if ($standard_sources) { + if($self->{skip_rels}) { + SKIP: { + is(scalar(@loader_warnings), $warn_count, "No loader warnings") + or diag @loader_warnings; + skip "No missing PK warnings without rels", 1; + } + } + else { + $warn_count++; + is(scalar(@loader_warnings), $warn_count, "Expected loader warning") or diag @loader_warnings; - skip "No missing PK warnings without rels", 1; + is(grep(/loader_test9 has no primary key/i, @loader_warnings), 1, + "Missing PK warning"); } } else { - $warn_count++; - is(scalar(@loader_warnings), $warn_count, "Expected loader warning") - or diag @loader_warnings; - is(grep(/loader_test9 has no primary key/, @loader_warnings), 1, - "Missing PK warning"); + SKIP: { + is scalar(@loader_warnings), $warn_count, 'Correct number of warnings' + or diag @loader_warnings; + skip "not testing standard sources", 1; + } } } - + + exit if $file_count != $expected_count; + return $schema_class; } @@ -137,13 +280,10 @@ sub test_schema { my $schema_class = shift; my $conn = $schema_class->clone; - my $monikers = {}; - my $classes = {}; - foreach my $source_name ($schema_class->sources) { - my $table_name = $schema_class->source($source_name)->from; - $monikers->{$table_name} = $source_name; - $classes->{$table_name} = $schema_class . q{::} . $source_name; - } + + ($self->{before_tests_run} || sub {})->($conn); + + my ($monikers, $classes) = $self->monikers_and_classes($schema_class); my $moniker1 = $monikers->{loader_test1s}; my $class1 = $classes->{loader_test1s}; @@ -155,21 +295,32 @@ sub test_schema { my $rsobj2 = $conn->resultset($moniker2); check_no_duplicate_unique_constraints($class2); - my $moniker23 = $monikers->{LOADER_TEST23}; - my $class23 = $classes->{LOADER_TEST23}; + my $moniker23 = $monikers->{LOADER_test23} || $monikers->{loader_test23}; + my $class23 = $classes->{LOADER_test23} || $classes->{loader_test23}; my $rsobj23 = $conn->resultset($moniker1); - my $moniker24 = $monikers->{LoAdEr_test24}; - my $class24 = $classes->{LoAdEr_test24}; + my $moniker24 = $monikers->{LoAdEr_test24} || $monikers->{loader_test24}; + my $class24 = $classes->{LoAdEr_test24} || $classes->{loader_test24}; my $rsobj24 = $conn->resultset($moniker2); + my $moniker35 = $monikers->{loader_test35}; + my $class35 = $classes->{loader_test35}; + my $rsobj35 = $conn->resultset($moniker35); + isa_ok( $rsobj1, "DBIx::Class::ResultSet" ); isa_ok( $rsobj2, "DBIx::Class::ResultSet" ); isa_ok( $rsobj23, "DBIx::Class::ResultSet" ); isa_ok( $rsobj24, "DBIx::Class::ResultSet" ); + isa_ok( $rsobj35, "DBIx::Class::ResultSet" ); my @columns_lt2 = $class2->columns; - is_deeply( \@columns_lt2, [ qw/id dat dat2/ ], "Column Ordering" ); + is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key dbix_class_testcomponent/ ], "Column Ordering" ); + + is $class2->column_info('set_primary_key')->{accessor}, undef, + 'accessor for column name that conflicts with a result base class method removed'; + + is $class2->column_info('dbix_class_testcomponent')->{accessor}, undef, + 'accessor for column name that conflicts with a component class method removed'; my %uniq1 = $class1->unique_constraints; my $uniq1_test = 0; @@ -249,7 +400,7 @@ sub test_schema { is( $rsobj1->loader_test1_rsmeth, 'all is still well', 'Result set method' ); } - ok( $class1->column_info('id')->{is_auto_increment}, 'is_auto_incrment detection' ); + 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" ); @@ -270,8 +421,31 @@ 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', + ); + + 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', + ); + + 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}, 96 if $self->{skip_rels}; + skip $self->{skip_rels}, 116 if $self->{skip_rels}; my $moniker3 = $monikers->{loader_test3}; my $class3 = $classes->{loader_test3}; @@ -365,6 +539,10 @@ sub test_schema { my $class34 = $classes->{loader_test34}; my $rsobj34 = $conn->resultset($moniker34); + my $moniker36 = $monikers->{loader_test36}; + my $class36 = $classes->{loader_test36}; + my $rsobj36 = $conn->resultset($moniker36); + isa_ok( $rsobj3, "DBIx::Class::ResultSet" ); isa_ok( $rsobj4, "DBIx::Class::ResultSet" ); isa_ok( $rsobj5, "DBIx::Class::ResultSet" ); @@ -388,6 +566,7 @@ sub test_schema { isa_ok( $rsobj32, "DBIx::Class::ResultSet" ); isa_ok( $rsobj33, "DBIx::Class::ResultSet" ); isa_ok( $rsobj34, "DBIx::Class::ResultSet" ); + isa_ok( $rsobj36, "DBIx::Class::ResultSet" ); # basic rel test my $obj4 = $rsobj4->find(123); @@ -399,13 +578,66 @@ sub test_schema { my $rs_rel4 = $obj3->search_related('loader_test4zes'); isa_ok( $rs_rel4->first, $class4); + # check rel naming with prepositions + ok ($rsobj4->result_source->has_relationship('loader_test5s_to'), + "rel with preposition 'to' pluralized correctly"); + + ok ($rsobj4->result_source->has_relationship('loader_test5s_from'), + "rel with preposition 'from' pluralized correctly"); + + # check default relationship attributes + is $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, + 'cascade_copy => 0 on has_many by default'; + + ok ((not 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}), + 'has_many does not have on_update'); + + ok ((not 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', + "on_delete => 'CASCADE' on belongs_to by default"; + + is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update}, 'CASCADE', + "on_update => 'CASCADE' on belongs_to by default"; + + ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable}), + "is_deferrable => 1 not on belongs_to by default"); + + ok ((not 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}), + 'belongs_to does not have cascade_copy'); + + is $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, + 'cascade_copy => 0 on might_have by default'; + + ok ((not 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}), + 'might_have does not have on_update'); + + ok ((not exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{is_deferrable}), + 'might_have does not have is_deferrable'); + # find on multi-col pk my $obj5 = eval { $rsobj5->find({id1 => 1, iD2 => 1}) } || eval { $rsobj5->find({id1 => 1, id2 => 1}) }; die $@ if $@; - is( $obj5->id2, 1, "Find on multi-col PK" ); + is( (eval { $obj5->id2 } || eval { $obj5->i_d2 }), 1, "Find on multi-col PK" ); # mulit-col fk def my $obj6 = $rsobj6->find(1); @@ -492,92 +724,79 @@ sub test_schema { is($obj27->loader_test29, undef, "Undef for missing one-to-one row"); # test outer join for nullable referring columns: - SKIP: { - skip "unreliable column info from db driver",11 unless - ($class32->column_info('rel2')->{is_nullable}); - - 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 $skip_outerjoin; - isa_ok($obj32,$class32) or $skip_outerjoin = 1; - isa_ok($obj34,$class34) or $skip_outerjoin = 1; - - ok($class34->column_info('id')->{is_foreign_key}, 'Foreign key detected'); - ok($class34->column_info('rel1')->{is_foreign_key}, 'Foreign key detected'); - ok($class34->column_info('rel2')->{is_foreign_key}, 'Foreign key detected'); - - SKIP: { - skip "Pre-requisite test failed", 4 if $skip_outerjoin; - my $rs_rel31_one = $obj32->rel1; - my $rs_rel31_two = $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; - - isa_ok($rs_rel33_one,$class33); - is($rs_rel33_two, undef); - - } - } + is $class32->column_info('rel2')->{is_nullable}, 1, + 'is_nullable detection'; - # from Chisel's tests... - SKIP: { - if($self->{vendor} =~ /sqlite/i) { - skip 'SQLite cannot do the advanced tests', 10; - } + 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/]} + ); + isa_ok($obj32,$class32); + isa_ok($obj34,$class34); - my $moniker10 = $monikers->{loader_test10}; - my $class10 = $classes->{loader_test10}; - my $rsobj10 = $conn->resultset($moniker10); + ok($class34->column_info('id')->{is_foreign_key}, 'Foreign key detected'); + ok($class34->column_info('rel1')->{is_foreign_key}, 'Foreign key detected'); + ok($class34->column_info('rel2')->{is_foreign_key}, 'Foreign key detected'); - my $moniker11 = $monikers->{loader_test11}; - my $class11 = $classes->{loader_test11}; - my $rsobj11 = $conn->resultset($moniker11); + my $rs_rel31_one = $obj32->rel1; + my $rs_rel31_two = $obj32->rel2; + isa_ok($rs_rel31_one, $class31); + is($rs_rel31_two, undef); - isa_ok( $rsobj10, "DBIx::Class::ResultSet" ); - isa_ok( $rsobj11, "DBIx::Class::ResultSet" ); + my $rs_rel33_one = $obj34->loader_test33_id_rel1; + my $rs_rel33_two = $obj34->loader_test33_id_rel2; - ok($class10->column_info('loader_test11')->{is_foreign_key}, 'Foreign key detected'); - ok($class11->column_info('loader_test10')->{is_foreign_key}, 'Foreign key detected'); + isa_ok($rs_rel33_one,$class33); + is($rs_rel33_two, undef); - my $obj10 = $rsobj10->create({ subject => 'xyzzy' }); + # from Chisel's tests... + my $moniker10 = $monikers->{loader_test10}; + my $class10 = $classes->{loader_test10}; + my $rsobj10 = $conn->resultset($moniker10); - $obj10->update(); - ok( defined $obj10, 'Create row' ); + my $moniker11 = $monikers->{loader_test11}; + my $class11 = $classes->{loader_test11}; + my $rsobj11 = $conn->resultset($moniker11); - my $obj11 = $rsobj11->create({ loader_test10 => $obj10->id() }); - $obj11->update(); - ok( defined $obj11, 'Create related row' ); + isa_ok( $rsobj10, "DBIx::Class::ResultSet" ); + isa_ok( $rsobj11, "DBIx::Class::ResultSet" ); - eval { - my $obj10_2 = $obj11->loader_test10; - $obj10_2->loader_test11( $obj11->id11() ); - $obj10_2->update(); - }; - ok(!$@, "Setting up circular relationship"); + ok($class10->column_info('loader_test11')->{is_foreign_key}, 'Foreign key detected'); + ok($class11->column_info('loader_test10')->{is_foreign_key}, 'Foreign key detected'); - SKIP: { - skip 'Previous eval block failed', 3 if $@; - - my $results = $rsobj10->search({ subject => 'xyzzy' }); - is( $results->count(), 1, 'No duplicate row created' ); + my $obj10 = $rsobj10->create({ subject => 'xyzzy' }); - my $obj10_3 = $results->first(); - isa_ok( $obj10_3, $class10 ); - is( $obj10_3->loader_test11()->id(), $obj11->id(), - 'Circular rel leads back to same row' ); - } + $obj10->update(); + ok( defined $obj10, 'Create row' ); + + my $obj11 = $rsobj11->create({ loader_test10 => $obj10->id() }); + $obj11->update(); + ok( defined $obj11, 'Create related row' ); + + eval { + my $obj10_2 = $obj11->loader_test10; + $obj10_2->update({ loader_test11 => $obj11->id11 }); + }; + diag $@ if $@; + ok(!$@, "Setting up circular relationship"); + + SKIP: { + skip 'Previous eval block failed', 3 if $@; + + my $results = $rsobj10->search({ subject => 'xyzzy' }); + is( $results->count(), 1, 'No duplicate row created' ); + + my $obj10_3 = $results->first(); + isa_ok( $obj10_3, $class10 ); + is( $obj10_3->loader_test11()->id(), $obj11->id(), + 'Circular rel leads back to same row' ); } SKIP: { - skip 'This vendor cannot do inline relationship definitions', 8 + skip 'This vendor cannot do inline relationship definitions', 9 if $self->{no_inline_rels}; my $moniker12 = $monikers->{loader_test12}; @@ -599,6 +818,9 @@ sub test_schema { 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 ); } SKIP: { @@ -622,11 +844,27 @@ sub test_schema { } } - # rescan test - SKIP: { - skip $self->{skip_rels}, 4 if $self->{skip_rels}; - skip "Can't rescan dumped schema", 4 if $self->{dump}; + # test custom_column_info and datetime_timezone/datetime_locale + { + my $class35 = $classes->{loader_test35}; + my $class36 = $classes->{loader_test36}; + + ok($class35->column_info('an_int')->{is_numeric}, 'custom_column_info'); + + is($class36->column_info('a_date')->{locale},'de_DE','datetime_locale'); + is($class36->column_info('a_date')->{timezone},'Europe/Berlin','datetime_timezone'); + + ok($class36->column_info('b_char_as_data')->{inflate_datetime},'custom_column_info'); + is($class36->column_info('b_char_as_data')->{locale},'de_DE','datetime_locale'); + is($class36->column_info('b_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone'); + ok($class36->column_info('c_char_as_data')->{inflate_date},'custom_column_info'); + is($class36->column_info('c_char_as_data')->{locale},'de_DE','datetime_locale'); + is($class36->column_info('c_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone'); + } + + # rescan and norewrite test + { my @statements_rescan = ( qq{ CREATE TABLE loader_test30 ( @@ -639,23 +877,144 @@ sub test_schema { q{ INSERT INTO loader_test30 (id,loader_test2) VALUES(321, 2) }, ); + # get md5 + my $digest = Digest::MD5->new; + + my $find_cb = sub { + return if -d; + return if $_ eq 'LoaderTest30.pm'; + + open my $fh, '<', $_ or die "Could not open $_ for reading: $!"; + binmode $fh; + $digest->addfile($fh); + }; + + find $find_cb, $DUMP_DIR; + + my $before_digest = $digest->digest; + + $conn->storage->disconnect; # needed for Firebird and Informix my $dbh = $self->dbconnect(1); - $dbh->do($_) for @statements_rescan; + + { + # Silence annoying but harmless postgres "NOTICE: CREATE TABLE..." + local $SIG{__WARN__} = sub { + my $msg = shift; + warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE}; + }; + + $dbh->do($_) for @statements_rescan; + } + $dbh->disconnect; - my @new = $conn->rescan; + sleep 1; + + my @new = do { + # kill the 'Dumping manual schema' warnings + local $SIG{__WARN__} = sub {}; + $conn->rescan; + }; is_deeply(\@new, [ qw/LoaderTest30/ ], "Rescan"); + $digest = Digest::MD5->new; + find $find_cb, $DUMP_DIR; + my $after_digest = $digest->digest; + + is $before_digest, $after_digest, + 'dumped files are not rewritten when there is no modification'; + my $rsobj30 = $conn->resultset('LoaderTest30'); isa_ok($rsobj30, 'DBIx::Class::ResultSet'); - my $obj30 = $rsobj30->find(123); - isa_ok( $obj30->loader_test2, $class2); - ok($rsobj30->result_source->column_info('loader_test2')->{is_foreign_key}, - 'Foreign key detected'); + SKIP: { + skip 'no rels', 2 if $self->{skip_rels}; + + my $obj30 = $rsobj30->find(123); + isa_ok( $obj30->loader_test2, $class2); + + ok($rsobj30->result_source->column_info('loader_test2')->{is_foreign_key}, + 'Foreign key detected'); + } + + $conn->storage->disconnect; # for Firebird + $conn->storage->dbh->do("DROP TABLE loader_test30"); + + @new = do { + local $SIG{__WARN__} = sub {}; + $conn->rescan; + }; + is_deeply(\@new, [], 'no new tables on rescan'); + + throws_ok { $conn->resultset('LoaderTest30') } + qr/Can't find source/, + 'source unregistered for dropped table after rescan'; + } + + $self->test_data_types($conn); + + # run extra tests + $self->{extra}{run}->($conn, $monikers, $classes) if $self->{extra}{run}; + + $self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}; + + $conn->storage->disconnect; +} + +sub test_data_types { + my ($self, $conn) = @_; + + if ($self->{data_type_tests}{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}; + + 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/}; + + my $text_col_def = do { + my $dd = Dumper; + $dd->Indent(0); + $dd->Values([\%info]); + $dd->Dump; + }; + + my $text_expected_info = do { + my $dd = Dumper; + $dd->Indent(0); + $dd->Values([$expected_info]); + $dd->Dump; + }; + + is_deeply \%info, $expected_info, + "test column $col_name has definition: $text_col_def expecting: $text_expected_info"; + } + } + } +} + +sub monikers_and_classes { + my ($self, $schema_class) = @_; + my ($monikers, $classes); + + foreach my $source_name ($schema_class->sources) { + my $table_name = $schema_class->source($source_name)->from; + + $table_name = $$table_name if ref $table_name; + + $monikers->{$table_name} = $source_name; + $classes->{$table_name} = $schema_class . q{::} . $source_name; + + # some DBs (Firebird) uppercase everything + $monikers->{lc $table_name} = $source_name; + $classes->{lc $table_name} = $schema_class . q{::} . $source_name; } - $self->{extra}->{run}->($conn, $monikers, $classes) if $self->{extra}->{run}; + return ($monikers, $classes); } sub check_no_duplicate_unique_constraints { @@ -674,17 +1033,26 @@ sub check_no_duplicate_unique_constraints { sub dbconnect { my ($self, $complain) = @_; - my $dbh = DBI->connect( - $self->{dsn}, $self->{user}, - $self->{password}, - { - RaiseError => $complain, - PrintError => $complain, - AutoCommit => 1, - } - ); + require DBIx::Class::Storage::DBI; + my $storage = DBIx::Class::Storage::DBI->new; + + $complain = defined $complain ? $complain : 1; - die "Failed to connect to database: $DBI::errstr" if !$dbh; + $storage->connect_info([ + @{ $self }{qw/dsn user password/}, + { + unsafe => 1, + RaiseError => $complain, + ShowErrorStatement => $complain, + PrintError => 0, + %{ $self->{connect_info_opts} || {} }, + }, + ]); + + my $dbh = eval { $storage->dbh }; + die "Failed to connect to database: $@" if !$dbh; + + $self->{storage} = $storage; # storage DESTROY disconnects return $dbh; } @@ -695,7 +1063,7 @@ sub create { $self->{_created} = 1; my $make_auto_inc = $self->{auto_inc_cb} || sub {}; - my @statements = ( + @statements = ( qq{ CREATE TABLE loader_test1s ( id $self->{auto_inc_pk}, @@ -708,11 +1076,14 @@ sub create { q{ INSERT INTO loader_test1s (dat) VALUES('bar') }, q{ INSERT INTO loader_test1s (dat) VALUES('baz') }, + # also test method collision qq{ CREATE TABLE loader_test2 ( id $self->{auto_inc_pk}, dat VARCHAR(32) NOT NULL, dat2 VARCHAR(32) NOT NULL, + set_primary_key INTEGER $self->{null}, + dbix_class_testcomponent INTEGER $self->{null}, UNIQUE (dat2, dat) ) $self->{innodb} }, @@ -724,7 +1095,7 @@ sub create { q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ddd', 'www') }, qq{ - CREATE TABLE LOADER_TEST23 ( + CREATE TABLE LOADER_test23 ( ID INTEGER NOT NULL PRIMARY KEY, DAT VARCHAR(32) NOT NULL UNIQUE ) $self->{innodb} @@ -736,9 +1107,28 @@ sub create { DaT VARCHAR(32) NOT NULL UNIQUE ) $self->{innodb} }, + + qq{ + CREATE TABLE loader_test35 ( + id INTEGER NOT NULL PRIMARY KEY, + a_varchar VARCHAR(100) DEFAULT 'foo', + an_int INTEGER DEFAULT 42, + a_double DOUBLE PRECISION DEFAULT 10.555, + a_function $self->{default_function_def} + ) $self->{innodb} + }, + + qq{ + CREATE TABLE loader_test36 ( + id INTEGER NOT NULL PRIMARY KEY, + a_date $self->{date_datatype}, + b_char_as_data VARCHAR(100), + c_char_as_data VARCHAR(100) + ) $self->{innodb} + }, ); - my @statements_reltests = ( + @statements_reltests = ( qq{ CREATE TABLE loader_test3 ( id INTEGER NOT NULL PRIMARY KEY, @@ -770,7 +1160,11 @@ sub create { id1 INTEGER NOT NULL, iD2 INTEGER NOT NULL, dat VARCHAR(8), - PRIMARY KEY (id1,iD2) + from_id INTEGER $self->{null}, + to_id INTEGER $self->{null}, + PRIMARY KEY (id1,iD2), + FOREIGN KEY (from_id) REFERENCES loader_test4 (id), + FOREIGN KEY (to_id) REFERENCES loader_test4 (id) ) $self->{innodb} }, @@ -997,7 +1391,7 @@ sub create { q{ INSERT INTO loader_test34 (id,rel1) VALUES (1,2) }, ); - my @statements_advanced = ( + @statements_advanced = ( qq{ CREATE TABLE loader_test10 ( id10 $self->{auto_inc_pk}, @@ -1010,19 +1404,49 @@ sub create { qq{ CREATE TABLE loader_test11 ( id11 $self->{auto_inc_pk}, - message VARCHAR(8) DEFAULT 'foo', + a_message VARCHAR(8) DEFAULT 'foo', + loader_test10 INTEGER $self->{null}, + FOREIGN KEY (loader_test10) REFERENCES loader_test10 (id10) + ) $self->{innodb} + }, + $make_auto_inc->(qw/loader_test11 id11/), + + (lc($self->{vendor}) ne 'informix' ? + (q{ ALTER TABLE loader_test10 ADD CONSTRAINT loader_test11_fk } . + q{ FOREIGN KEY (loader_test11) } . + q{ REFERENCES loader_test11 (id11) }) + : + (q{ ALTER TABLE loader_test10 ADD CONSTRAINT } . + q{ FOREIGN KEY (loader_test11) } . + q{ REFERENCES loader_test11 (id11) } . + q{ CONSTRAINT loader_test11_fk }) + ), + ); + + @statements_advanced_sqlite = ( + qq{ + CREATE TABLE loader_test10 ( + id10 $self->{auto_inc_pk}, + subject VARCHAR(8) + ) $self->{innodb} + }, + $make_auto_inc->(qw/loader_test10 id10/), + + qq{ + CREATE TABLE loader_test11 ( + id11 $self->{auto_inc_pk}, + a_message VARCHAR(8) DEFAULT 'foo', loader_test10 INTEGER $self->{null}, FOREIGN KEY (loader_test10) REFERENCES loader_test10 (id10) ) $self->{innodb} }, $make_auto_inc->(qw/loader_test11 id11/), - (q{ ALTER TABLE loader_test10 ADD CONSTRAINT } . - q{ loader_test11_fk FOREIGN KEY (loader_test11) } . - q{ REFERENCES loader_test11 (id11) }), + (q{ ALTER TABLE loader_test10 ADD COLUMN } . + q{ loader_test11 INTEGER REFERENCES loader_test11 (id11) }), ); - my @statements_inline_rels = ( + @statements_inline_rels = ( qq{ CREATE TABLE loader_test12 ( id INTEGER NOT NULL PRIMARY KEY, @@ -1046,7 +1470,7 @@ sub create { ); - my @statements_implicit_rels = ( + @statements_implicit_rels = ( qq{ CREATE TABLE loader_test14 ( id INTEGER NOT NULL PRIMARY KEY, @@ -1068,22 +1492,29 @@ sub create { ); $self->drop_tables; + $self->drop_tables; # twice for good measure my $dbh = $self->dbconnect(1); # Silence annoying but harmless postgres "NOTICE: CREATE TABLE..." local $SIG{__WARN__} = sub { my $msg = shift; - print STDERR $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE}; + warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE}; }; - $dbh->do($_) for (@statements); + $dbh->do($_) foreach (@statements); + + $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); - unless($self->{vendor} =~ /sqlite/i) { + if($self->{vendor} =~ /sqlite/i) { + $dbh->do($_) for (@statements_advanced_sqlite); + } + else { $dbh->do($_) for (@statements_advanced); } unless($self->{no_inline_rels}) { @@ -1104,8 +1535,10 @@ sub drop_tables { my @tables = qw/ loader_test1s loader_test2 - LOADER_TEST23 + LOADER_test23 LoAdEr_test24 + loader_test35 + loader_test36 /; my @tables_auto_inc = ( @@ -1169,35 +1602,154 @@ sub drop_tables { my $dbh = $self->dbconnect(0); - $dbh->do("DROP TABLE $_") for @{ $self->{extra}->{drop} || [] }; + $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] }; + $dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] }; my $drop_auto_inc = $self->{auto_inc_drop_cb} || sub {}; unless($self->{skip_rels}) { $dbh->do("DROP TABLE $_") for (@tables_reltests); - unless($self->{vendor} =~ /sqlite/i) { - if($self->{vendor} =~ /mysql/i) { - $dbh->do($drop_fk_mysql); - } - else { - $dbh->do($drop_fk); - } - $dbh->do("DROP TABLE $_") for (@tables_advanced); - $dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_advanced_auto_inc; + 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("DROP TABLE $_") for (@tables_rescan); } - $dbh->do("DROP TABLE $_") for (@tables); $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"); + } + + $dbh->disconnect; + +# fixup for Firebird + $dbh = $self->dbconnect(0); + $dbh->do('DROP TABLE loader_test2'); $dbh->disconnect; } +sub _custom_column_info { + my ( $table_name, $column_name, $column_info ) = @_; + + $table_name = lc ( $table_name ); + $column_name = lc ( $column_name ); + + if ( $table_name eq 'loader_test35' + and $column_name eq 'an_int' + ){ + return { is_numeric => 1 } + } + # Set inflate_datetime or inflate_date to check + # datetime_timezone and datetime_locale + if ( $table_name eq 'loader_test36' ){ + return { inflate_datetime => 1 } if + ( $column_name eq 'b_char_as_data' ); + return { inflate_date => 1 } if + ( $column_name eq 'c_char_as_data' ); + } + + return; +} + +my %DATA_TYPE_MULTI_TABLE_OVERRIDES = ( + oracle => qr/\blong\b/, +); + +sub setup_data_type_tests { + my $self = shift; + + return unless my $types = $self->{data_types}; + + my $tests = $self->{data_type_tests} = {}; + + # split types into tables based on overrides + my @types = keys %$types; + my @split_off_types = grep /$DATA_TYPE_MULTI_TABLE_OVERRIDES{lc($self->{vendor})}/i, @types; + my @first_table_types = grep !/$DATA_TYPE_MULTI_TABLE_OVERRIDES{lc($self->{vendor})}/i, @types; + + @types = +{ map +($_, $types->{$_}), @first_table_types }, + map +{ $_, $types->{$_} }, @split_off_types; + + my $test_count = 0; + my $table_num = 10000; + + foreach my $types (@types) { + my $table_name = "loader_test$table_num"; + push @{ $tests->{table_names} }, $table_name; + + my $table_moniker = "LoaderTest$table_num"; + push @{ $tests->{table_monikers} }, $table_moniker; + + $table_num++; + + my $cols = $tests->{columns}{$table_moniker} = {}; + + my $ddl = "CREATE TABLE $table_name (\n id INTEGER NOT NULL PRIMARY KEY,\n"; + + my %seen_col_names; + + while (my ($col_def, $expected_info) = each %$types) { + (my $type_alias = $col_def) =~ s/\( ([^)]+) \)//xg; + + my $size = $1; + $size = '' unless defined $size; + $size =~ s/\s+//g; + my @size = split /,/, $size; + + # some DBs don't like very long column names + if ($self->{vendor} =~ /^(?:firebird|sqlanywhere|oracle)\z/i) { + my ($col_def, $default) = $type_alias =~ /^(.*)(default.*)?\z/i; + + $type_alias = substr $col_def, 0, 15; + + $type_alias .= '_with_dflt' if $default; + } + + $type_alias =~ s/\s/_/g; + $type_alias =~ s/\W//g; + + my $col_name = 'col_' . $type_alias; + + if (@size) { + my $size_name = join '_', apply { s/\W//g } @size; + + $col_name .= "_sz_$size_name"; + } + + # XXX would be better to check _loader->preserve_case + $col_name = lc $col_name; + + $col_name .= '_' . $seen_col_names{$col_name} if $seen_col_names{$col_name}++; + + $ddl .= " $col_name $col_def,\n"; + + $cols->{$col_name} = $expected_info; + + $test_count++; + } + + $ddl =~ s/,\n\z/\n)/; + + push @{ $tests->{ddl} }, $ddl; + } + + $tests->{test_count} = $test_count; + + return $test_count; +} + sub DESTROY { my $self = shift; unless ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}) { @@ -1207,3 +1759,4 @@ sub DESTROY { } 1; +# vim:et sts=4 sw=4 tw=0: