X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FImaDBI.pm;h=43537ff408c5b02743880266b15e042eeab3b0ad;hb=e570488ade8f327f47dd3318db3443a348d561d6;hp=aaa19a02e19d5dba95fb6fcc1bf3e64935b3bb2f;hpb=9930caaf7e7c250d914cb1440d9a0f1dd2a1dedc;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/CDBICompat/ImaDBI.pm b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
index aaa19a0..43537ff 100644
--- 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 Sub::Name ();
 
-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;
 }
@@ -81,26 +30,20 @@ sub __driver {
 
 sub set_sql {
   my ($class, $name, $sql) = @_;
-  no strict 'refs';
-  my $sql_name = "sql_${name}";
-  my $full_sql_name = join '::', $class, $sql_name;
-  *$full_sql_name = Sub::Name::subname $full_sql_name,
-    sub {
-      my $sql = $sql;
-      my $class = shift;
-      return $class->storage->dbh_do(
-        _prepare_sth => $class->transform_sql($sql, @_)
-      );
-    };
-  if ($sql =~ /select/i) {
-    my $search_name = "search_${name}";
-    my $full_search_name = join '::', $class, $search_name;
-    *$full_search_name = Sub::Name::subname $full_search_name,
-      sub {
-        my ($class, @args) = @_;
-        my $sth = $class->$sql_name;
-        return $class->sth_to_objects($sth, \@args);
-      };
+
+  quote_sub "${class}::sql_${name}", sprintf( <<'EOC', perlstring $sql );
+    my $class = shift;
+    return $class->storage->dbh_do(
+      _prepare_sth => $class->transform_sql(%s, @_)
+    );
+EOC
+
+
+  if ($sql =~ /select/i) {  # FIXME - this should be anchore surely...?
+    quote_sub "${class}::search_${name}", sprintf( <<'EOC', "sql_$name" );
+      my ($class, @args) = @_;
+      $class->sth_to_objects( $class->%s, \@args);
+EOC
   }
 }
 
@@ -109,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;