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 DBI;
-use Digest::MD5;
use File::Find 'find';
use Class::Unload ();
-use DBIx::Class::Schema::Loader::Utils qw/dumper_squashed slurp_file sigwarn_silencer/;
-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
$num_rescans++ if $self->{vendor} eq 'Firebird';
plan tests => @connect_info *
- (228 + $num_rescans * $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0));
+ (232 + $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];
{
my @loader_warnings;
local $SIG{__WARN__} = sub { push(@loader_warnings, @_); };
- eval qq{
- package @{[SCHEMA_CLASS]};
- use base qw/DBIx::Class::Schema::Loader/;
+ eval qq{
+ package @{[SCHEMA_CLASS]};
+ use base qw/DBIx::Class::Schema::Loader/;
- __PACKAGE__->loader_options(\%loader_opts);
- __PACKAGE__->connection(\@\$connect_info);
- };
+ __PACKAGE__->loader_options(\%loader_opts);
+ __PACKAGE__->connection(\@\$connect_info);
+ };
ok(!$@, "Loader initialization") or diag $@;
my $standard_sources = not defined $expected_count;
if ($standard_sources) {
- $expected_count = 38;
+ $expected_count = 41;
if (not ($self->{vendor} eq 'mssql' && $connect_info->[0] =~ /Sybase/)) {
$expected_count++ for @{ $self->{data_type_tests}{table_names} || [] };
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;
}
'is_nullable=1 detection';
SKIP: {
- skip $self->{skip_rels}, 145 if $self->{skip_rels};
+ skip $self->{skip_rels}, 149 if $self->{skip_rels};
my $moniker3 = $monikers->{loader_test3};
my $class3 = $classes->{loader_test3};
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( $rsobj34, "DBIx::Class::ResultSet" );
isa_ok( $rsobj36, "DBIx::Class::ResultSet" );
isa_ok( $rsobj37, "DBIx::Class::ResultSet" );
+ isa_ok( $rsobj42, "DBIx::Class::ResultSet" );
+ isa_ok( $rsobj43, "DBIx::Class::ResultSet" );
+ isa_ok( $rsobj44, "DBIx::Class::ResultSet" );
# basic rel test
my $obj4 = try { $rsobj4->find(123) } || $rsobj4->search({ id => 123 })->single;
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';
}
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') || {};
isa_ok(try { $rs_rel17->single }, $class17);
is(try { $rs_rel17->single->id }, 3, "search_related with multiple FKs from same table");
- # XXX test m:m 18 <- 20 -> 19
+ # test many_to_many detection 18 -> 20 -> 19 and 19 -> 20 -> 18
ok($class20->column_info('parent')->{is_foreign_key}, 'Foreign key detected');
ok($class20->column_info('child')->{is_foreign_key}, 'Foreign key detected');
- # XXX test double-fk m:m 21 <- 22 -> 21
- ok($class22->column_info('parent')->{is_foreign_key}, 'Foreign key detected');
- ok($class22->column_info('child')->{is_foreign_key}, 'Foreign key detected');
-
- # test many_to_many detection 18 -> 20 -> 19 and 19 -> 20 -> 18
- my $m2m;
+ cmp_deeply(
+ $class18->_m2m_metadata->{children},
+ superhashof({
+ relation => 'loader_test20s',
+ foreign_relation => 'child',
+ attrs => superhashof({ order_by => 'me.id' })
+ }),
+ 'children m2m correct with ordering'
+ );
- ok($m2m = (try { $class18->_m2m_metadata->{children} }), 'many_to_many created');
+ cmp_deeply(
+ $class19->_m2m_metadata->{parents},
+ superhashof({
+ relation => 'loader_test20s',
+ foreign_relation => 'parent',
+ attrs => superhashof({ order_by => 'me.id' })
+ }),
+ 'parents m2m correct with ordering'
+ );
- is $m2m->{relation}, 'loader_test20s', 'm2m near rel';
- is $m2m->{foreign_relation}, 'child', 'm2m far rel';
- is $m2m->{attrs}->{order_by}, 'me.id', 'm2m bridge attrs';
- ok($m2m = (try { $class19->_m2m_metadata->{parents} }), 'many_to_many created');
+ # 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'
+ );
- is $m2m->{relation}, 'loader_test20s', 'm2m near rel';
- is $m2m->{foreign_relation}, 'parent', 'm2m far rel';
- is $m2m->{attrs}->{order_by}, 'me.id', 'm2m bridge attrs';
+ 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 })->single;
# 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');
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');
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
ok eval {
my %opts = (
- naming => 'current',
- constraint => $self->CONSTRAINT,
- dump_directory => DUMP_DIR,
- debug => ($ENV{SCHEMA_LOADER_TESTS_DEBUG}||0)
+ naming => 'current',
+ constraint => $self->CONSTRAINT,
+ dump_directory => DUMP_DIR,
+ debug => ($ENV{SCHEMA_LOADER_TESTS_DEBUG}||0)
);
my $guard = $conn->txn_scope_guard;
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_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 = (
loader_test31
loader_test34
loader_test33
+ loader_test44
+ loader_test43
+ loader_test42
/;
my @tables_advanced = qw/
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