use Class::Unload ();
use Class::Inspector ();
-our $VERSION = '0.07031';
+our $VERSION = '0.07036_01';
# Glossary:
#
my $rel_attrs_params = {
rel_name => $remote_relname,
+ rel_type => $local_method,
local_source => $self->schema->source($local_moniker),
remote_source => $self->schema->source($remote_moniker),
local_table => $rel->{local_table},
$rel_attrs_params = {
rel_name => $local_relname,
+ rel_type => $remote_method,
local_source => $self->schema->source($remote_moniker),
remote_source => $self->schema->source($local_moniker),
local_table => $rel->{remote_table},
my $class2 = $rels->[1]{args}[1];
my $class1_to_link_table_rel = first {
- $_->{method} eq 'has_many' && $_->{args}[1] eq $class
+ $_->{method} =~ /\A(?:has_many|might_have)\z/ && $_->{args}[1] eq $class
} @{ $all_code->{$class1} };
my $class1_to_link_table_rel_name = $class1_to_link_table_rel->{args}[0];
my $class2_to_link_table_rel = first {
- $_->{method} eq 'has_many' && $_->{args}[1] eq $class
+ $_->{method} =~ /\A(?:has_many|might_have)\z/ && $_->{args}[1] eq $class
} @{ $all_code->{$class2} };
my $class2_to_link_table_rel_name = $class2_to_link_table_rel->{args}[0];
my @class2_to_cols = apply { s/^foreign\.//i } keys %{ $rels->[0]{args}[2] };
+ my $link_moniker = $rels->[0]{extra}{local_moniker};
+
my @link_table_cols =
- @{[ $self->schema->source($rels->[0]{extra}{local_moniker})->columns ]};
+ @{[ $self->schema->source($link_moniker)->columns ]};
my @link_table_primary_cols =
- @{[ $self->schema->source($rels->[0]{extra}{local_moniker})->primary_columns ]};
+ @{[ $self->schema->source($link_moniker)->primary_columns ]};
next unless @class1_link_cols + @class2_link_cols == @link_table_cols
&& @link_table_cols == @link_table_primary_cols;
$class2,
$class1_remote_moniker,
\@class1_to_cols,
+ {
+ link_class => $class,
+ link_moniker => $link_moniker,
+ link_rel_name => $class1_to_link_table_rel_name,
+ },
);
$class1_to_class2_relname = $self->_resolve_relname_collision(
$class2,
$class2_remote_moniker,
\@class2_to_cols,
+ {
+ link_class => $class,
+ link_moniker => $link_moniker,
+ link_rel_name => $class2_to_link_table_rel_name,
+ },
);
$class2_to_class1_relname = $self->_resolve_relname_collision(
$class1_to_class2_relname,
$class1_to_link_table_rel_name,
$class1_link_rel,
+ $self->_relationship_attrs('many_to_many', {}, {
+ rel_type => 'many_to_many',
+ rel_name => $class1_to_class2_relname,
+ local_source => $self->schema->source($class1_local_moniker),
+ remote_source => $self->schema->source($class1_remote_moniker),
+ local_table => $self->loader->class_to_table->{$class1},
+ local_cols => \@class1_from_cols,
+ remote_table => $self->loader->class_to_table->{$class2},
+ remote_cols => \@class2_from_cols,
+ }) || (),
],
extra => {
local_class => $class1,
$class2_to_class1_relname,
$class2_to_link_table_rel_name,
$class2_link_rel,
+ $self->_relationship_attrs('many_to_many', {}, {
+ rel_type => 'many_to_many',
+ rel_name => $class2_to_class1_relname,
+ local_source => $self->schema->source($class2_local_moniker),
+ remote_source => $self->schema->source($class2_remote_moniker),
+ local_table => $self->loader->class_to_table->{$class2},
+ local_cols => \@class2_from_cols,
+ remote_table => $self->loader->class_to_table->{$class1},
+ remote_cols => \@class1_from_cols,
+ }) || (),
],
extra => {
local_class => $class2,
sub _rel_name_map {
my ($self, $relname, $method, $local_class, $local_moniker, $local_cols,
- $remote_class, $remote_moniker, $remote_cols) = @_;
+ $remote_class, $remote_moniker, $remote_cols, $extra) = @_;
my $info = {
+ %{$extra || {}},
name => $relname,
type => $method,
local_class => $local_class,