Audit and minimize use of last major indirect method: search()

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / CDBICompat / ImaDBI.pm

diff --git a/lib/DBIx/Class/CDBICompat/ImaDBI.pm b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
index 10270b8..43537ff 100644 (file)
--- a/lib/DBIx/Class/CDBICompat/ImaDBI.pm
+++ b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
@@ -4,66 +4,15 @@ package # hide from PAUSE
 use strict;
 use warnings;
 use DBIx::ContextualFetch;
-use DBIx::Class::_Util qw(quote_sub perlstring);
 
-use base qw(Class::Data::Inheritable);
+use base 'DBIx::Class';
+
+use DBIx::Class::_Util qw(quote_sub perlstring);
+use namespace::clean;
 
 __PACKAGE__->mk_classdata('sql_transformer_class' =>
                           'DBIx::Class::CDBICompat::SQLTransformer');
 
-__PACKAGE__->mk_classdata('_transform_sql_handler_order'
-                            => [ qw/TABLE ESSENTIAL JOIN IDENTIFIER/ ] );
-
-__PACKAGE__->mk_classdata('_transform_sql_handlers' =>
-  {
-    'TABLE' =>
-      sub {
-        my ($self, $class, $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->result_source_instance->name." ${alias}";
-      },
-    'ESSENTIAL' =>
-      sub {
-        my ($self, $class, $data) = @_;
-        $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 {
-        my ($self, $class, $data) = @_;
-        my ($from, $to) = split(/ /, $data);
-        my ($from_class, $to_class) = @{$self->{_classes}}{$from, $to};
-        my ($rel_obj) = grep { $_->{class} && $_->{class} eq $to_class }
-                          map { $from_class->relationship_info($_) }
-                            $from_class->relationships;
-        unless ($rel_obj) {
-          ($from, $to) = ($to, $from);
-          ($from_class, $to_class) = ($to_class, $from_class);
-          ($rel_obj) = grep { $_->{class} && $_->{class} eq $to_class }
-                          map { $from_class->relationship_info($_) }
-                            $from_class->relationships;
-        }
-        $self->throw_exception( "No relationship to JOIN from ${from_class} to ${to_class}" )
-          unless $rel_obj;
-        my $join = $from_class->storage->sql_maker->_join_condition(
-          scalar $from_class->result_source_instance->_resolve_condition(
-            $rel_obj->{cond}, $to, $from
-          )
-        );
-        return $join;
-      }
-
-  } );
-
 sub db_Main {
   return $_[0]->storage->dbh;
 }
@@ -103,9 +52,12 @@ sub sth_to_objects {
 
   $sth->execute(@$execute_args);
 
-  my @ret;
+  my (@ret, $rsrc);
   while (my $row = $sth->fetchrow_hashref) {
-    push(@ret, $class->inflate_result($class->result_source_instance, $row));
+    push(@ret, $class->inflate_result(
+      ( $rsrc ||= $class->result_source ),
+      $row
+    ));
   }
 
   return @ret;