use warnings;
use DBIx::ContextualFetch;
-use NEXT;
-use base qw/Class::Data::Inheritable/;
+use base qw/DBIx::Class/;
__PACKAGE__->mk_classdata('_transform_sql_handler_order'
=> [ qw/TABLE ESSENTIAL JOIN/ ] );
_aliases => { self => $from, foreign => $to },
_action => 'join',
};
- my $join = $from_class->_cond_resolve($rel_obj->{cond}, $attrs);
+ my $join = $from_class->storage->sql_maker->_join_condition(
+ $from_class->resolve_condition($rel_obj->{cond}, $attrs) );
return $join;
}
my ($class, @info) = @_;
$info[3] = { %{ $info[3] || {}} };
$info[3]->{RootClass} = 'DBIx::ContextualFetch';
- return $class->NEXT::connection(@info);
+ return $class->next::method(@info);
}
sub __driver {
sub set_sql {
my ($class, $name, $sql) = @_;
- my $table = $class->_table_name;
- #$sql =~ s/__TABLE__/$table/;
no strict 'refs';
*{"${class}::sql_${name}"} =
sub {
sub sth_to_objects {
my ($class, $sth) = @_;
- my @cols = $class->_select_columns;
my @ret;
- while (my @row = $sth->fetchrow_array) {
- push(@ret, $class->_row_to_object(\@cols,\@row));
+ while (my $row = $sth->fetchrow_hashref) {
+ push(@ret, $class->inflate_result($row));
}
return @ret;
}
sub transform_sql {
my ($class, $sql, @args) = @_;
- my $table = $class->_table_name;
my $attrs = { };
foreach my $key (@{$class->_transform_sql_handler_order}) {
my $h = $class->_transform_sql_handlers->{$key};
$sql =~ s/__$key(?:\(([^\)]+)\))?__/$h->($attrs, $class, $1)/eg;
}
+ #warn $sql;
return sprintf($sql, @args);
}