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;
+use File::Path 'rmtree';
+use curry;
use DBI;
-use Digest::MD5;
use File::Find 'find';
use Class::Unload ();
-use DBIx::Class::Schema::Loader::Utils 'dumper_squashed';
-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';
+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;
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
$self = bless $self, $class;
+ $self->{preserve_case_tests_table_names} = [qw/LoaderTest40 LoaderTest41/];
+
+ if (lc($self->{vendor}) eq 'mysql' && $^O =~ /^(?:MSWin32|cygwin)\z/) {
+ $self->{preserve_case_tests_table_names} = [qw/Loader_Test40 Loader_Test41/];
+ }
+
$self->setup_data_type_tests;
return $self;
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 = 5;
- $num_rescans-- if $self->{vendor} =~ /^(?:sybase|mysql)\z/i;
- $num_rescans++ if $self->{vendor} eq 'mssql';
- $num_rescans++ if $self->{vendor} eq 'Firebird';
+ my $col_accessor_map_tests = 6;
plan tests => @connect_info *
- (194 + $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];
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);
+ }
+ }
}
+ $dbh->disconnect;
$self->{_created} = 1;
- my $file_count = grep /CREATE (?:TABLE|VIEW)/i, @{ $self->{extra}{create} || [] };
+ 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;
- rmtree $DUMP_DIR;
+ rmtree DUMP_DIR;
}
}
}
local $^W = 0; # for ADO
$dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] };
- $dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] };
+ $self->drop_table($dbh, $_) for @{ $self->{extra}{drop} || [] };
if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) {
foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) {
- $dbh->do("DROP TABLE $data_type_table");
+ $self->drop_table($dbh, $data_type_table);
}
}
}
@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 $schema_class = 'DBIXCSL_Test::Schema';
-
my $debug = ($self->{verbose} > 1) ? 1 : 0;
- if (
- $ENV{SCHEMA_LOADER_TESTS_USE_MOOSE}
- &&
- ! 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 ($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,
- 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 +IntrospectM2M/ ],
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',
- use_moose => $ENV{SCHEMA_LOADER_TESTS_USE_MOOSE},
+ $self->{use_moose} ? (
+ use_moose => 1,
+ result_roles => 'TestRole',
+ result_roles_map => { LoaderTest2X => 'TestRoleForMap' },
+ ) : (),
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,
- result_component_map => { LoaderTest2X => 'TestComponentForMap', LoaderTest1 => '+TestComponentForMapFQN' },
+ 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} || {} },
);
$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;
- 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;
+ find sub { return if -d; $file_count++ }, DUMP_DIR;
my $standard_sources = not defined $expected_count;
if ($standard_sources) {
- $expected_count = 36;
+ $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 /CREATE (?:TABLE|VIEW)/i,
+ $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;
$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 testcomponent_fqn meta/ ], "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';
- is $class2->column_info('set_primary_key')->{accessor}, undef,
- 'accessor for column name that conflicts with a result base class method removed';
+ ok (exists $class2->column_info('set_primary_key')->{accessor}
+ && (not defined $class2->column_info('set_primary_key')->{accessor}),
+ 'accessor for column name that conflicts with a result base class method removed');
+
+ ok (exists $class2->column_info('dbix_class_testcomponent')->{accessor}
+ && (not defined $class2->column_info('dbix_class_testcomponent')->{accessor}),
+ 'accessor for column name that conflicts with a component class method removed');
+
+ ok (exists $class2->column_info('dbix_class_testcomponentmap')->{accessor}
+ && (not defined $class2->column_info('dbix_class_testcomponentmap')->{accessor}),
+ 'accessor for column name that conflicts with a component class method removed');
- is $class2->column_info('dbix_class_testcomponent')->{accessor}, undef,
- 'accessor for column name that conflicts with a component class method removed';
+ ok (exists $class2->column_info('testcomponent_fqn')->{accessor}
+ && (not defined $class2->column_info('testcomponent_fqn')->{accessor}),
+ 'accessor for column name that conflicts with a fully qualified component class method removed');
- is $class2->column_info('testcomponent_fqn')->{accessor}, undef,
- 'accessor for column name that conflicts with a fully qualified component class method removed';
+ if ($self->{use_moose}) {
+ ok (exists $class2->column_info('meta')->{accessor}
+ && (not defined $class2->column_info('meta')->{accessor}),
+ 'accessor for column name that conflicts with Moose removed');
- if ($conn->_loader->use_moose) {
- is $class2->column_info('meta')->{accessor}, undef,
- 'accessor for column name that conflicts with Moose removed';
+ ok (exists $class2->column_info('test_role_for_map_method')->{accessor}
+ && (not defined $class2->column_info('test_role_for_map_method')->{accessor}),
+ 'accessor for column name that conflicts with a Result role removed');
+
+ ok (exists $class2->column_info('test_role_method')->{accessor}
+ && (not defined $class2->column_info('test_role_method')->{accessor}),
+ 'accessor for column name that conflicts with a Result role removed');
}
else {
- pass "not removing 'meta' accessor with use_moose disabled";
+ ok ((not exists $class2->column_info('meta')->{accessor}),
+ "not removing 'meta' accessor with use_moose disabled");
+
+ ok ((not exists $class2->column_info('test_role_for_map_method')->{accessor}),
+ 'no role method conflicts with use_moose disabled');
+
+ ok ((not exists $class2->column_info('test_role_method')->{accessor}),
+ 'no role method conflicts with use_moose disabled');
}
my %uniq1 = $class1->unique_constraints;
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($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: {
'Additional Component' );
}
- is try { $class2->dbix_class_testcomponentformap }, 'dbix_class_testcomponentformap works',
+ is try { $class2->dbix_class_testcomponentmap }, 'dbix_class_testcomponentmap works',
'component from result_component_map';
- isnt try { $class1->dbix_class_testcomponentformap }, 'dbix_class_testcomponentformap works',
+ isnt try { $class1->dbix_class_testcomponentmap }, 'dbix_class_testcomponentmap works',
'component from result_component_map not added to not mapped Result';
is try { $class1->testcomponent_fqn }, 'TestComponentFQN works',
'fully qualified component class from result_component_map not added to not mapped Result';
SKIP: {
+ skip 'not testing role methods with use_moose disabled', 2
+ unless $self->{use_moose};
+
+ is try { $class1->test_role_method }, 'test_role_method works',
+ 'role from result_roles applied';
+
+ is try { $class2->test_role_for_map_method },
+ 'test_role_for_map_method works',
+ 'role from result_roles_map applied';
+ }
+
+ SKIP: {
can_ok( $class1, 'loader_test1_classmeth' )
or skip "Pre-requisite test failed", 1;
is( $class1->loader_test1_classmeth, 'all is well', 'Class method' );
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( $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 $class2->column_info('set_primary_key')->{is_nullable}, 1,
+ 'is_nullable=1 detection';
+
SKIP: {
- skip $self->{skip_rels}, 120 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);
-
- 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";
+ 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_delete} },
+ $default_on_delete_clause,
+ "on_delete is $default_on_delete_clause 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} }, 'CASCADE',
- "on_update => 'CASCADE' on belongs_to by default";
+ 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";
- is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable} }, 1,
- "is_deferrable => 1 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');
'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';
}
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 = eval { $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';
+
+ 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';
+
+ # check naming of ambiguous relationships
+ my $rel_info = $class6->relationship_info('lovely_loader_test7') || {};
+
+ ok (($class6->has_relationship('lovely_loader_test7')
+ && $rel_info->{cond}{'foreign.lovely_loader_test6'} eq 'self.id'
+ && $rel_info->{class} eq $class7
+ && $rel_info->{attrs}{accessor} eq 'single'),
+ 'ambiguous relationship named correctly');
+
+ $rel_info = $class8->relationship_info('active_loader_test16') || {};
+
+ ok (($class8->has_relationship('active_loader_test16')
+ && $rel_info->{cond}{'foreign.loader_test8_id'} eq 'self.id'
+ && $rel_info->{class} eq $class16
+ && $rel_info->{attrs}{accessor} eq 'single'),
+ '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' );
}
SKIP: {
- skip 'This vendor cannot do inline relationship definitions', 11
+ skip 'This vendor cannot do inline relationship definitions', 9
if $self->{no_inline_rels};
my $moniker12 = $monikers->{loader_test12};
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
-
- skip 'Sybase cannot add FKs via ALTER TABLE', 2
- if $self->{vendor} eq 'sybase';
-
- {
- local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /invalidates \d+ active statement/ };
- $conn->storage->disconnect; # for mssql and access
- }
+ # relname is preserved when another fk is added
+ {
+ local $SIG{__WARN__} = sigwarn_silencer(qr/invalidates \d+ active statement/);
+ $conn->storage->disconnect; # for mssql and access
+ }
- isa_ok try { $rsobj3->find(1)->loader_test4zes }, 'DBIx::Class::ResultSet';
+ isa_ok try { $rsobj3->find(1)->loader_test4zes }, 'DBIx::Class::ResultSet';
- $conn->storage->disconnect; # for access
+ $conn->storage->disconnect; # for access
+ if (lc($self->{vendor}) !~ /^(?:sybase|mysql)\z/) {
$conn->storage->dbh->do('ALTER TABLE loader_test4 ADD fkid2 INTEGER REFERENCES loader_test3 (id)');
+ }
+ else {
+ $conn->storage->dbh->do(<<"EOF");
+ ALTER TABLE loader_test4 ADD fkid2 INTEGER $self->{null}
+EOF
+ $conn->storage->dbh->do(<<"EOF");
+ ALTER TABLE loader_test4 ADD CONSTRAINT loader_test4_to_3_fk FOREIGN KEY (fkid2) REFERENCES loader_test3 (id)
+EOF
+ }
- $conn->storage->disconnect; # for firebird
+ $conn->storage->disconnect; # for firebird
- $self->rescan_without_warnings($conn);
+ $self->rescan_without_warnings($conn);
- isa_ok try { $rsobj3->find(1)->loader_test4zes }, 'DBIx::Class::ResultSet',
- 'relationship name preserved when another foreign key is added in remote table';
- }
+ isa_ok try { $rsobj3->find(1)->loader_test4zes }, 'DBIx::Class::ResultSet',
+ 'relationship name preserved when another foreign key is added in remote table';
SKIP: {
skip 'This vendor cannot do out-of-line implicit rel defs', 4
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;
-
-# system "rm -f /tmp/before_rescan/* /tmp/after_rescan/*";
-# system "cp $tdir/common_dump/DBIXCSL_Test/Schema/*.pm /tmp/before_rescan";
+ find $find_cb, DUMP_DIR;
+ my %contents_before = %contents;
- my $before_digest = $digest->b64digest;
+# 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";
$conn->storage->disconnect; # needed for Firebird and Informix
my $dbh = $self->dbconnect(1);
is_deeply(\@new, [ qw/LoaderTest30/ ], "Rescan");
-# system "cp t/_common_dump/DBIXCSL_Test/Schema/*.pm /tmp/after_rescan";
-
- $digest = Digest::MD5->new;
- 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';
+# system "cp -a @{[DUMP_DIR]} /tmp/after_rescan";
+
+ undef %contents;
+ find $find_cb, DUMP_DIR;
+ 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
- $conn->storage->dbh->do("DROP TABLE loader_test30");
+ $self->drop_table($conn->storage->dbh, 'loader_test30');
@new = $self->rescan_without_warnings($conn);
$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
- $self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP};
+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} };
$dbh->do($_) for (
qq|
- CREATE TABLE ${oqt}LoaderTest40${cqt} (
+ CREATE TABLE ${oqt}${table40_name}${cqt} (
${oqt}Id${cqt} INTEGER NOT NULL PRIMARY KEY,
${oqt}Foo3Bar${cqt} VARCHAR(100) NOT NULL
) $self->{innodb}
|,
qq|
- CREATE TABLE ${oqt}LoaderTest41${cqt} (
+ CREATE TABLE ${oqt}${table41_name}${cqt} (
${oqt}Id${cqt} INTEGER NOT NULL PRIMARY KEY,
${oqt}LoaderTest40Id${cqt} INTEGER,
- FOREIGN KEY (${oqt}LoaderTest40Id${cqt}) REFERENCES ${oqt}LoaderTest40${cqt} (${oqt}Id${cqt})
+ FOREIGN KEY (${oqt}LoaderTest40Id${cqt}) REFERENCES ${oqt}${table40_name}${cqt} (${oqt}Id${cqt})
) $self->{innodb}
|,
-qq| INSERT INTO ${oqt}LoaderTest40${cqt} VALUES (1, 'foo') |,
-qq| INSERT INTO ${oqt}LoaderTest41${cqt} VALUES (1, 1) |,
+qq| INSERT INTO ${oqt}${table40_name}${cqt} VALUES (1, 'foo') |,
+qq| INSERT INTO ${oqt}${table41_name}${cqt} VALUES (1, 1) |,
);
$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 and sticky_filling are for col_accessor_map tests
+ qq{
CREATE TABLE loader_test2 (
id $self->{auto_inc_pk},
dat VARCHAR(32) NOT NULL,
set_primary_key INTEGER $self->{null},
can INTEGER $self->{null},
dbix_class_testcomponent INTEGER $self->{null},
+ dbix_class_testcomponentmap INTEGER $self->{null},
testcomponent_fqn INTEGER $self->{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},
+ 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 (
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) },
(qq| INSERT INTO loader_test6 (id, ${oqt}Id2${cqt},loader_test2_id,dat) | .
q{ VALUES (1, 1,1,'aaa') }),
+ # here we are testing adjective detection
+
qq{
CREATE TABLE loader_test7 (
id INTEGER NOT NULL PRIMARY KEY,
id2 VARCHAR(8) NOT NULL UNIQUE,
- dat VARCHAR(8)
+ dat VARCHAR(8),
+ lovely_loader_test6 INTEGER NOT NULL UNIQUE,
+ FOREIGN KEY (lovely_loader_test6) REFERENCES loader_test6 (id)
) $self->{innodb}
},
- q{ INSERT INTO loader_test7 (id,id2,dat) VALUES (1,'aaa','bbb') },
+ q{ INSERT INTO loader_test7 (id,id2,dat,lovely_loader_test6) VALUES (1,'aaa','bbb',1) },
+
+ # for some DBs we need a named FK to drop later
+ ($self->{vendor} =~ /^(mssql|sybase|access|mysql)\z/i ? (
+ (q{ ALTER TABLE loader_test6 ADD } .
+ qq{ loader_test7_id INTEGER $self->{null} }),
+ (q{ ALTER TABLE loader_test6 ADD CONSTRAINT loader_test6_to_7_fk } .
+ q{ FOREIGN KEY (loader_test7_id) } .
+ q{ REFERENCES loader_test7 (id) })
+ ) : (
+ (q{ ALTER TABLE loader_test6 ADD } .
+ qq{ loader_test7_id INTEGER $self->{null} REFERENCES loader_test7 (id) }),
+ )),
qq{
CREATE TABLE loader_test8 (
) $self->{innodb}
},
- (q{ INSERT INTO loader_test8 (id,loader_test7,dat) } .
- q{ VALUES (1,'aaa','bbb') }),
+ (q{ INSERT INTO loader_test8 (id,loader_test7,dat) VALUES (1,'aaa','bbb') }),
+ (q{ INSERT INTO loader_test8 (id,loader_test7,dat) VALUES (2,'aaa','bbb') }),
+ (q{ INSERT INTO loader_test8 (id,loader_test7,dat) VALUES (3,'aaa','bbb') }),
qq{
CREATE TABLE loader_test9 (
qq{
CREATE TABLE loader_test16 (
id INTEGER NOT NULL PRIMARY KEY,
- dat VARCHAR(8)
+ dat VARCHAR(8),
+ loader_test8_id INTEGER NOT NULL UNIQUE,
+ FOREIGN KEY (loader_test8_id) REFERENCES loader_test8 (id)
) $self->{innodb}
},
- qq{ INSERT INTO loader_test16 (id,dat) VALUES (2,'x16') },
- qq{ INSERT INTO loader_test16 (id,dat) VALUES (4,'y16') },
- qq{ INSERT INTO loader_test16 (id,dat) VALUES (6,'z16') },
+ qq{ INSERT INTO loader_test16 (id,dat,loader_test8_id) VALUES (2,'x16',1) },
+ qq{ INSERT INTO loader_test16 (id,dat,loader_test8_id) VALUES (4,'y16',2) },
+ qq{ INSERT INTO loader_test16 (id,dat,loader_test8_id) VALUES (6,'z16',3) },
+
+ # for some DBs we need a named FK to drop later
+ ($self->{vendor} =~ /^(mssql|sybase|access|mysql)\z/i ? (
+ (q{ ALTER TABLE loader_test8 ADD } .
+ qq{ loader_test16_id INTEGER $self->{null} }),
+ (q{ ALTER TABLE loader_test8 ADD CONSTRAINT loader_test8_to_16_fk } .
+ q{ FOREIGN KEY (loader_test16_id) } .
+ q{ REFERENCES loader_test16 (id) })
+ ) : (
+ (q{ ALTER TABLE loader_test8 ADD } .
+ qq{ loader_test16_id INTEGER $self->{null} REFERENCES loader_test16 (id) }),
+ )),
qq{
CREATE TABLE loader_test17 (
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{
$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_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/ ],
my @tables_rescan = qw/ loader_test30 /;
- my @tables_preserve_case_tests = qw/ LoaderTest41 LoaderTest40 /;
+ my @tables_preserve_case_tests = @{ $self->{preserve_case_tests_table_names} };
- my $drop_fk_mysql =
- q{ALTER TABLE loader_test10 DROP FOREIGN KEY loader_test11_fk};
+ my %drop_columns = (
+ loader_test6 => 'loader_test7_id',
+ loader_test7 => 'lovely_loader_test6',
+ loader_test8 => 'loader_test16_id',
+ loader_test16 => 'loader_test8_id',
+ );
- my $drop_fk =
- q{ALTER TABLE loader_test10 DROP CONSTRAINT loader_test11_fk};
+ my %drop_constraints = (
+ loader_test10 => 'loader_test11_fk',
+ loader_test6 => 'loader_test6_to_7_fk',
+ loader_test8 => 'loader_test8_to_16_fk',
+ );
# For some reason some tests do this twice (I guess dependency issues?)
# do it twice for all drops
$dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] };
- $dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] };
+ $self->drop_table($dbh, $_) for @{ $self->{extra}{drop} || [] };
my $drop_auto_inc = $self->{auto_inc_drop_cb} || sub {};
- unless($self->{skip_rels}) {
- $dbh->do("DROP TABLE $_") for (@tables_reltests);
- $dbh->do("DROP TABLE $_") for (@tables_reltests);
- if($self->{vendor} =~ /mysql/i) {
- $dbh->do($drop_fk_mysql);
+ unless ($self->{skip_rels}) {
+ # drop the circular rel columns if possible, this
+ # doesn't work on all DBs
+ foreach my $table (keys %drop_columns) {
+ $dbh->do("ALTER TABLE $table DROP $drop_columns{$table}");
+ $dbh->do("ALTER TABLE $table DROP COLUMN $drop_columns{$table}");
}
- else {
- $dbh->do($drop_fk);
+
+ foreach my $table (keys %drop_constraints) {
+ # for MSSQL
+ $dbh->do("ALTER TABLE $table DROP $drop_constraints{$table}");
+ # for Sybase and Access
+ $dbh->do("ALTER TABLE $table DROP CONSTRAINT $drop_constraints{$table}");
+ # for MySQL
+ $dbh->do("ALTER TABLE $table DROP FOREIGN KEY $drop_constraints{$table}");
}
+
+ $self->drop_table($dbh, $_) for (@tables_reltests);
+ $self->drop_table($dbh, $_) for (@tables_reltests);
+
$dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_advanced_auto_inc;
- $dbh->do("DROP TABLE $_") for (@tables_advanced);
+
+ $self->drop_table($dbh, $_) for (@tables_advanced);
unless($self->{no_inline_rels}) {
- $dbh->do("DROP TABLE $_") for (@tables_inline_rels);
+ $self->drop_table($dbh, $_) for (@tables_inline_rels);
}
unless($self->{no_implicit_rels}) {
- $dbh->do("DROP TABLE $_") for (@tables_implicit_rels);
+ $self->drop_table($dbh, $_) for (@tables_implicit_rels);
}
}
$dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_auto_inc;
- $dbh->do("DROP TABLE $_") for (@tables, @tables_rescan);
+ $self->drop_table($dbh, $_) for (@tables, @tables_rescan);
if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) {
foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) {
- $dbh->do("DROP TABLE $data_type_table");
+ $self->drop_table($dbh, $data_type_table);
}
}
- my ($oqt, $cqt) = $self->get_oqt_cqt(always => 1);
-
- $dbh->do("DROP TABLE ${oqt}${_}${cqt}") for @tables_preserve_case_tests;
+ $self->drop_table($dbh, $_) for @tables_preserve_case_tests;
$dbh->disconnect;
}
}
+sub drop_table {
+ my ($self, $dbh, $table) = @_;
+
+ local $^W = 0; # for ADO
+
+ try { $dbh->do("DROP TABLE $table CASCADE CONSTRAINTS") }; # oracle
+ try { $dbh->do("DROP TABLE $table CASCADE") }; # postgres and ?
+ try { $dbh->do("DROP TABLE $table") };
+
+ # if table name is case sensitive
+ my ($oqt, $cqt) = $self->get_oqt_cqt(always => 1);
+
+ try { $dbh->do("DROP TABLE ${oqt}${table}${cqt}") };
+}
+
sub _custom_column_info {
my ( $table_name, $column_name, $column_info ) = @_;
$table_name = lc ( $table_name );
$column_name = lc ( $column_name );
- if ( $table_name eq 'loader_test35'
- and $column_name eq 'an_int'
+ 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;
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}++;
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