{
my $res = run_loader(naming => 'current');
is_deeply $res->{warnings}, [], 'no warnings with naming attribute set';
- run_v7_tests($res);
+ run_v8_tests($res);
}
# test upgraded dynamic schema with external content loaded
'unsingularized class names in external content from unchanged Result class ' .
'names are translated';
- run_v7_tests($res);
+ run_v8_tests($res);
}
# test upgraded dynamic schema with use_namespaces with external content loaded
'unsingularized class names in external content from unchanged Result class ' .
'names are translated';
- run_v7_tests($res);
+ run_v8_tests($res);
}
# test upgraded static schema with external content loaded
my $res = run_loader(static => 1, naming => 'current');
my $schema = $res->{schema};
- run_v7_tests($res);
+ run_v8_tests($res);
lives_and { is $schema->resultset('Quux')->find(1)->a_method, 'hlagh' }
'external custom content for unsingularized Result was loaded by upgraded ' .
'correct number of warnings on upgrading static schema (with "naming" set)'
or diag @{ $res->{warnings} };
- run_v7_tests($res);
+ run_v8_tests($res);
is result_count('Result'), $RESULT_COUNT,
'un-singularized results were replaced during upgrade';
'correct number of warnings on upgrading static schema (with "naming" set)'
or diag @{ $res->{warnings} };
- run_v7_tests($res);
+ run_v8_tests($res);
is result_count(), $RESULT_COUNT,
'un-singularized results were replaced during upgrade';
'correct number of warnings on upgrading static schema (with "naming" set)'
or diag @{ $res->{warnings} };
- run_v7_tests($res);
+ run_v8_tests($res);
is result_count(), $RESULT_COUNT,
'un-singularized results were replaced during upgrade and Result dir removed';
clean_dumpdir => 1,
static => 1,
use_namespaces => 0,
+ naming => 'current',
);
like $res->{warnings}[0], qr/Dumping manual schema/i,
'correct number of warnings on dumping static schema with use_namespaces => 0'
or diag @{ $res->{warnings} };
- run_v7_tests($res);
+ run_v8_tests($res);
my $schema = $res->{schema};
add_custom_content($res->{schema}, {
# test that with no use_namespaces option, there is a warning and
# load_classes is preserved
- $res = run_loader(static => 1);
+ $res = run_loader(static => 1, naming => 'current');
like $res->{warnings}[0], qr/load_classes/i,
'correct warnings on re-dumping static schema with load_classes';
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Quux',
'load_classes preserved on re-dump';
- run_v7_tests($res);
+ run_v8_tests($res);
# now upgrade the schema to use_namespaces
$res = run_loader(
static => 1,
use_namespaces => 1,
+ naming => 'current',
);
$schema = $res->{schema};
'correct number of warnings on upgrading to use_namespaces'
or diag @{ $res->{warnings} };
- run_v7_tests($res);
+ run_v8_tests($res);
my @schema_files = schema_files();
# test a regular schema with default use_namespaces => 1, redump, and downgrade
# to load_classes
{
- my $res = run_loader(clean_dumpdir => 1, static => 1);
+ my $res = run_loader(clean_dumpdir => 1, static => 1, naming => 'current');
like $res->{warnings}[0], qr/Dumping manual schema/i,
'correct warnings on dumping static schema';
'correct number of warnings on dumping static schema'
or diag @{ $res->{warnings} };
- run_v7_tests($res);
+ run_v8_tests($res);
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Result::Quux',
'defaults to use_namespaces on regular dump';
add_custom_content($res->{schema}, { Quux => 'Baz' }, { result_namespace => 'Result' });
# test that with no use_namespaces option, use_namespaces is preserved
- $res = run_loader(static => 1);
+ $res = run_loader(static => 1, naming => 'current');
like $res->{warnings}[0], qr/Dumping manual schema/i,
'correct warnings on re-dumping static schema';
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Result::Quux',
'use_namespaces preserved on re-dump';
- run_v7_tests($res);
+ run_v8_tests($res);
# now downgrade the schema to load_classes
$res = run_loader(
static => 1,
use_namespaces => 0,
+ naming => 'current',
);
my $schema = $res->{schema};
'correct number of warnings on downgrading to load_classes'
or diag @{ $res->{warnings} };
- run_v7_tests($res);
+ run_v8_tests($res);
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Quux',
'load_classes downgrade correct';
clean_dumpdir => 1,
static => 1,
result_namespace => 'MyResult',
+ naming => 'current',
);
like $res->{warnings}[0], qr/Dumping manual schema/i,
'correct number of warnings on dumping static schema'
or diag @{ $res->{warnings} };
- run_v7_tests($res);
+ run_v8_tests($res);
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::MyResult::Quux',
'defaults to use_namespaces and uses custom result_namespace';
# test that with no use_namespaces option, use_namespaces is preserved, and
# the custom result_namespace is preserved
- $res = run_loader(static => 1);
+ $res = run_loader(static => 1, naming => 'current');
like $res->{warnings}[0], qr/Dumping manual schema/i,
'correct warnings on re-dumping static schema';
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::MyResult::Quux',
'use_namespaces and custom result_namespace preserved on re-dump';
- run_v7_tests($res);
+ run_v8_tests($res);
# now downgrade the schema to load_classes
$res = run_loader(
static => 1,
use_namespaces => 0,
+ naming => 'current',
);
my $schema = $res->{schema};
'correct number of warnings on downgrading to load_classes'
or diag @{ $res->{warnings} };
- run_v7_tests($res);
+ run_v8_tests($res);
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Quux',
'load_classes downgrade correct';
clean_dumpdir();
my $temp_dir = setup_load_external({ Quux => 'Baz', Bar => 'Foo' }, { result_namespace => 'Result' });
- my $res = run_loader(static => 1);
+ my $res = run_loader(static => 1, naming => 'current');
# add some custom content to a Result that will be replaced
add_custom_content($res->{schema}, { Quux => 'Baz' }, { result_namespace => 'Result', rel_name_map => { QuuxBaz => 'bazrel2' } });
$res = run_loader(
static => 1,
result_namespace => 'MyResult',
+ naming => 'current',
);
my $schema = $res->{schema};
$res = run_loader(
static => 1,
result_namespace => 'Mtfnpy',
+ naming => 'current',
);
$schema = $res->{schema};
# now upgrade the schema
$res = run_loader(static => 1, naming => 'current');
$schema = $res->{schema};
- run_v7_tests($res);
+ run_v8_tests($res);
# check that custom content was preserved
lives_and { is $schema->resultset('Bar')->find(1)->b_method, 'dongs' }
$res = run_loader(static => 1, naming => 'current');
my $schema = $res->{schema};
- run_v7_tests($res);
+ run_v8_tests($res);
lives_and { is $schema->resultset('Baz')->find(1)->a_method, 'hlagh' }
'external custom content loaded for v5 -> v6';
$res = run_loader(static => 1, naming => 'current');
my $schema = $res->{schema};
- run_v7_tests($res);
+ run_v8_tests($res);
lives_and { is $schema->resultset('RouteChange')->find(1)->a_method, 'hlagh' }
'external custom content loaded for v6 -> v7';
my %loader_opts = @_;
$loader_opts{dump_directory} = $DUMP_DIR if delete $loader_opts{static};
+ $loader_opts{preserve_case} = 1 if $loader_opts{naming} && $loader_opts{naming} eq 'current';
clean_dumpdir() if delete $loader_opts{clean_dumpdir};
isa_ok eval { $foo->email_to_ids }, 'DBIx::Class::ResultSet',
'correct rel name inflection in 0.04006 mode';
+
+ ok (($schema->resultset('Routechange')->find(1)->can('quuxsid')),
+ 'correct column accessor in 0.04006 mode');
+
+ is $schema->resultset('Routechange')->find(1)->foo2bar, 3,
+ 'correct column accessor for column with word ending with digit in v4 mode';
}
sub run_v5_tests {
isa_ok eval { $foo->email_to_ids }, 'DBIx::Class::ResultSet',
'correct rel name inflection in v5 mode';
+
+ ok (($schema->resultset('Routechange')->find(1)->can('quuxsid')),
+ 'correct column accessor in v5 mode');
+
+ is $schema->resultset('Routechange')->find(1)->foo2bar, 3,
+ 'correct column accessor for column with word ending with digit in v5 mode';
}
sub run_v6_tests {
isa_ok eval { $foo->emails_to }, 'DBIx::Class::ResultSet',
'correct rel name inflection in v6 mode';
+
+ ok my $route_change = eval { $schema->resultset('Routechange')->find(1) };
+
+ isa_ok eval { $route_change->quuxsid }, $res->{classes}{quuxs},
+ 'correct rel name in v6 mode';
+
+ ok (($schema->resultset('Routechange')->find(1)->can('quuxsid')),
+ 'correct column accessor in v6 mode');
+
+ is $schema->resultset('Routechange')->find(1)->foo2bar, 3,
+ 'correct column accessor for column with word ending with digit in v6 mode';
}
sub run_v7_tests {
isa_ok eval { $foo->emails_to }, 'DBIx::Class::ResultSet',
'correct rel name inflection in current mode';
+
+ ok my $route_change = eval { $schema->resultset('RouteChange')->find(1) };
+
+ isa_ok eval { $route_change->quux }, $res->{classes}{quuxs},
+ 'correct rel name based on mixed-case column name in current mode';
+
+ ok (($schema->resultset('RouteChange')->find(1)->can('quuxs_id')),
+ 'correct column accessor in current mode');
+
+ is $schema->resultset('RouteChange')->find(1)->foo2_bar, 3,
+ 'correct column accessor for column with word ending with digit in current mode';
+}
+
+sub run_v8_tests {
+ my $res = shift;
+ my $schema = $res->{schema};
+
+ is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited RouteChange email/} ],
+ [qw/Foo Bar Baz Quux StationVisited RouteChange Email/],
+ 'correct monikers in current mode';
+
+ ok my $bar = eval { $schema->resultset('Bar')->find(1) };
+
+ isa_ok eval { $bar->foo }, $res->{classes}{foos},
+ 'correct rel name in current mode';
+
+ ok my $baz = eval { $schema->resultset('Baz')->find(1) };
+
+ isa_ok eval { $baz->quux }, $res->{classes}{quuxs},
+ 'correct rel type and name for UNIQUE FK in current mode';
+
+ ok my $foo = eval { $schema->resultset('Foo')->find(1) };
+
+ isa_ok eval { $foo->emails_to }, 'DBIx::Class::ResultSet',
+ 'correct rel name inflection in current mode';
+
+ ok my $route_change = eval { $schema->resultset('RouteChange')->find(1) };
+
+ isa_ok eval { $route_change->quux }, $res->{classes}{quuxs},
+ 'correct rel name based on mixed-case column name in current mode';
+
+ ok (($schema->resultset('RouteChange')->find(1)->can('quuxs_id')),
+ 'correct column accessor in current mode');
+
+ is $schema->resultset('RouteChange')->find(1)->foo2_bar, 3,
+ 'correct column accessor for column with word ending with digit in current mode';
}
{
BarFoo => q{'foreign.fooid' => 'self.foo_id'},
BazStationsvisited => q{'foreign.id' => 'self.stations_visited_id'},
StationsvisitedQuux => q{'foreign.quuxid' => 'self.quuxs_id'},
- RoutechangeQuux => q{'foreign.quuxid' => 'self.quuxs_id'},
+ RoutechangeQuux => q{'foreign.quuxid' => 'self.QuuxsId'},
}->{_rel_key($from, $to)};
}
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff