use File::Slurp 'slurp';
require DBIx::Class;
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
__PACKAGE__->mk_group_ro_accessors('simple', qw/
schema
In general, there is very little difference between v5 and v6 schemas.
+=item v7
+
+This mode is identical to C<v6> mode, except that monikerization of CamelCase
+table names is also done correctly.
+
+If you don't have any CamelCase table names, you can upgrade without breaking
+any of your code.
+
=back
Dynamic schemas will always default to the 0.04XXX relationship names and won't
returns a false value, the code falls back to default behavior
for that table name.
-The default behavior is to singularize the table name, and: C<join '', map
-ucfirst, split /[\W_]+/, lc $table>, which is to say: lowercase everything,
-split up the table name into chunks anywhere a non-alpha-numeric character
-occurs, change the case of first letter of each chunk to upper case, and put
-the chunks back together. Examples:
+The default behavior is to split on case transition and non-alphanumeric
+boundaries, singularize the resulting phrase, then join the titlecased words
+together. Examples:
- Table Name | Moniker Name
- ---------------------------
- luser | Luser
- luser_group | LuserGroup
- luser-opts | LuserOpt
+ Table Name | Moniker Name
+ ---------------------------------
+ luser | Luser
+ luser_group | LuserGroup
+ luser-opts | LuserOpt
+ stations_visited | StationVisited
+ routeChange | RouteChange
=head2 inflect_plural
=cut
-my $CURRENT_V = 'v6';
+my $CURRENT_V = 'v7';
my @CLASS_ARGS = qw(
schema_base_class result_base_class additional_base_classes
Set the 'naming' attribute or the SCHEMA_LOADER_BACKCOMPAT environment variable
to disable this warning.
+See: 'naming' in perldoc DBIx::Class::Schema::Loader::Base .
+
See perldoc DBIx::Class::Schema::Loader::Manual::UpgradingFromV4 if upgrading
from version 0.04006.
EOF
return join '', map ucfirst, split /[\W_]+/,
Lingua::EN::Inflect::Number::to_S(lc $table);
}
+ elsif ($self->naming->{monikers} eq 'v6') {
+ (my $as_phrase = lc $table) =~ s/_+/ /g;
+ my $inflected = Lingua::EN::Inflect::Phrase::to_S($as_phrase);
+
+ return join '', map ucfirst, split /\W+/, $inflected;
+ }
+
+ my @words = map lc, split /(?<=[[:lower:]])[\W_]*(?=[[:upper:]])|[\W_]+/, $table;
+ my $as_phrase = join ' ', @words;
- (my $as_phrase = lc $table) =~ s/_+/ /g;
my $inflected = Lingua::EN::Inflect::Phrase::to_S($as_phrase);
return join '', map ucfirst, split /\W+/, $inflected;
rmtree $DUMP_DIR;
my $SCHEMA_CLASS = 'DBIXCSL_Test::Schema';
+my $RESULT_COUNT = 7;
+
sub class_content_like;
# test dynamic schema in 0.04006 mode
{
my $res = run_loader(naming => 'current');
is_deeply $res->{warnings}, [], 'no warnings with naming attribute set';
- run_v6_tests($res);
+ run_v7_tests($res);
}
# test upgraded dynamic schema with external content loaded
'unsingularized class names in external content from unchanged Result class ' .
'names are translated';
- run_v6_tests($res);
+ run_v7_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_v6_tests($res);
+ run_v7_tests($res);
}
# test upgraded static schema with external content loaded
my $res = run_loader(static => 1, naming => 'current');
my $schema = $res->{schema};
- run_v6_tests($res);
+ run_v7_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_v6_tests($res);
+ run_v7_tests($res);
- is result_count('Result'), 6,
+ is result_count('Result'), $RESULT_COUNT,
'un-singularized results were replaced during upgrade';
# check that custom content was preserved
'correct number of warnings on upgrading static schema (with "naming" set)'
or diag @{ $res->{warnings} };
- run_v6_tests($res);
+ run_v7_tests($res);
- is result_count(), 6,
+ is result_count(), $RESULT_COUNT,
'un-singularized results were replaced during upgrade';
# check that custom content was preserved
'correct number of warnings on upgrading static schema (with "naming" set)'
or diag @{ $res->{warnings} };
- run_v6_tests($res);
+ run_v7_tests($res);
- is result_count(), 6,
+ is result_count(), $RESULT_COUNT,
'un-singularized results were replaced during upgrade and Result dir removed';
ok ((not -d result_dir('Result')),
'correct number of warnings on dumping static schema with use_namespaces => 0'
or diag @{ $res->{warnings} };
- run_v6_tests($res);
+ run_v7_tests($res);
my $schema = $res->{schema};
add_custom_content($res->{schema}, {
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Quux',
'load_classes preserved on re-dump';
- run_v6_tests($res);
+ run_v7_tests($res);
# now upgrade the schema to use_namespaces
$res = run_loader(
'correct number of warnings on upgrading to use_namespaces'
or diag @{ $res->{warnings} };
- run_v6_tests($res);
+ run_v7_tests($res);
my @schema_files = schema_files();
'correct number of warnings on dumping static schema'
or diag @{ $res->{warnings} };
- run_v6_tests($res);
+ run_v7_tests($res);
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Result::Quux',
'defaults to use_namespaces on regular dump';
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Result::Quux',
'use_namespaces preserved on re-dump';
- run_v6_tests($res);
+ run_v7_tests($res);
# now downgrade the schema to load_classes
$res = run_loader(
'correct number of warnings on downgrading to load_classes'
or diag @{ $res->{warnings} };
- run_v6_tests($res);
+ run_v7_tests($res);
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Quux',
'load_classes downgrade correct';
- is result_count(), 6,
+ is result_count(), $RESULT_COUNT,
'correct number of Results after upgrade and Result dir removed';
ok ((not -d result_dir('Result')),
'correct number of warnings on dumping static schema'
or diag @{ $res->{warnings} };
- run_v6_tests($res);
+ run_v7_tests($res);
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::MyResult::Quux',
'defaults to use_namespaces and uses custom result_namespace';
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::MyResult::Quux',
'use_namespaces and custom result_namespace preserved on re-dump';
- run_v6_tests($res);
+ run_v7_tests($res);
# now downgrade the schema to load_classes
$res = run_loader(
'correct number of warnings on downgrading to load_classes'
or diag @{ $res->{warnings} };
- run_v6_tests($res);
+ run_v7_tests($res);
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Quux',
'load_classes downgrade correct';
- is result_count(), 6,
+ is result_count(), $RESULT_COUNT,
'correct number of Results after upgrade and Result dir removed';
ok ((not -d result_dir('MyResult')),
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::MyResult::Quux',
'using new result_namespace';
- is result_count('MyResult'), 6,
+ is result_count('MyResult'), $RESULT_COUNT,
'correct number of Results after rewritten result_namespace';
ok ((not -d schema_dir('Result')),
is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Mtfnpy::Quux',
'using new result_namespace';
- is result_count('Mtfnpy'), 6,
+ is result_count('Mtfnpy'), $RESULT_COUNT,
'correct number of Results after rewritten result_namespace';
ok ((not -d result_dir('MyResult')),
# now upgrade the schema
$res = run_loader(static => 1, naming => 'current');
$schema = $res->{schema};
- run_v6_tests($res);
+ run_v7_tests($res);
# check that custom content was preserved
lives_and { is $schema->resultset('Bar')->find(1)->b_method, 'dongs' }
# test creating static schema in v5 mode then upgrade to current with external
# content loaded
-# XXX needs real load_external tests
{
clean_dumpdir();
$res = run_loader(static => 1, naming => 'current');
my $schema = $res->{schema};
- run_v6_tests($res);
+ run_v7_tests($res);
lives_and { is $schema->resultset('Baz')->find(1)->a_method, 'hlagh' }
'external custom content loaded for v5 -> v6';
'external content rewritten for v5 -> v6 for upgraded Result class names';
}
+# test creating static schema in v6 mode then upgrade to current with external
+# content loaded
+{
+ clean_dumpdir();
+
+ write_v6_schema_pm();
+
+ my $res = run_loader(static => 1);
+
+ like $res->{warnings}[0], qr/0.06001 static schema/, 'backcompat warning';
+
+ run_v6_tests($res);
+
+ my $temp_dir = setup_load_external({
+ Routechange => 'Quux',
+ }, { result_namespace => 'Result' });
+
+ add_custom_content($res->{schema}, {
+ Routechange => 'Quux',
+ }, {
+ result_namespace => 'Result',
+ rel_name_map => { RoutechangeQuux => 'custom_content_rel' },
+ });
+
+ $res = run_loader(static => 1, naming => 'current');
+ my $schema = $res->{schema};
+
+ run_v7_tests($res);
+
+ lives_and { is $schema->resultset('RouteChange')->find(1)->a_method, 'hlagh' }
+ 'external custom content loaded for v6 -> v7';
+
+ lives_and { isa_ok $schema->resultset('RouteChange')->find(1)->quuxrel,
+ $res->{classes}{quuxs} }
+ 'external content rewritten for v6 -> v7';
+
+ lives_and { isa_ok $schema->resultset('RouteChange')->find(1)->custom_content_rel,
+ $res->{classes}{quuxs} }
+ 'custom content rewritten for v6 -> v7';
+}
+
done_testing;
END {
}
}
+sub write_v6_schema_pm {
+ my %opts = @_;
+
+ (my $schema_dir = "$DUMP_DIR/$SCHEMA_CLASS") =~ s/::[^:]+\z//;
+ rmtree $schema_dir;
+ make_path $schema_dir;
+ my $schema_pm = "$schema_dir/Schema.pm";
+ open my $fh, '>', $schema_pm or die $!;
+ if (exists $opts{use_namespaces} && $opts{use_namespaces} == 0) {
+ print $fh <<'EOF';
+package DBIXCSL_Test::Schema;
+
+# Created by DBIx::Class::Schema::Loader
+# DO NOT MODIFY THE FIRST PART OF THIS FILE
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Schema';
+
+__PACKAGE__->load_classes;
+
+
+# Created by DBIx::Class::Schema::Loader v0.06001 @ 2010-04-21 19:56:03
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/fqZCb95hsGIe1g5qyQQZg
+
+
+# You can replace this text with custom content, and it will be preserved on regeneration
+1;
+EOF
+ }
+ else {
+ print $fh <<'EOF';
+package DBIXCSL_Test::Schema;
+
+# Created by DBIx::Class::Schema::Loader
+# DO NOT MODIFY THE FIRST PART OF THIS FILE
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Schema';
+
+__PACKAGE__->load_namespaces;
+
+
+# Created by DBIx::Class::Schema::Loader v0.06001 @ 2010-04-21 19:54:31
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nwO5Vi47kl0X9SpEoiVO5w
+
+
+# You can replace this text with custom content, and it will be preserved on regeneration
+1;
+EOF
+ }
+}
+
sub run_v4_tests {
my $res = shift;
my $schema = $res->{schema};
- is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited email/} ],
- [qw/Foos Bar Bazs Quuxs StationsVisited Email/],
+ is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited RouteChange email/} ],
+ [qw/Foos Bar Bazs Quuxs StationsVisited Routechange Email/],
'correct monikers in 0.04006 mode';
isa_ok ((my $bar = eval { $schema->resultset('Bar')->find(1) }),
my $res = shift;
my $schema = $res->{schema};
- is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited email/} ],
- [qw/Foo Bar Baz Quux StationsVisited Email/],
+ is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited RouteChange email/} ],
+ [qw/Foo Bar Baz Quux StationsVisited Routechange Email/],
'correct monikers in v5 mode';
ok my $bar = eval { $schema->resultset('Bar')->find(1) };
my $res = shift;
my $schema = $res->{schema};
- is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited email/} ],
- [qw/Foo Bar Baz Quux StationVisited Email/],
+ is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited RouteChange email/} ],
+ [qw/Foo Bar Baz Quux StationVisited Routechange Email/],
+ 'correct monikers in v6 mode';
+
+ ok my $bar = eval { $schema->resultset('Bar')->find(1) };
+
+ isa_ok eval { $bar->foo }, $res->{classes}{foos},
+ 'correct rel name in v6 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 v6 mode';
+
+ ok my $foo = eval { $schema->resultset('Foo')->find(1) };
+
+ isa_ok eval { $foo->emails_to }, 'DBIx::Class::ResultSet',
+ 'correct rel name inflection in v6 mode';
+}
+
+sub run_v7_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) };
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'},
}->{_rel_key($from, $to)};
}
projects / dbsrgits/DBIx-Class-Schema-Loader.git / commitdiff