X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FImaDBI.pm;h=7a88d155a0838b86b24a6059d09b00846c379391;hb=5e0eea3522876a30453af24097507198bbbc9409;hp=b77ba18cdda85936a491e2257ad76a56d131cd5c;hpb=fef5d100c208d604c7a7b3c33eb6e32946d71848;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/CDBICompat/ImaDBI.pm b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
index b77ba18..7a88d15 100644
--- a/lib/DBIx/Class/CDBICompat/ImaDBI.pm
+++ b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
@@ -1,58 +1,15 @@
-package DBIx::Class::CDBICompat::ImaDBI;
+package # hide from PAUSE
+    DBIx::Class::CDBICompat::ImaDBI;
 
 use strict;
 use warnings;
 use DBIx::ContextualFetch;
+use DBIx::Class::_Util qw(quote_sub perlstring);
 
-use NEXT;
-use base qw/Class::Data::Inheritable/;
+use base 'DBIx::Class';
 
-__PACKAGE__->mk_classdata('_transform_sql_handler_order'
-                            => [ qw/TABLE ESSENTIAL JOIN/ ] );
-
-__PACKAGE__->mk_classdata('_transform_sql_handlers' =>
-  {
-    'TABLE' =>
-      sub {
-        my ($self, $class, $data) = @_;
-        return $class->_table_name unless $data;
-        my ($f_class, $alias) = split(/=/, $data);
-        $f_class ||= $class;
-        $self->{_classes}{$alias} = $f_class;
-        return $f_class->_table_name." ${alias}";
-      },
-    'ESSENTIAL' =>
-      sub {
-        my ($self, $class, $data) = @_;
-        return join(' ', $class->columns('Essential')) unless $data;
-        return join(' ', $self->{_classes}{$data}->columns('Essential'));
-      },
-    '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 }
-                          values %{ $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 }
-                         values %{ $from_class->_relationships };
-        }
-        $self->throw( "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) );
-        return $join;
-      }
-        
-  } );
+__PACKAGE__->mk_classdata('sql_transformer_class' =>
+                          'DBIx::Class::CDBICompat::SQLTransformer');
 
 sub db_Main {
   return $_[0]->storage->dbh;
@@ -62,7 +19,7 @@ sub connection {
   my ($class, @info) = @_;
   $info[3] = { %{ $info[3] || {}} };
   $info[3]->{RootClass} = 'DBIx::ContextualFetch';
-  return $class->NEXT::connection(@info);
+  return $class->next::method(@info);
 }
 
 sub __driver {
@@ -71,50 +28,48 @@ 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 {
-      my $sql = $sql;
-      my $class = shift;
-      return $class->storage->sth($class->transform_sql($sql, @_));
-    };
-  if ($sql =~ /select/i) {
-    my $meth = "sql_${name}";
-    *{"${class}::search_${name}"} =
-      sub {
-        my ($class, @args) = @_;
-        my $sth = $class->$meth;
-        $sth->execute(@args);
-        return $class->sth_to_objects($sth);
-      };
+
+  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
   }
 }
 
 sub sth_to_objects {
-  my ($class, $sth) = @_;
-  my @cols = $class->_select_columns;
+  my ($class, $sth, $execute_args) = @_;
+
+  $sth->execute(@$execute_args);
+
   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($class->result_source_instance, $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);
+
+  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;
+package
+  DBIx::ContextualFetch::st; # HIDE FROM PAUSE THIS IS NOT OUR CLASS
 
 no warnings 'redefine';