-package DBIx::Class::CDBICompat::ImaDBI;
+package # hide from PAUSE
+ DBIx::Class::CDBICompat::ImaDBI;
use strict;
use warnings;
use base qw/DBIx::Class/;
__PACKAGE__->mk_classdata('_transform_sql_handler_order'
- => [ qw/TABLE ESSENTIAL JOIN/ ] );
+ => [ qw/TABLE ESSENTIAL JOIN IDENTIFIER/ ] );
__PACKAGE__->mk_classdata('_transform_sql_handlers' =>
{
'TABLE' =>
sub {
my ($self, $class, $data) = @_;
- return $class->_table_name unless $data;
+ return $class->result_source_instance->name unless $data;
my ($f_class, $alias) = split(/=/, $data);
$f_class ||= $class;
$self->{_classes}{$alias} = $f_class;
- return $f_class->_table_name." ${alias}";
+ return $f_class->result_source_instance->name." ${alias}";
},
'ESSENTIAL' =>
sub {
my ($self, $class, $data) = @_;
- return join(' ', $class->columns('Essential')) unless $data;
- return join(' ', $self->{_classes}{$data}->columns('Essential'));
+ $class = $data ? $self->{_classes}{$data} : $class;
+ return join(', ', $class->columns('Essential'));
+ },
+ 'IDENTIFIER' =>
+ sub {
+ my ($self, $class, $data) = @_;
+ $class = $data ? $self->{_classes}{$data} : $class;
+ return join ' AND ', map "$_ = ?", $class->primary_columns;
},
'JOIN' =>
sub {
map { $from_class->relationship_info($_) }
$from_class->relationships;
}
- $self->throw( "No relationship to JOIN from ${from_class} to ${to_class}" )
+ $self->throw_exception( "No relationship to JOIN from ${from_class} to ${to_class}" )
unless $rel_obj;
- my $attrs = {
- %$self,
- _aliases => { self => $from, foreign => $to },
- _action => 'join',
- };
my $join = $from_class->storage->sql_maker->_join_condition(
- $from_class->resolve_condition($rel_obj->{cond}, $attrs) );
+ $from_class->result_source_instance->resolve_condition(
+ $rel_obj->{cond}, $to, $from) );
return $join;
}
my ($class, $sth) = @_;
my @ret;
while (my $row = $sth->fetchrow_hashref) {
- push(@ret, $class->inflate_result($row));
+ push(@ret, $class->inflate_result($class->result_source_instance, $row));
}
return @ret;
}
return sprintf($sql, @args);
}
-package DBIx::ContextualFetch::st;
+package
+ DBIx::ContextualFetch::st; # HIDE FROM PAUSE THIS IS NOT OUR CLASS
no warnings 'redefine';