use Class::Unload;
use File::Temp qw/tempfile tempdir/;
use IO::File;
-use File::Slurp 'slurp';
use DBIx::Class::Schema::Loader ();
+use DBIx::Class::Schema::Loader::Utils 'slurp_file';
use Lingua::EN::Inflect::Number ();
use lib qw(t/lib);
use make_dbictest_db_with_unique;
+use dbixcsl_test_dir qw/$tdir/;
-my $DUMP_DIR = './t/_common_dump';
+my $DUMP_DIR = "$tdir/common_dump";
rmtree $DUMP_DIR;
my $SCHEMA_CLASS = 'DBIXCSL_Test::Schema';
Bar => 'Foos',
});
- my $res = run_loader(naming => 'current');
+ my $res = run_loader(naming => 'current', use_namespaces => 0);
my $schema = $res->{schema};
is scalar @{ $res->{warnings} }, 1,
my $res = run_loader(static => 1, naming => 'current');
my $schema = $res->{schema};
- my $file = $schema->_loader->_get_dump_filename($SCHEMA_CLASS);
- my $code = slurp $file;
+ my $file = $schema->loader->get_dump_filename($SCHEMA_CLASS);
+ my $code = slurp_file $file;
my ($dumped_ver) =
$code =~ /^# Created by DBIx::Class::Schema::Loader v(\S+)/m;
my @connect_info = $make_dbictest_db_with_unique::dsn;
my @loader_warnings;
- local $SIG{__WARN__} = sub { push(@loader_warnings, $_[0]); };
+ local $SIG{__WARN__} = sub { push(@loader_warnings, @_); };
eval qq{
package $SCHEMA_CLASS;
use base qw/DBIx::Class::Schema::Loader/;
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 {
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 {
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 {
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 class_content_like {
my ($schema, $class, $re, $test_name) = @_;
- my $file = $schema->_loader->_get_dump_filename($class);
- my $code = slurp $file;
+ my $file = $schema->loader->get_dump_filename($class);
+ my $code = slurp_file $file;
like $code, $re, $test_name;
}
sub _write_custom_content {
my ($schema, $class, $content) = @_;
- my $pm = $schema->_loader->_get_dump_filename($class);
+ my $pm = $schema->loader->get_dump_filename($class);
{
local ($^I, @ARGV) = ('.bak', $pm);
while (<>) {