use Test::Exception;
use DBIx::Class::Schema::Loader;
use Class::Unload;
-use File::Path;
+use File::Path 'rmtree';
use DBI;
use Digest::MD5;
use File::Find 'find';
use Class::Unload ();
-use DBIx::Class::Schema::Loader::Utils 'dumper_squashed';
+use DBIx::Class::Schema::Loader::Utils qw/dumper_squashed slurp_file/;
use List::MoreUtils 'apply';
use DBIx::Class::Schema::Loader::Optional::Dependencies ();
use Try::Tiny;
-use File::Slurp 'slurp';
+use File::Spec::Functions 'catfile';
+use File::Basename 'basename';
use namespace::clean;
-use dbixcsl_test_dir qw/$tdir/;
+use dbixcsl_test_dir '$tdir';
-my $DUMP_DIR = "$tdir/common_dump";
-rmtree $DUMP_DIR;
+use constant DUMP_DIR => "$tdir/common_dump";
+
+rmtree DUMP_DIR;
use constant RESCAN_WARNINGS => qr/(?i:loader_test|LoaderTest)\d+s? has no primary key|^Dumping manual schema|^Schema dump completed|collides with an inherited method|invalidates \d+ active statement|^Bad table or view/;
# skip schema-qualified tables in the Pg tests
use constant SOURCE_DDL => qr/CREATE (?:TABLE|VIEW) (?!"dbicsl[.-]test")/i;
+use constant SCHEMA_CLASS => 'DBIXCSL_Test::Schema';
+
+use constant RESULT_NAMESPACE => [ 'MyResult', 'MyResultTwo' ];
+
+use constant RESULTSET_NAMESPACE => [ 'MyResultSet', 'MyResultSetTwo' ];
+
sub new {
my $class = shift;
# 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
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 = 5;
+ my $num_rescans = 6;
$num_rescans++ if $self->{vendor} eq 'mssql';
$num_rescans++ if $self->{vendor} eq 'Firebird';
plan tests => @connect_info *
- (203 + $num_rescans * $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0));
+ (221 + $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 $schema_class = $self->setup_schema($info);
$self->test_schema($schema_class);
- rmtree $DUMP_DIR
+ rmtree DUMP_DIR
unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} && $info_idx == $#connect_info;
}
}
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));
+ plan tests => @$connect_info * (3 + ($self->{extra}{count} || 0) + ($self->{data_type_tests}{test_count} || 0));
- rmtree $DUMP_DIR;
+ rmtree DUMP_DIR;
foreach my $info_idx (0..$#$connect_info) {
my $info = $connect_info->[$info_idx];
$dbh->do($_) for @{ $self->{extra}{create} || [] };
if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) {
- $dbh->do($_) for @{ $self->{data_type_tests}{ddl} || []};
+ foreach my $ddl (@{ $self->{data_type_tests}{ddl} || []}) {
+ if (my $cb = $self->{data_types_ddl_cb}) {
+ $cb->($ddl);
+ }
+ else {
+ $dbh->do($ddl);
+ }
+ }
}
$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} || [] };
}
if (not ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} && $info_idx == $#$connect_info)) {
$self->drop_extra_tables_only;
- rmtree $DUMP_DIR;
+ rmtree DUMP_DIR;
}
}
}
@statements_advanced_sqlite, @statements_inline_rels,
@statements_implicit_rels);
+sub CONSTRAINT {
+ my $self = shift;
+return qr/^(?:\S+\.)?(?:(?:$self->{vendor}|extra)[_-]?)?loader[_-]?test[0-9]+(?!.*_)/i;
+}
+
sub setup_schema {
my ($self, $connect_info, $expected_count) = @_;
- my $schema_class = 'DBIXCSL_Test::Schema';
-
my $debug = ($self->{verbose} > 1) ? 1 : 0;
if ($ENV{SCHEMA_LOADER_TESTS_USE_MOOSE}) {
}
my %loader_opts = (
- constraint =>
- qr/^(?:\S+\.)?(?:(?:$self->{vendor}|extra)[_-]?)?loader[_-]?test[0-9]+(?!.*_)/i,
- relationships => 1,
+ constraint => $self->CONSTRAINT,
+ result_namespace => RESULT_NAMESPACE,
+ resultset_namespace => RESULTSET_NAMESPACE,
+ schema_base_class => 'TestSchemaBaseClass',
+ schema_components => [ 'TestSchemaComponent', '+TestSchemaComponentFQN' ],
additional_classes => 'TestAdditional',
additional_base_classes => 'TestAdditionalBase',
left_base_classes => [ qw/TestLeftBase/ ],
- components => [ qw/TestComponent +TestComponentFQN/ ],
+ components => [ qw/TestComponent +TestComponentFQN IntrospectableM2M/ ],
inflect_plural => { loader_test4_fkid => '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,
+ dump_directory => DUMP_DIR,
datetime_timezone => 'Europe/Berlin',
datetime_locale => 'de_DE',
$self->{use_moose} ? (
rel_collision_map => { '^(set_primary_key)\z' => 'caught_rel_collision_%s' },
col_accessor_map => \&test_col_accessor_map,
result_components_map => { LoaderTest2X => 'TestComponentForMap', LoaderTest1 => '+TestComponentForMapFQN' },
+ uniq_to_primary => 1,
%{ $self->{loader_options} || {} },
);
$loader_opts{db_schema} = $self->{db_schema} if $self->{db_schema};
- Class::Unload->unload($schema_class);
+ Class::Unload->unload(SCHEMA_CLASS);
my $file_count;
{
my @loader_warnings;
local $SIG{__WARN__} = sub { push(@loader_warnings, @_); };
eval qq{
- package $schema_class;
+ 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;
+ find sub { return if -d; $file_count++ }, DUMP_DIR;
my $standard_sources = not defined $expected_count;
if ($standard_sources) {
- $expected_count = 36;
+ $expected_count = 37;
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
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++ 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;
$warn_count-- for grep { my $w = $_; grep $w =~ $_, @{ $self->{failtrigger_warnings} || [] } } @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;
- is(grep(/loader_test9 has no primary key/i, @loader_warnings), 1,
- "Missing PK warning");
- }
- }
- else {
- SKIP: {
- is scalar(@loader_warnings), $warn_count, 'Correct number of warnings'
- or diag @loader_warnings;
- skip "not testing standard sources", 1;
- }
- }
+ is scalar(@loader_warnings), $warn_count, 'Correct number of warnings'
+ or diag @loader_warnings;
}
exit if ($file_count||0) != $expected_count;
-
- return $schema_class;
+
+ return SCHEMA_CLASS;
}
sub test_schema {
my $class35 = $classes->{loader_test35};
my $rsobj35 = $conn->resultset($moniker35);
+ my $moniker50 = $monikers->{loader_test50};
+ my $class50 = $classes->{loader_test50};
+ my $rsobj50 = $conn->resultset($moniker50);
+
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" );
+ isa_ok( $rsobj50, "DBIx::Class::ResultSet" );
+
+ # check result_namespace
+ my @schema_dir = split /::/, SCHEMA_CLASS;
+ my $result_dir = ref RESULT_NAMESPACE ? ${RESULT_NAMESPACE()}[0] : RESULT_NAMESPACE;
+
+ my $schema_files = [ sort map basename($_), glob catfile(DUMP_DIR, @schema_dir, '*') ];
+
+ is_deeply $schema_files, [ $result_dir ],
+ 'first entry in result_namespace exists as a directory';
+
+ my $result_file_count =()= glob catfile(DUMP_DIR, @schema_dir, $result_dir, '*.pm');
+
+ ok $result_file_count,
+ 'Result files dumped to first entry in result_namespace';
+
+ # parse out the resultset_namespace
+ my $schema_code = slurp_file $conn->_loader->get_dump_filename(SCHEMA_CLASS);
+
+ my ($schema_resultset_namespace) = $schema_code =~ /\bresultset_namespace => (.*)/;
+ $schema_resultset_namespace = eval $schema_resultset_namespace;
+ die $@ if $@;
+
+ is_deeply $schema_resultset_namespace, RESULTSET_NAMESPACE,
+ 'resultset_namespace set correctly on Schema';
+
+ like $schema_code,
+qr/\nuse base 'TestSchemaBaseClass';\n\n|\nextends 'TestSchemaBaseClass';\n\n/,
+ 'schema_base_class works';
+
+ is $conn->testschemabaseclass, 'TestSchemaBaseClass works',
+ 'schema base class works';
+
+ like $schema_code,
+qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponentFQN"\);\n\n__PACKAGE__->load_namespaces/,
+ 'schema_components works';
+
+ is $conn->dbix_class_testschemacomponent, 'dbix_class_testschemacomponent works',
+ 'schema component works';
+
+ is $conn->testschemacomponent_fqn, 'TestSchemaComponentFQN works',
+ '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/ ], "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/ ], "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';
}
ok($uniq2_test, "Multi-col unique constraint");
+ my %uniq3 = $class50->unique_constraints;
+
+ is_deeply $uniq3{primary}, ['id1', 'id2'],
+ 'unique constraint promoted to primary key with uniq_to_primary';
+
is($moniker2, 'LoaderTest2X', "moniker_map testing");
SKIP: {
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(
- sprintf("%.3f", $class35->column_info('a_double')->{default_value}), '10.555',
+ sprintf("%.3f", $class35->column_info('a_double')->{default_value}||0), '10.555',
'constant numeric default',
);
is(
- sprintf("%.3f", $class35->column_info('a_negative_double')->{default_value}), -10.555,
+ sprintf("%.3f", $class35->column_info('a_negative_double')->{default_value}||0), -10.555,
'constant negative numeric default',
);
);
}
+ is( $class2->column_info('crumb_crisp_coating')->{accessor}, 'trivet',
+ 'col_accessor_map is being run' );
+
+ is $class1->column_info('dat')->{is_nullable}, 0,
+ 'is_nullable=0 detection';
+
+ is $class2->column_info('set_primary_key')->{is_nullable}, 1,
+ 'is_nullable=1 detection';
+
SKIP: {
- skip $self->{skip_rels}, 124 if $self->{skip_rels};
+ skip $self->{skip_rels}, 137 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);
-
+
isa_ok( $rsobj3, "DBIx::Class::ResultSet" );
isa_ok( $rsobj4, "DBIx::Class::ResultSet" );
isa_ok( $rsobj5, "DBIx::Class::ResultSet" );
isa_ok( $rsobj36, "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);
-
- is( $class4->column_info('crumb_crisp_coating')->{accessor}, 'trivet',
- 'col_accessor_map is being run' );
+ 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";
+ like try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_delete} },
+ qr/^(?:CASCADE|RESTRICT)\z/,
+ "on_delete is either CASCADE or RESTRICT on belongs_to by default";
- is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update} }, 'CASCADE',
- "on_update => 'CASCADE' on belongs_to by default";
+ like try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update} },
+ qr/^(?:CASCADE|RESTRICT)\z/,
+ "on_update is either CASCADE or RESTRICT 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";
'might_have does not have is_deferrable');
# find on multi-col pk
- if ($conn->_loader->preserve_case) {
+ if ($conn->loader->preserve_case) {
my $obj5 = $rsobj5->find({id1 => 1, iD2 => 1});
is $obj5->i_d2, 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);
$class6->column_info('Id2');
ok($id2_info->{is_foreign_key}, 'Foreign key detected');
- unlike slurp($conn->_loader->get_dump_filename($class6)),
+ 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+?)"
.*?
\s+ "\1"/xs,
'did not create two relationships with the same name';
- unlike slurp($conn->_loader->get_dump_filename($class8)),
+ 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+?)"
.*?
'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");
-
+ 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
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;
+
+ ok($m2m = (try { $class18->_m2m_metadata->{children} }), 'many_to_many created');
+
+ is $m2m->{relation}, 'loader_test20s', 'm2m near rel';
+ is $m2m->{foreign_relation}, 'child', 'm2m far rel';
+
+ ok($m2m = (try { $class19->_m2m_metadata->{parents} }), 'many_to_many created');
+
+ is $m2m->{relation}, 'loader_test20s', 'm2m near rel';
+ is $m2m->{foreign_relation}, 'parent', 'm2m far rel';
+
# 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");
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 );
}
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 );
}
}
$digest->addfile($fh);
};
- find $find_cb, $DUMP_DIR;
+ find $find_cb, DUMP_DIR;
-# system "rm -f /tmp/before_rescan/* /tmp/after_rescan/*";
-# system "cp $tdir/common_dump/DBIXCSL_Test/Schema/*.pm /tmp/before_rescan";
+# 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;
is_deeply(\@new, [ qw/LoaderTest30/ ], "Rescan");
-# system "cp t/_common_dump/DBIXCSL_Test/Schema/*.pm /tmp/after_rescan";
+# system "cp -a @{[DUMP_DIR]} /tmp/after_rescan";
$digest = Digest::MD5->new;
- find $find_cb, $DUMP_DIR;
+ find $find_cb, DUMP_DIR;
my $after_digest = $digest->b64digest;
is $before_digest, $after_digest,
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},
$self->test_data_types($conn);
+ $self->test_preserve_case($conn);
+
# run extra tests
$self->{extra}{run}->($conn, $monikers, $classes, $self) if $self->{extra}{run};
- $self->test_preserve_case($conn);
+ ## 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 $warn_handler = $SIG{__WARN__} || sub { warn @_ };
+ local $SIG{__WARN__} = sub {
+ $warn_handler->(@_)
+ unless $_[0] =~ RESCAN_WARNINGS
+ || $_[0] =~ /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);
+}
$self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP};
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} };
);
$conn->storage->disconnect;
- local $conn->_loader->{preserve_case} = 1;
- $conn->_loader->_setup;
+ my $orig_preserve_case = $conn->loader->preserve_case;
+ $conn->loader->preserve_case(1);
+ $conn->loader->_setup;
$self->rescan_without_warnings($conn);
if (not $self->{skip_rels}) {
is try { $conn->resultset('LoaderTest40')->find(1)->foo3_bar }, 'foo',
'accessor for mixed-case column name in mixed case table';
}
+
+ # Further tests may expect preserve_case to be unset, so reset it to the
+ # original value and rescan again.
+
+ $conn->loader->preserve_case($orig_preserve_case);
+ $conn->loader->_setup;
+ $self->rescan_without_warnings($conn);
}
sub monikers_and_classes {
my ($monikers, $classes);
foreach my $source_name ($schema_class->sources) {
- my $table_name = $schema_class->source($source_name)->from;
+ my $table_name = $schema_class->loader->moniker_to_table->{$source_name};
- $table_name = $$table_name if ref $table_name;
+ my $result_class = $schema_class->source($source_name)->result_class;
$monikers->{$table_name} = $source_name;
- $classes->{$table_name} = $schema_class . q{::} . $source_name;
+ $classes->{$table_name} = $result_class;
- # some DBs (Firebird) uppercase everything
+ # some DBs (Firebird, Oracle) uppercase everything
$monikers->{lc $table_name} = $source_name;
- $classes->{lc $table_name} = $schema_class . q{::} . $source_name;
+ $classes->{lc $table_name} = $result_class;
}
return ($monikers, $classes);
$self->drop_tables;
- my $make_auto_inc = $self->{auto_inc_cb} || sub {};
+ my $make_auto_inc = $self->{auto_inc_cb} || sub { return () };
@statements = (
qq{
CREATE TABLE loader_test1s (
$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
- qq{
+ # crumb_crisp_coating is for col_accessor_map tests
+ qq{
CREATE TABLE loader_test2 (
id $self->{auto_inc_pk},
dat VARCHAR(32) NOT NULL,
meta INTEGER $self->{null},
test_role_method INTEGER $self->{null},
test_role_for_map_method INTEGER $self->{null},
+ crumb_crisp_coating 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 (
c_char_as_data VARCHAR(100)
) $self->{innodb}
},
+ # DB2 does not allow nullable uniq components, SQLAnywhere automatically
+ # converts nullable uniq components to NOT NULL
+ qq{
+ CREATE TABLE loader_test50 (
+ id INTEGER NOT NULL UNIQUE,
+ id1 INTEGER NOT NULL,
+ id2 INTEGER NOT NULL,
+ @{[ $self->{vendor} !~ /^(?:DB2|SQLAnywhere)\z/i ? "
+ id3 INTEGER $self->{null},
+ id4 INTEGER NOT NULL,
+ UNIQUE (id3, id4),
+ " : '' ]}
+ UNIQUE (id1, id2)
+ ) $self->{innodb}
+ },
);
# some DBs require mixed case identifiers to be quoted
) $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 (
id INTEGER NOT NULL PRIMARY KEY,
fkid INTEGER NOT NULL,
dat VARCHAR(32),
- crumb_crisp_coating VARCHAR(32) $self->{null},
belongs_to INTEGER $self->{null},
set_primary_key INTEGER $self->{null},
FOREIGN KEY( fkid ) REFERENCES loader_test3 (id),
},
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) },
dat VARCHAR(8)
) $self->{innodb}
},
-
+
q{ INSERT INTO loader_test14 (id,dat) VALUES (123,'aaa') },
qq{
$dbh->do($_) foreach (@statements);
if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) {
- $dbh->do($_) foreach (@{ $self->{data_type_tests}{ddl} || [] });
+ foreach my $ddl (@{ $self->{data_type_tests}{ddl} || [] }) {
+ if (my $cb = $self->{data_types_ddl_cb}) {
+ $cb->($ddl);
+ }
+ else {
+ $dbh->do($ddl);
+ }
+ }
}
- unless($self->{skip_rels}) {
+ 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.
LoAdEr_test24
loader_test35
loader_test36
+ loader_test50
/;
-
+
my @tables_auto_inc = (
[ qw/loader_test1s id/ ],
[ qw/loader_test2 id/ ],
loader_test11
loader_test10
/;
-
+
my @tables_advanced_auto_inc = (
[ qw/loader_test10 id10/ ],
[ qw/loader_test11 id11/ ],
my $drop_auto_inc = $self->{auto_inc_drop_cb} || sub {};
- unless($self->{skip_rels}) {
+ unless ($self->{skip_rels}) {
# drop the circular rel columns if possible, this
# doesn't work on all DBs
foreach my $table (keys %drop_columns) {
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' );
}
my %seen_col_names;
while (my ($col_def, $expected_info) = each %$types) {
- (my $type_alias = $col_def) =~ s/\( ([^)]+) \)//xg;
+ (my $type_alias = $col_def) =~ s/\( (.+) \)(?=(?:[^()]* '(?:[^']* (?:''|\\')* [^']*)* [^\\']' [^()]*)*\z)//xg;
my $size = $1;
$size = '' unless defined $size;
+ $size = '' unless $size =~ /^[\d, ]+\z/;
$size =~ s/\s+//g;
my @size = split /,/, $size;
# some DBs don't like very long column names
- if ($self->{vendor} =~ /^(?:firebird|sqlanywhere|oracle|db2)\z/i) {
+ if ($self->{vendor} =~ /^(?:Firebird|SQLAnywhere|Oracle|DB2)\z/i) {
my ($col_def, $default) = $type_alias =~ /^(.*)(default.*)?\z/i;
$type_alias = substr $col_def, 0, 15;
$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
+ # 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}++;
my $self = shift;
unless ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}) {
$self->drop_tables if $self->{_created};
- rmtree $DUMP_DIR
+ rmtree DUMP_DIR
}
}