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';
my $RESULT_COUNT = 7;
-sub class_content_like;
+sub class_content_contains;
+sub contains;
# test dynamic schema in 0.04006 mode
{
my $res = run_loader();
my $warning = $res->{warnings}[0];
- like $warning, qr/dynamic schema/i,
+ contains $warning, 'Dynamic schema',
'dynamic schema in backcompat mode detected';
- like $warning, qr/run in 0\.04006 mode/i,
+ contains $warning, 'run in 0.04006 mode',
'dynamic schema in 0.04006 mode warning';
- like $warning, qr/DBIx::Class::Schema::Loader::Manual::UpgradingFromV4/,
+ contains $warning, 'DBIx::Class::Schema::Loader::Manual::UpgradingFromV4',
'warning refers to upgrading doc';
-
+
run_v4_tests($res);
}
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,
'content for unsingularized Result.';
my $warning = $res->{warnings}[0];
- like $warning, qr/Detected external content/i,
+ contains $warning, 'Detected external content',
'detected external content warning';
lives_and { is $schema->resultset('Quux')->find(1)->a_method, 'hlagh' }
'content for unsingularized Result with use_namespaces.';
my $warning = $res->{warnings}[0];
- like $warning, qr/Detected external content/i,
+ contains $warning, "Detected external content",
'detected external content warning';
lives_and { is $schema->resultset('Quux')->find(1)->a_method, 'hlagh' }
'unsingularized class names in external content from unchanged Result class ' .
'names are translated in static schema';
- class_content_like $schema, $res->{classes}{quuxs}, qr/package ${SCHEMA_CLASS}::Quux;/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "package ${SCHEMA_CLASS}::Quux;",
'package line translated correctly from external custom content in static dump';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub a_method { 'hlagh' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub a_method { 'hlagh' }",
'external custom content loaded into static dump correctly';
}
my $res = run_loader(static => 1);
my $warning = $res->{warnings}[1];
- like $warning, qr/static schema/i,
+ contains $warning, "static schema",
'static schema in backcompat mode detected';
- like $warning, qr/0.04006/,
+ contains $warning, "0.04006",
'correct version detected';
- like $warning, qr/DBIx::Class::Schema::Loader::Manual::UpgradingFromV4/,
+ contains $warning, "DBIx::Class::Schema::Loader::Manual::UpgradingFromV4",
'refers to upgrading doc';
is scalar @{ $res->{warnings} }, 4,
);
my $schema = $res->{schema};
- like $res->{warnings}[0], qr/Dumping manual schema/i,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on upgrading static schema (with "naming" set)';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on upgrading static schema (with "naming" set)';
is scalar @{ $res->{warnings} }, 2,
$res->{classes}{bazs} }
'unsingularized class names in custom content are translated';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
'custom content from unsingularized Result loaded into static dump correctly';
}
my $res = run_loader(static => 1);
my $warning = $res->{warnings}[1];
- like $warning, qr/static schema/i,
+ contains $warning, "static schema",
'static schema in backcompat mode detected';
- like $warning, qr/0.04006/,
+ contains $warning, "0.04006",
'correct version detected';
- like $warning, qr/DBIx::Class::Schema::Loader::Manual::UpgradingFromV4/,
+ contains $warning, "DBIx::Class::Schema::Loader::Manual::UpgradingFromV4",
'refers to upgrading doc';
is scalar @{ $res->{warnings} }, 4,
);
my $schema = $res->{schema};
- like $res->{warnings}[0], qr/load_classes/i,
+ contains $res->{warnings}[0], "load_classes",
'correct warnings on upgrading static schema (with "naming" set and ' .
'use_namespaces not set)';
- like $res->{warnings}[1], qr/Dumping manual schema/i,
+ contains $res->{warnings}[1], "Dumping manual schema",
'correct warnings on upgrading static schema (with "naming" set and ' .
'use_namespaces not set)';
- like $res->{warnings}[2], qr/dump completed/i,
+ contains $res->{warnings}[2], "dump completed",
'correct warnings on upgrading static schema (with "naming" set and ' .
'use_namespaces not set)';
$res->{classes}{bazs} }
'unsingularized class names in custom content are translated';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
'custom content from unsingularized Result loaded into static dump correctly';
}
my $res = run_loader(static => 1);
my $warning = $res->{warnings}[0];
- like $warning, qr/static schema/i,
+ contains $warning, "static schema",
'static schema in backcompat mode detected';
- like $warning, qr/0.04006/,
+ contains $warning, "0.04006",
'correct version detected';
- like $warning, qr/DBIx::Class::Schema::Loader::Manual::UpgradingFromV4/,
+ contains $warning, "DBIx::Class::Schema::Loader::Manual::UpgradingFromV4",
'refers to upgrading doc';
is scalar @{ $res->{warnings} }, 3,
);
my $schema = $res->{schema};
- like $res->{warnings}[0], qr/Dumping manual schema/i,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on upgrading static schema (with "naming" set and ' .
'use_namespaces => 0)';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on upgrading static schema (with "naming" set and ' .
'use_namespaces => 0)';
'unsingularized class names in external content from unchanged Result class ' .
'names are translated in static schema';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub a_method { 'hlagh' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub a_method { 'hlagh' }",
'external content from unsingularized Result loaded into static dump correctly';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
'custom content from unsingularized Result loaded into static dump correctly';
}
clean_dumpdir => 1,
static => 1,
use_namespaces => 0,
+ naming => 'current',
);
- like $res->{warnings}[0], qr/Dumping manual schema/i,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on dumping static schema with use_namespaces => 0';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on dumping static schema with use_namespaces => 0';
is scalar @{ $res->{warnings} }, 2,
# 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,
+ contains $res->{warnings}[0], "load_classes",
'correct warnings on re-dumping static schema with load_classes';
- like $res->{warnings}[1], qr/Dumping manual schema/i,
+ contains $res->{warnings}[1], "Dumping manual schema",
'correct warnings on re-dumping static schema with load_classes';
- like $res->{warnings}[2], qr/dump completed/i,
+ contains $res->{warnings}[2], "dump completed",
'correct warnings on re-dumping static schema with load_classes';
is scalar @{ $res->{warnings} }, 3,
$res = run_loader(
static => 1,
use_namespaces => 1,
+ naming => 'current',
);
$schema = $res->{schema};
- like $res->{warnings}[0], qr/Dumping manual schema/i,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on upgrading to use_namespaces';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on upgrading to use_namespaces';
is scalar @{ $res->{warnings} }, 2,
$res->{classes}{bazs} }
'un-namespaced class names in custom content are translated';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
'custom content from un-namespaced Result loaded into static dump correctly';
}
# 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,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on dumping static schema';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on dumping static schema';
is scalar @{ $res->{warnings} }, 2,
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,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on re-dumping static schema';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on re-dumping static schema';
is scalar @{ $res->{warnings} }, 2,
$res = run_loader(
static => 1,
use_namespaces => 0,
+ naming => 'current',
);
my $schema = $res->{schema};
- like $res->{warnings}[0], qr/Dumping manual schema/i,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on downgrading to load_classes';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on downgrading to load_classes';
is scalar @{ $res->{warnings} }, 2,
'namespaced class names in custom content are translated during load_classes '.
'downgrade';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
'custom content from namespaced Result loaded into static dump correctly '.
'during load_classes downgrade';
}
clean_dumpdir => 1,
static => 1,
result_namespace => 'MyResult',
+ naming => 'current',
);
- like $res->{warnings}[0], qr/Dumping manual schema/i,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on dumping static schema';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on dumping static schema';
is scalar @{ $res->{warnings} }, 2,
# 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,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on re-dumping static schema';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on re-dumping static schema';
is scalar @{ $res->{warnings} }, 2,
$res = run_loader(
static => 1,
use_namespaces => 0,
+ naming => 'current',
);
my $schema = $res->{schema};
- like $res->{warnings}[0], qr/Dumping manual schema/i,
+ contains $res->{warnings}[0], "Dumping manual schema",
'correct warnings on downgrading to load_classes';
- like $res->{warnings}[1], qr/dump completed/i,
+ contains $res->{warnings}[1], "dump completed",
'correct warnings on downgrading to load_classes';
is scalar @{ $res->{warnings} }, 2,
'namespaced class names in custom content are translated during load_classes '.
'downgrade';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
'custom content from namespaced Result loaded into static dump correctly '.
'during load_classes downgrade';
}
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->{classes}{bazs} }
'class names in custom content are translated when rewriting result_namespace';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
'custom content from namespaced Result loaded into static dump correctly '.
'when rewriting result_namespace';
$res = run_loader(
static => 1,
result_namespace => 'Mtfnpy',
+ naming => 'current',
);
$schema = $res->{schema};
'class names in external content are translated when rewriting '.
'result_namespace';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
'custom content from namespaced Result loaded into static dump correctly '.
'when rewriting result_namespace';
- class_content_like $schema, $res->{classes}{quuxs}, qr/sub a_method { 'hlagh' }/,
+ class_content_contains $schema, $res->{classes}{quuxs}, "sub a_method { 'hlagh' }",
'external content from unsingularized Result loaded into static dump correctly';
}
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;
'unsingularized class names in custom content from Result with unchanged ' .
'name are translated';
- class_content_like $schema, $res->{classes}{bar}, qr/sub b_method { 'dongs' }/,
+ class_content_contains $schema, $res->{classes}{bar}, "sub b_method { 'dongs' }",
'custom content from Result with unchanged name loaded into static dump ' .
'correctly';
}
my $res = run_loader(static => 1);
- like $res->{warnings}[0], qr/0.05003 static schema/, 'backcompat warning';
+ contains $res->{warnings}[0], "0.05003 static schema", 'backcompat warning';
run_v5_tests($res);
my $res = run_loader(static => 1);
- like $res->{warnings}[0], qr/0.06001 static schema/, 'backcompat warning';
+ contains $res->{warnings}[0], "0.06001 static schema", 'backcompat warning';
run_v6_tests($res);
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};
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/;
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';
}
{
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)};
}
-sub class_content_like {
- my ($schema, $class, $re, $test_name) = @_;
+sub class_content_contains {
+ my ($schema, $class, $substr, $test_name) = @_;
+
+ my $file = $schema->loader->get_dump_filename($class);
+ my $code = slurp_file $file;
+
+ local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+ contains $code, $substr, $test_name;
+}
+
+sub contains {
+ my ($haystack, $needle, $test_name) = @_;
- my $file = $schema->_loader->_get_dump_filename($class);
- my $code = slurp $file;
+ local $Test::Builder::Level = $Test::Builder::Level + 1;
- like $code, $re, $test_name;
+ like $haystack, qr/\Q$needle\E/, $test_name;
}
sub add_custom_content {
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 (<>) {
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff