X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fdbixcsl_common_tests.pm;h=283805d37a2f968e1e5f6e2dd5670700796207ca;hb=4f19ef97a87c61eab5e67c0225a62e73d5a9f99b;hp=d8dc3f58b07732e55d5b8e1c64fd1884a996ef1c;hpb=53ef681d0209e2c85ddd60e049e3c8510fb27bb5;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm index d8dc3f5..283805d 100644 --- a/t/lib/dbixcsl_common_tests.pm +++ b/t/lib/dbixcsl_common_tests.pm @@ -11,6 +11,8 @@ 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; @@ -45,7 +47,11 @@ sub new { $self->{default_function} ||= "CURRENT_TIMESTAMP"; $self->{default_function_def} ||= "TIMESTAMP DEFAULT $self->{default_function}"; - return bless $self => $class; + $self = bless $self, $class; + + $self->setup_data_type_tests; + + return $self; } sub skip_tests { @@ -73,8 +79,15 @@ sub run_tests { 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; - plan tests => @connect_info * (171 + ($self->{extra}->{count} || 0)); + plan tests => @connect_info * (176 + $extra_count + ($self->{data_type_tests}{test_count} || 0)); foreach my $info_idx (0..$#connect_info) { my $info = $connect_info[$info_idx]; @@ -83,7 +96,7 @@ sub run_tests { $self->create(); - my $schema_class = $self->setup_schema(@$info); + my $schema_class = $self->setup_schema($info); $self->test_schema($schema_class); rmtree $DUMP_DIR @@ -91,14 +104,69 @@ sub run_tests { } } +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)); + + 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($self->{data_type_tests}{ddl}) if $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 $dbh = $self->dbconnect(0); + $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] }; + $dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] }; + + if (my $data_type_table = $self->{data_type_tests}{table_name}) { + $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 = shift; - my @connect_info = @_; + my ($self, $connect_info, $expected_count) = @_; my $schema_class = 'DBIXCSL_Test::Schema'; @@ -130,60 +198,72 @@ sub setup_schema { Class::Unload->unload($schema_class); my $file_count; - my $expected_count = 36; { - 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 $@; - - find sub { return if -d; $file_count++ }, $DUMP_DIR; - - $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; - - my $vendor = $self->{vendor}; - $warn_count++ for grep /${vendor}_\S+ has no primary key/, - @loader_warnings; - - if($self->{skip_rels}) { - SKIP: { - is(scalar(@loader_warnings), $warn_count, "No loader warnings") + 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 $@; + + find sub { return if -d; $file_count++ }, $DUMP_DIR; + + 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/i, @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; + } } } @@ -200,20 +280,7 @@ sub test_schema { ($self->{before_tests_run} || sub {})->($conn); - my $monikers = {}; - my $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; - } + my ($monikers, $classes) = $self->monikers_and_classes($schema_class); my $moniker1 = $monikers->{loader_test1s}; my $class1 = $classes->{loader_test1s}; @@ -225,8 +292,8 @@ sub test_schema { my $rsobj2 = $conn->resultset($moniker2); check_no_duplicate_unique_constraints($class2); - my $moniker23 = $monikers->{LOADER_TEST23} || $monikers->{loader_test23}; - my $class23 = $classes->{LOADER_TEST23} || $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} || $monikers->{loader_test24}; @@ -244,7 +311,13 @@ sub test_schema { 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; @@ -369,7 +442,7 @@ sub test_schema { ); SKIP: { - skip $self->{skip_rels}, 113 if $self->{skip_rels}; + skip $self->{skip_rels}, 116 if $self->{skip_rels}; my $moniker3 = $monikers->{loader_test3}; my $class3 = $classes->{loader_test3}; @@ -522,12 +595,18 @@ sub test_schema { 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"; + is $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}), 'belongs_to does not have cascade_delete'); @@ -546,6 +625,9 @@ sub test_schema { 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}) } || @@ -814,7 +896,7 @@ sub test_schema { # 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_rescan; @@ -851,13 +933,69 @@ sub test_schema { 'Foreign key detected'); } - $self->{extra}->{run}->($conn, $monikers, $classes) if $self->{extra}->{run}; + $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}; + my $columns = $data_type_tests->{columns}; + + my $rsrc = $conn->resultset($data_type_tests->{table_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; + } + + return ($monikers, $classes); +} + sub check_no_duplicate_unique_constraints { my ($class) = @_; @@ -917,11 +1055,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} }, @@ -933,7 +1074,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} @@ -1323,16 +1464,20 @@ 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($self->{data_type_tests}{ddl}) if $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... @@ -1362,7 +1507,7 @@ sub drop_tables { my @tables = qw/ loader_test1s loader_test2 - LOADER_TEST23 + LOADER_test23 LoAdEr_test24 loader_test35 loader_test36 @@ -1454,6 +1599,11 @@ sub drop_tables { } $dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_auto_inc; $dbh->do("DROP TABLE $_") for (@tables, @tables_rescan); + + if (my $data_type_table = $self->{data_type_tests}{table_name}) { + $dbh->do("DROP TABLE $data_type_table"); + } + $dbh->disconnect; # fixup for Firebird @@ -1485,6 +1635,68 @@ sub _custom_column_info { return; } +sub setup_data_type_tests { + my $self = shift; + + return unless my $types = $self->{data_types}; + + my $tests = $self->{data_type_tests} = {}; + my $cols = $tests->{columns} = {}; + + $tests->{table_name} = 'loader_test9999'; + $tests->{table_moniker} = 'LoaderTest9999'; + + my $ddl = "CREATE TABLE loader_test9999 (\n id INTEGER NOT NULL PRIMARY KEY,\n"; + + my $test_count = 0; + + my %seen_col_names; + + while (my ($col_def, $expected_info) = each %$types) { + (my $type_alias = lc($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\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"; + } + + $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)/; + + $tests->{ddl} = $ddl; + $tests->{test_count} = $test_count; + + return $test_count; +} + sub DESTROY { my $self = shift; unless ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}) { @@ -1494,3 +1706,4 @@ sub DESTROY { } 1; +# vim:et sts=4 sw=4 tw=0: