X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FImaDBI.pm;h=85aced21e04f509e0976b01709a8c2cf817cb2d4;hb=33eafbfd322ab48a2697c0ea9fadfb182fb22a36;hp=36f66b0e7d99ceb530eb8f893eba6463a76fa85a;hpb=510ca9120ab2fea50a0852ee4ed6a13735ed7ebc;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/CDBICompat/ImaDBI.pm b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
index 36f66b0..85aced2 100644
--- a/lib/DBIx/Class/CDBICompat/ImaDBI.pm
+++ b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
@@ -1,52 +1,146 @@
-package DBIx::Class::CDBICompat::ImaDBI;
+package # hide from PAUSE
+    DBIx::Class::CDBICompat::ImaDBI;
 
 use strict;
 use warnings;
+use DBIx::ContextualFetch;
+use Sub::Name ();
 
-use NEXT;
+use base qw(Class::Data::Inheritable);
+
+__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]->_get_dbh;
+  return $_[0]->storage->dbh;
 }
 
-sub _dbi_connect {
+sub connection {
   my ($class, @info) = @_;
   $info[3] = { %{ $info[3] || {}} };
   $info[3]->{RootClass} = 'DBIx::ContextualFetch';
-  return $class->NEXT::_dbi_connect(@info);
+  return $class->next::method(@info);
 }
 
 sub __driver {
-  return $_[0]->_get_dbh->{Driver}->{Name};
+  return $_[0]->storage->dbh->{Driver}->{Name};
 }
 
 sub set_sql {
   my ($class, $name, $sql) = @_;
-  my $table = $class->_table_name;
-  #$sql =~ s/__TABLE__/$table/;
   no strict 'refs';
-  *{"${class}::sql_${name}"} =
+  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->_sql_to_sth($class->transform_sql($sql, @_));
+      return $class->storage->_sth($class->transform_sql($sql, @_));
     };
   if ($sql =~ /select/i) {
-    my $meth = "sql_${name}";
-    *{"${class}::search_${name}"} =
+    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) = @_;
-        $class->sth_to_objects($class->$meth, \@args);
+        my $sth = $class->$sql_name;
+        return $class->sth_to_objects($sth, \@args);
       };
   }
 }
 
+sub sth_to_objects {
+  my ($class, $sth, $execute_args) = @_;
+
+  $sth->execute(@$execute_args);
+
+  my @ret;
+  while (my $row = $sth->fetchrow_hashref) {
+    push(@ret, $class->inflate_result($class->result_source_instance, $row));
+  }
+
+  return @ret;
+}
+
 sub transform_sql {
   my ($class, $sql, @args) = @_;
-  my $table = $class->_table_name;
-  $sql =~ s/__TABLE__/$table/g;
-  $sql =~ s/__ESSENTIAL__/join(' ', $class->columns('Essential'))/eg;
-  return sprintf($sql, @args);
+
+  my $tclass = $class->sql_transformer_class;
+  $class->ensure_class_loaded($tclass);
+  my $t = $tclass->new($class, $sql, @args);
+
+  return sprintf($t->sql, $t->args);
+}
+
+package
+  DBIx::ContextualFetch::st; # HIDE FROM PAUSE THIS IS NOT OUR CLASS
+
+no warnings 'redefine';
+
+sub _untaint_execute {
+  my $sth = shift;
+  my $old_value = $sth->{Taint};
+  $sth->{Taint} = 0;
+  my $ret;
+  {
+    no warnings 'uninitialized';
+    $ret = $sth->SUPER::execute(@_);
+  }
+  $sth->{Taint} = $old_value;
+  return $ret;
 }
 
 1;