- A new zero-to-DBIC style manual: DBIx::Class::Manual::QuickStart
* Fixes
+ - More robust handling of circular relationship declarations by loading
+ foreign classes less frequently (should resolve issues like
+ http://lists.scsys.co.uk/pipermail/dbix-class/2013-June/011374.html)
- Setting quote_names propagates to SQL::Translator when producing
SQLite DDL (it is one of the few producers *NOT* quoting by default)
- Back out self-cleaning from DBIx::Class::Carp for the time being
# no join condition or just a column name
if (!ref $cond) {
- $class->ensure_class_loaded($f_class);
-
- my $pri = $f_class->result_source_instance->_single_pri_col_or_die;
my ($f_key, $guess);
if (defined $cond and length $cond) {
"No such column '$f_key' declared yet on ${class} ($guess)"
) unless $class->has_column($f_key);
+ $class->ensure_class_loaded($f_class);
+ my $f_rsrc = try {
+ $f_class->result_source_instance;
+ }
+ catch {
+ $class->throw_exception(
+ "Foreign class '$f_class' does not seem to be a Result class "
+ . "(or it simply did not load entirely due to a circular relation chain)"
+ );
+ };
+
+ my $pri = $f_rsrc->_single_pri_col_or_die;
+
$cond = { "foreign.${pri}" => "self.${f_key}" };
}
my ($class, $rel, $f_class, $cond, $attrs) = @_;
unless (ref $cond) {
- $class->ensure_class_loaded($f_class);
my $pri = $class->result_source_instance->_single_pri_col_or_die;
$guess = "using our class name '$class' as foreign key source";
}
- my $f_class_loaded = try { $f_class->columns };
- $class->throw_exception(
- "No such column '$f_key' on foreign class ${f_class} ($guess)"
- ) if $f_class_loaded && !$f_class->has_column($f_key);
+ # only perform checks if the far side appears already loaded
+ if (my $f_rsrc = try { $f_class->result_source_instance } ) {
+ $class->throw_exception(
+ "No such column '$f_key' on foreign class ${f_class} ($guess)"
+ ) if !$f_rsrc->has_column($f_key);
+ }
$cond = { "foreign.${f_key}" => "self.${pri}" };
}
sub _has_one {
my ($class, $join_type, $rel, $f_class, $cond, $attrs) = @_;
unless (ref $cond) {
- $class->ensure_class_loaded($f_class);
-
my $pri = $class->result_source_instance->_single_pri_col_or_die;
- my $f_class_loaded = try { $f_class->columns };
- my ($f_key,$guess);
+ my ($f_key,$guess,$f_rsrc);
if (defined $cond && length $cond) {
$f_key = $cond;
$guess = "caller specified foreign key '$f_key'";
- } elsif ($f_class_loaded && $f_class->has_column($rel)) {
- $f_key = $rel;
- $guess = "using given relationship name '$rel' as foreign key column name";
- } elsif ($f_class_loaded and my $f_pri = try {
- $f_class->result_source_instance->_single_pri_col_or_die
- }) {
- $f_key = $f_pri;
- $guess = "using primary key of foreign class for foreign key";
}
+ else {
+ # at this point we need to load the foreigner, expensive or not
+ $class->ensure_class_loaded($f_class);
+
+ $f_rsrc = try {
+ $f_class->result_source_instance;
+ }
+ catch {
+ $class->throw_exception(
+ "Foreign class '$f_class' does not seem to be a Result class "
+ . "(or it simply did not load entirely due to a circular relation chain)"
+ );
+ };
- $class->throw_exception(
- "No such column '$f_key' on foreign class ${f_class} ($guess)"
- ) if $f_class_loaded && !$f_class->has_column($f_key);
+ if ($f_rsrc->has_column($rel)) {
+ $f_key = $rel;
+ $guess = "using given relationship name '$rel' as foreign key column name";
+ }
+ else {
+ $f_key = $f_rsrc->_single_pri_col_or_die;
+ $guess = "using primary key of foreign class for foreign key";
+ }
+ }
+
+ # only perform checks if the far side was not preloaded above *AND*
+ # appears to have been loaded by something else (has a rsrc_instance)
+ if (! $f_rsrc and $f_rsrc = try { $f_class->result_source_instance }) {
+ $class->throw_exception(
+ "No such column '$f_key' on foreign class ${f_class} ($guess)"
+ ) if !$f_rsrc->has_column($f_key);
+ }
$cond = { "foreign.${f_key}" => "self.${pri}" };
}