use strict;
use warnings;
-use Class::C3;
+use mro 'c3';
use Carp::Clan qw/^DBIx::Class/;
+use Scalar::Util ();
+
use Lingua::EN::Inflect::Phrase ();
+use DBIx::Class::Schema::Loader::Utils 'split_name';
-our $VERSION = '0.07000';
+our $VERSION = '0.07002';
=head1 NAME
=head1 SYNOPSIS
-See L<DBIx::Class::Schema::Loader>
+See L<DBIx::Class::Schema::Loader> and L<DBIx::Class::Schema::Loader::Base>.
=head1 DESCRIPTION
=head2 new
-Arguments: schema_class (scalar), inflect_plural, inflect_singular
-
-C<$schema_class> should be a schema class name, where the source
-classes have already been set up and registered. Column info, primary
-key, and unique constraints will be drawn from this schema for all
-of the existing source monikers.
-
-Options inflect_plural and inflect_singular are optional, and are better documented
-in L<DBIx::Class::Schema::Loader::Base>.
+Arguments: $base object
=head2 generate_code
=cut
+
sub new {
- my ( $class, $schema, $inflect_pl, $inflect_singular, $rel_attrs ) = @_;
+ my ( $class, $base ) = @_;
+
+ # from old POD about this constructor:
+ # C<$schema_class> should be a schema class name, where the source
+ # classes have already been set up and registered. Column info,
+ # primary key, and unique constraints will be drawn from this
+ # schema for all of the existing source monikers.
+
+ # Options inflect_plural and inflect_singular are optional, and
+ # are better documented in L<DBIx::Class::Schema::Loader::Base>.
my $self = {
- schema => $schema,
- inflect_plural => $inflect_pl,
- inflect_singular => $inflect_singular,
- relationship_attrs => $rel_attrs,
+ base => $base,
+ schema => $base->schema,
+ inflect_plural => $base->inflect_plural,
+ inflect_singular => $base->inflect_singular,
+ relationship_attrs => $base->relationship_attrs,
};
+ Scalar::Util::weaken $self->{base}; #< don't leak
+
# validate the relationship_attrs arg
if( defined $self->{relationship_attrs} ) {
- ref($self->{relationship_attrs}) eq 'HASH'
+ ref $self->{relationship_attrs} eq 'HASH'
or croak "relationship_attrs must be a hashref";
}
return $attrs;
}
+sub _sanitize_name {
+ my ($self, $name) = @_;
+
+ if (ref $name) {
+ # scalar ref for weird table name (like one containing a '.')
+ ($name = $$name) =~ s/\W+/_/g;
+ }
+ else {
+ # remove 'schema.' prefix if any
+ $name =~ s/^[^.]+\.//;
+ }
+
+ return $name;
+}
+
+sub _normalize_name {
+ my ($self, $name) = @_;
+
+ $name = $self->_sanitize_name($name);
+
+ my @words = split_name $name;
+
+ return join '_', map lc, @words;
+}
+
sub _remote_relname {
my ($self, $remote_table, $cond) = @_;
# name, to make filter accessors work, but strip trailing _id
if(scalar keys %{$cond} == 1) {
my ($col) = values %{$cond};
- $col = lc $col;
+ $col = $self->_normalize_name($col);
$col =~ s/_id$//;
$remote_relname = $self->_inflect_singular($col);
}
else {
- $remote_relname = $self->_inflect_singular(lc $remote_table);
+ $remote_relname = $self->_inflect_singular($self->_normalize_name($remote_table));
}
return $remote_relname;
# col names to distinguish
my ($local_relname, $local_relname_uninflected);
if ( $counters->{$remote_moniker} > 1) {
- my $colnames = lc(q{_} . join(q{_}, map lc($_), @$local_cols));
+ my $colnames = q{_} . $self->_normalize_name(join '_', @$local_cols);
$remote_relname .= $colnames if keys %$cond > 1;
- $local_relname = lc($local_table) . $colnames;
+ $local_relname = $self->_normalize_name($local_table . $colnames);
$local_relname =~ s/_id$//;
$local_relname_uninflected = $local_relname;
- $local_relname = $self->_inflect_plural( $local_relname );
+ $local_relname = $self->_inflect_plural($local_relname);
} else {
- $local_relname_uninflected = lc $local_table;
- $local_relname = $self->_inflect_plural(lc $local_table);
+ $local_relname_uninflected = $self->_normalize_name($local_table);
+ $local_relname = $self->_inflect_plural($self->_normalize_name($local_table));
}
my $remote_method = 'has_many';
=cut
1;
+# vim:et sts=4 sw=4 tw=0: