use Scalar::Util 'weaken';
use DBIx::Class::Schema::Loader::Utils qw/split_name slurp_file/;
use Try::Tiny;
-use List::MoreUtils 'apply';
+use List::MoreUtils qw/apply uniq any/;
use namespace::clean;
use Lingua::EN::Inflect::Phrase ();
use Lingua::EN::Tagger ();
+use String::ToIdentifier::EN ();
+use String::ToIdentifier::EN::Unicode ();
use Class::Unload ();
use Class::Inspector ();
-our $VERSION = '0.07010';
+our $VERSION = '0.07011';
# Glossary:
#
return \%composite;
}
+sub _strip_id_postfix {
+ my ($self, $name) = @_;
+
+ $name =~ s/_?(?:id|ref|cd|code|num)\z//i;
+
+ return $name;
+}
+
sub _array_eq {
my ($self, $a, $b) = @_;
sub _sanitize_name {
my ($self, $name) = @_;
- $name =~ s/\W+/_/g;
+ $name = $self->loader->_to_identifier('relationships', $name, '_');
+
+ $name =~ s/\W+/_/g; # if naming >= 8 to_identifier takes care of it
return $name;
}
$name = $self->_sanitize_name($name);
- my @words = split_name $name;
+ my @words = split_name $name, $self->loader->_get_naming_v('relationships');
return join '_', map lc, @words;
}
# name, to make filter accessors work, but strip trailing _id
if(scalar keys %{$cond} == 1) {
my ($col) = values %{$cond};
- $col = $self->_normalize_name($col);
- $col =~ s/_id$//;
+ $col = $self->_strip_id_postfix($self->_normalize_name($col));
($remote_relname) = $self->_inflect_singular($col);
}
else {
return @adjectives;
}
+sub _name_to_identifier {
+ my ($self, $name) = @_;
+
+ my $to_identifier = $self->loader->naming->{force_ascii} ?
+ \&String::ToIdentifier::EN::to_identifier
+ : \&String::ToIdentifier::EN::Unicode::to_identifier;
+
+ return join '_', map lc, split_name $to_identifier->($name, '_');
+}
+
sub _disambiguate {
my ($self, $all_rels, $dups) = @_;
- foreach my $dup (keys %$dups) {
+ DUP: foreach my $dup (keys %$dups) {
my @rels = @{ $dups->{$dup} };
+ # Check if there are rels to the same table name in different
+ # schemas/databases, if so qualify them.
+ my @tables = map $self->loader->moniker_to_table->{$_->{extra}{remote_moniker}},
+ @rels;
+
+ # databases are different, prepend database
+ if ($tables[0]->can('database') && (uniq map $_->database||'', @tables) > 1) {
+ # If any rels are in the same database, we have to distinguish by
+ # both schema and database.
+ my %db_counts;
+ $db_counts{$_}++ for map $_->database, @tables;
+ my $use_schema = any { $_ > 1 } values %db_counts;
+
+ foreach my $i (0..$#rels) {
+ my $rel = $rels[$i];
+ my $table = $tables[$i];
+
+ $rel->{args}[0] = $self->_name_to_identifier($table->database)
+ . ($use_schema ? ('_' . $self->name_to_identifier($table->schema)) : '')
+ . '_' . $rel->{args}[0];
+ }
+ next DUP;
+ }
+ # schemas are different, prepend schema
+ elsif ((uniq map $_->schema||'', @tables) > 1) {
+ foreach my $i (0..$#rels) {
+ my $rel = $rels[$i];
+ my $table = $tables[$i];
+
+ $rel->{args}[0] = $self->_name_to_identifier($table->schema)
+ . '_' . $rel->{args}[0];
+ }
+ next DUP;
+ }
+
foreach my $rel (@rels) {
next if $rel->{method} eq 'belongs_to';
my $colnames = q{_} . $self->_normalize_name(join '_', @$local_cols);
$remote_relname .= $colnames if keys %$cond > 1;
- $local_relname = $self->_normalize_name($local_table . $colnames);
- $local_relname =~ s/_id$//;
+ $local_relname = $self->_strip_id_postfix($self->_normalize_name($local_table . $colnames));
$local_relname_uninflected = $local_relname;
($local_relname) = $self->_inflect_plural($local_relname);