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';
my $self;
if( ref($_[0]) eq 'HASH') {
- my $args = shift;
- $self = { (%$args) };
+ my $args = shift;
+ $self = { (%$args) };
}
else {
- $self = { @_ };
+ $self = { @_ };
}
# Only MySQL uses this
# DB2 and Firebird don't support 'field type NULL'
$self->{null} = 'NULL' unless defined $self->{null};
-
+
$self->{verbose} = $ENV{TEST_VERBOSE} || 0;
# Optional extra tables and 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 {
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;
- my $col_accessor_map_tests = 5;
- my $num_rescans = 6;
- $num_rescans++ if $self->{vendor} eq 'mssql';
- $num_rescans++ if $self->{vendor} eq 'Firebird';
+ my $col_accessor_map_tests = 6;
plan tests => @connect_info *
- (214 + $num_rescans * $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0));
+ (233 + $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0));
foreach my $info_idx (0..$#connect_info) {
my $info = $connect_info[$info_idx];
}
}
+ $dbh->disconnect;
$self->{_created} = 1;
my $file_count = grep $_ =~ SOURCE_DDL, @{ $self->{extra}{create} || [] };
$file_count++; # schema
-
+
if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) {
$file_count++ for @{ $self->{data_type_tests}{table_names} || [] };
}
$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;
@statements_advanced_sqlite, @statements_inline_rels,
@statements_implicit_rels);
+sub CONSTRAINT {
+ my $self = shift;
+return qr/^(?:(?:$self->{vendor}|extra)[_-]?)?loader[_-]?test[0-9]+(?!.*_)/i;
+}
+
sub setup_schema {
my ($self, $connect_info, $expected_count) = @_;
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 =>
- qr/^(?:\S+\.)?(?:(?:$self->{vendor}|extra)[_-]?)?loader[_-]?test[0-9]+(?!.*_)/i,
+ constraint => $self->CONSTRAINT,
result_namespace => RESULT_NAMESPACE,
resultset_namespace => RESULTSET_NAMESPACE,
schema_base_class => 'TestSchemaBaseClass',
additional_classes => 'TestAdditional',
additional_base_classes => 'TestAdditionalBase',
left_base_classes => [ qw/TestLeftBase/ ],
- components => [ qw/TestComponent +TestComponentFQN/ ],
+ components => [ qw/TestComponent +TestComponentFQN +IntrospectM2M/ ],
inflect_plural => { loader_test4_fkid => 'loader_test4zes' },
inflect_singular => { fkid => 'fkid_singular' },
moniker_map => \&_monikerize,
) : (),
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,
+ relationship_attrs => { many_to_many => { order_by => 'me.id' } },
+ col_accessor_map => $self->curry::weak::test_col_accessor_map,
result_components_map => { LoaderTest2X => 'TestComponentForMap', LoaderTest1 => '+TestComponentForMapFQN' },
uniq_to_primary => 1,
%{ $self->{loader_options} || {} },
{
my @loader_warnings;
local $SIG{__WARN__} = sub { push(@loader_warnings, @_); };
- eval qq{
- package @{[SCHEMA_CLASS]};
- use base qw/DBIx::Class::Schema::Loader/;
-
- __PACKAGE__->loader_options(\%loader_opts);
- __PACKAGE__->connection(\@\$connect_info);
- };
-
+ 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 = 37;
+ $expected_count = 41;
if (not ($self->{vendor} eq 'mssql' && $connect_info->[0] =~ /Sybase/)) {
$expected_count++ for @{ $self->{data_type_tests}{table_names} || [] };
$expected_count += grep $_ =~ SOURCE_DDL,
@{ $self->{extra}{create} || [] };
-
- $expected_count -= grep /CREATE TABLE/, @statements_inline_rels
+
+ $expected_count -= grep /CREATE TABLE/i, @statements_inline_rels
if $self->{skip_rels} || $self->{no_inline_rels};
-
- $expected_count -= grep /CREATE TABLE/, @statements_implicit_rels
+
+ $expected_count -= grep /CREATE TABLE/i, @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
+
+ $expected_count -= grep /CREATE TABLE/i, ($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++ 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;
$warn_count++ for grep /^Column '\w+' in table '\w+' collides with an inherited method\./, @loader_warnings;
'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';
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");
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;
}
ok(!$@, "Inserting new record using a PK::Auto key didn't die") or diag $@;
ok($saved_id, "Got PK::Auto-generated id");
- my $new_obj1 = $rsobj1->search({ dat => 'newthing' })->first;
+ my $new_obj1 = $rsobj1->search({ dat => 'newthing' })->single;
ok($new_obj1, "Found newly inserted PK::Auto record");
is($new_obj1->id, $saved_id, "Correct PK::Auto-generated id");
- my ($obj2) = $rsobj2->search({ dat => 'bbb' })->first;
+ my ($obj2) = $rsobj2->search({ dat => 'bbb' })->single;
is( $obj2->id, 2 );
SKIP: {
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';
'is_nullable=1 detection';
SKIP: {
- skip $self->{skip_rels}, 131 if $self->{skip_rels};
+ skip $self->{skip_rels}, 143 if $self->{skip_rels};
my $moniker3 = $monikers->{loader_test3};
my $class3 = $classes->{loader_test3};
my $moniker36 = $monikers->{loader_test36};
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" );
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 })->first;
+ my $obj4 = try { $rsobj4->find(123) } || $rsobj4->search({ id => 123 })->single;
isa_ok( try { $obj4->fkid_singular }, $class3);
# test renaming rel that conflicts with a class method
ok($class4->column_info('fkid')->{is_foreign_key}, 'Foreign key detected');
- my $obj3 = try { $rsobj3->find(1) } || $rsobj3->search({ id => 1 })->first;
+ my $obj3 = try { $rsobj3->find(1) } || $rsobj3->search({ id => 1 })->single;
my $rs_rel4 = try { $obj3->search_related('loader_test4zes') };
- isa_ok( try { $rs_rel4->first }, $class4);
+ isa_ok( try { $rs_rel4->single }, $class4);
# check rel naming with prepositions
ok ($rsobj4->result_source->has_relationship('loader_test5s_to'),
ok ((not try { exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{is_deferrable} }),
'has_many does not have is_deferrable');
- is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_delete} }, 'CASCADE',
- "on_delete => 'CASCADE' on belongs_to by default";
+ my $default_on_clause = $self->{default_on_clause} || 'CASCADE';
+
+ my $default_on_delete_clause = $self->{default_on_delete_clause} || $default_on_clause;
- is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update} }, 'CASCADE',
- "on_update => 'CASCADE' on belongs_to by default";
+ is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_delete} },
+ $default_on_delete_clause,
+ "on_delete is $default_on_delete_clause on belongs_to by default";
- is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable} }, 1,
- "is_deferrable => 1 on belongs_to by default";
+ my $default_on_update_clause = $self->{default_on_update_clause} || $default_on_clause;
+
+ is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update} },
+ $default_on_update_clause,
+ "on_update is $default_on_update_clause on belongs_to by default";
+
+ my $default_is_deferrable = $self->{default_is_deferrable};
+
+ $default_is_deferrable = 1
+ if not defined $default_is_deferrable;
+
+ is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable} },
+ $default_is_deferrable,
+ "is_deferrable => $default_is_deferrable on belongs_to by default";
ok ((not try { exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_delete} }),
'belongs_to does not have cascade_delete');
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';
}
# mulit-col fk def
- my $obj6 = try { $rsobj6->find(1) } || $rsobj6->search({ id => 1 })->first;
+ my $obj6 = try { $rsobj6->find(1) } || $rsobj6->search({ id => 1 })->single;
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');
- 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') || {};
'ambiguous relationship named correctly');
# fk that references a non-pk key (UNIQUE)
- my $obj8 = try { $rsobj8->find(1) } || $rsobj8->search({ id => 1 })->first;
+ my $obj8 = try { $rsobj8->find(1) } || $rsobj8->search({ id => 1 })->single;
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 = try { $rsobj17->find(33) } || $rsobj17->search({ id => 33 })->first;
+ my $obj17 = try { $rsobj17->find(33) } || $rsobj17->search({ id => 33 })->single;
my $rs_rel16_one = try { $obj17->loader16_one };
isa_ok($rs_rel16_one, $class16);
ok($class17->column_info('loader16_two')->{is_foreign_key}, 'Foreign key detected');
- my $obj16 = try { $rsobj16->find(2) } || $rsobj16->search({ id => 2 })->first;
+ my $obj16 = try { $rsobj16->find(2) } || $rsobj16->search({ id => 2 })->single;
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
+ isa_ok(try { $rs_rel17->single }, $class17);
+ is(try { $rs_rel17->single->id }, 3, "search_related with multiple FKs from same table");
+
+ # 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'
+ );
+
+ 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( $class37->relationship_info('parent'), 'parents rel created' );
+ ok( $class37->relationship_info('child'), 'child rel created' );
+
+ 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');
+
+ # 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'
+ );
+
+ 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 })->first;
+ my $obj26 = try { $rsobj26->find(33) } || $rsobj26->search({ id => 33 })->single;
my $rs_rel25_one = try { $obj26->loader_test25_id_rel1 };
isa_ok($rs_rel25_one, $class25);
isa_ok($rs_rel25_two, $class25);
is(try { $rs_rel25_two->dat }, 'y25', "Multiple multi-col FKs to same table");
- my $obj25 = try { $rsobj25->find(3,42) } || $rsobj25->search({ id1 => 3, id2 => 42 })->first;
+ my $obj25 = try { $rsobj25->find(3,42) } || $rsobj25->search({ id1 => 3, id2 => 42 })->single;
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");
+ isa_ok(try { $rs_rel26->single }, $class26);
+ is(try { $rs_rel26->single->id }, 3, "search_related with multiple multi-col FKs from same table");
# test one-to-one rels
- my $obj27 = try { $rsobj27->find(1) } || $rsobj27->search({ id => 1 })->first;
+ my $obj27 = try { $rsobj27->find(1) } || $rsobj27->search({ id => 1 })->single;
my $obj28 = try { $obj27->loader_test28 };
isa_ok($obj28, $class28);
is(try { $obj28->get_column('id') }, 1, "One-to-one relationship with PRIMARY FK");
ok($class29->column_info('fk')->{is_foreign_key}, 'Foreign key detected');
- $obj27 = try { $rsobj27->find(2) } || $rsobj27->search({ id => 2 })->first;
+ $obj27 = try { $rsobj27->find(2) } || $rsobj27->search({ id => 2 })->single;
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,
- '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');
-
+
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;
+ || try { $rsobj32->search({ id => 1 }, { prefetch => [qw/rel1 rel2/] })->single }
+ || $rsobj32->search({ id => 1 })->single;
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;
+ || eval { $rsobj34->search({ id => 1 }, { prefetch => [qw/loader_test33_id_rel1 loader_test33_id_rel2/] })->single }
+ || $rsobj34->search({ id => 1 })->single;
diag $@ if $@;
isa_ok($obj32,$class32);
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();
+ my $obj10_3 = $results->single();
isa_ok( $obj10_3, $class10 );
is( $obj10_3->loader_test11()->id(), $obj11->id(),
'Circular rel leads back to same row' );
my $class13 = $classes->{loader_test13};
my $rsobj13 = $conn->resultset($moniker13);
- isa_ok( $rsobj12, "DBIx::Class::ResultSet" );
+ isa_ok( $rsobj12, "DBIx::Class::ResultSet" );
isa_ok( $rsobj13, "DBIx::Class::ResultSet" );
ok($class13->column_info('id')->{is_foreign_key}, 'Foreign key detected');
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 = try { $rsobj13->find(1) } || $rsobj13->search({ id => 1 })->first;
+ my $obj13 = try { $rsobj13->find(1) } || $rsobj13->search({ id => 1 })->single;
isa_ok( $obj13->id, $class12 );
isa_ok( $obj13->loader_test12, $class12);
isa_ok( $obj13->dat, $class12);
- my $obj12 = try { $rsobj12->find(1) } || $rsobj12->search({ id => 1 })->first;
+ my $obj12 = try { $rsobj12->find(1) } || $rsobj12->search({ id => 1 })->single;
isa_ok( try { $obj12->loader_test13 }, $class13 );
}
# 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
}
my $class15 = $classes->{loader_test15};
my $rsobj15 = $conn->resultset($moniker15);
- isa_ok( $rsobj14, "DBIx::Class::ResultSet" );
+ isa_ok( $rsobj14, "DBIx::Class::ResultSet" );
isa_ok( $rsobj15, "DBIx::Class::ResultSet" );
ok($class15->column_info('loader_test14')->{is_foreign_key}, 'Foreign key detected');
- my $obj15 = try { $rsobj15->find(1) } || $rsobj15->search({ id => 1 })->first;
+ my $obj15 = try { $rsobj15->find(1) } || $rsobj15->search({ id => 1 })->single;
isa_ok( $obj15->loader_test14, $class14 );
}
}
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;
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;
# 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');
SKIP: {
skip 'no rels', 2 if $self->{skip_rels};
- my $obj30 = try { $rsobj30->find(123) } || $rsobj30->search({ id => 123 })->first;
+ 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
# run extra tests
$self->{extra}{run}->($conn, $monikers, $classes, $self) if $self->{extra}{run};
- $self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP};
+ ## Create a dump from an existing $dbh in a transaction
+
+TODO: {
+ local $TODO = 'dumping in a txn is experimental and Pg-only right now'
+ unless $self->{vendor} eq 'Pg';
+
+ ok eval {
+ my %opts = (
+ naming => 'current',
+ constraint => $self->CONSTRAINT,
+ dump_directory => DUMP_DIR,
+ debug => ($ENV{SCHEMA_LOADER_TESTS_DEBUG}||0)
+ );
+
+ my $guard = $conn->txn_scope_guard;
+
+ 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 } ]
+ );
+
+ $guard->commit;
+
+ 1;
+ }, 'Making a schema from another schema inside a transaction worked';
+
+ diag $@ if $@ && (not $TODO);
+}
$conn->storage->disconnect;
+
+ $self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP};
}
sub test_data_types {
my ($oqt, $cqt) = $self->get_oqt_cqt(always => 1); # open quote, close quote
- my $dbh = $self->dbconnect;
+ my $dbh = $conn->storage->dbh;
my ($table40_name, $table41_name) = @{ $self->{preserve_case_tests_table_names} };
$make_auto_inc->(qw/loader_test1s id/),
q{ INSERT INTO loader_test1s (dat) VALUES('foo') },
- q{ INSERT INTO loader_test1s (dat) VALUES('bar') },
- q{ INSERT INTO loader_test1s (dat) VALUES('baz') },
+ q{ INSERT INTO loader_test1s (dat) VALUES('bar') },
+ q{ INSERT INTO loader_test1s (dat) VALUES('baz') },
# also test method collision
- # crumb_crisp_coating is for col_accessor_map tests
- qq{
+ # crumb_crisp_coating and sticky_filling are for col_accessor_map tests
+ qq{
CREATE TABLE loader_test2 (
id $self->{auto_inc_pk},
dat VARCHAR(32) NOT NULL,
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}
},
$make_auto_inc->(qw/loader_test2 id/),
- q{ INSERT INTO loader_test2 (dat, dat2) VALUES('aaa', 'zzz') },
- q{ INSERT INTO loader_test2 (dat, dat2) VALUES('bbb', 'yyy') },
- q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ccc', 'xxx') },
- q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ddd', 'www') },
+ q{ INSERT INTO loader_test2 (dat, dat2) VALUES('aaa', 'zzz') },
+ q{ INSERT INTO loader_test2 (dat, dat2) VALUES('bbb', 'yyy') },
+ q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ccc', 'xxx') },
+ q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ddd', 'www') },
qq{
CREATE TABLE LOADER_test23 (
) $self->{innodb}
},
- q{ INSERT INTO loader_test3 (id,dat) VALUES(1,'aaa') },
- q{ INSERT INTO loader_test3 (id,dat) VALUES(2,'bbb') },
- q{ INSERT INTO loader_test3 (id,dat) VALUES(3,'ccc') },
- q{ INSERT INTO loader_test3 (id,dat) VALUES(4,'ddd') },
+ q{ INSERT INTO loader_test3 (id,dat) VALUES(1,'aaa') },
+ q{ INSERT INTO loader_test3 (id,dat) VALUES(2,'bbb') },
+ q{ INSERT INTO loader_test3 (id,dat) VALUES(3,'ccc') },
+ q{ INSERT INTO loader_test3 (id,dat) VALUES(4,'ddd') },
qq{
CREATE TABLE loader_test4 (
},
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(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) },
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,
) $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 = (
dat VARCHAR(8)
) $self->{innodb}
},
-
+
q{ INSERT INTO loader_test14 (id,dat) VALUES (123,'aaa') },
qq{
loader_test36
loader_test50
/;
-
+
my @tables_auto_inc = (
[ qw/loader_test1s id/ ],
[ qw/loader_test2 id/ ],
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/
loader_test11
loader_test10
/;
-
+
my @tables_advanced_auto_inc = (
[ qw/loader_test10 id10/ ],
[ qw/loader_test11 id11/ ],
foreach my $table (keys %drop_constraints) {
# for MSSQL
- $dbh->do("ALTER TABLE $table DROP $drop_constraints{$table}");
+ $dbh->do("ALTER TABLE $table DROP $drop_constraints{$table}");
# for Sybase and Access
- $dbh->do("ALTER TABLE $table DROP CONSTRAINT $drop_constraints{$table}");
+ $dbh->do("ALTER TABLE $table DROP CONSTRAINT $drop_constraints{$table}");
# for MySQL
- $dbh->do("ALTER TABLE $table DROP FOREIGN KEY $drop_constraints{$table}");
+ $dbh->do("ALTER TABLE $table DROP FOREIGN KEY $drop_constraints{$table}");
}
$self->drop_table($dbh, $_) for (@tables_reltests);
$table_name = lc ( $table_name );
$column_name = lc ( $column_name );
- if ( $table_name eq 'loader_test35'
- and $column_name eq 'an_int'
+ if ( $table_name eq 'loader_test35'
+ and $column_name eq 'an_int'
){
return { is_numeric => 1 }
}
- # Set inflate_datetime or inflate_date to check
+ # Set inflate_datetime or inflate_date to check
# datetime_timezone and datetime_locale
if ( $table_name eq 'loader_test36' ){
- return { inflate_datetime => 1 } if
+ return { inflate_datetime => 1 } if
( $column_name eq 'b_char_as_data' );
- return { inflate_date => 1 } if
+ return { inflate_date => 1 } if
( $column_name eq 'c_char_as_data' );
}
@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;
$type_alias =~ s/\W//g;
my $col_name = 'col_' . $type_alias;
-
+
if (@size) {
my $size_name = join '_', apply { s/\W//g } @size;
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_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
}
}
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff