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=f702f14d516abf00babddd2cbc4e325339cfb321;hpb=ef29a097f034c0e4043011e7dda097a791d39c7d;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/CDBICompat/ImaDBI.pm b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
index f702f14..7a88d15 100644
--- a/lib/DBIx/Class/CDBICompat/ImaDBI.pm
+++ b/lib/DBIx/Class/CDBICompat/ImaDBI.pm
@@ -1,61 +1,89 @@
-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_handlers' =>
-  {
-    'TABLE' => sub { return $_[0]->_table_name },
-    'ESSENTIAL' => sub { join(' ', $_[0]->columns('Essential')) },
-  } );
+__PACKAGE__->mk_classdata('sql_transformer_class' =>
+                          'DBIx::Class::CDBICompat::SQLTransformer');
 
 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}"} =
-    sub {
-      my $sql = $sql;
-      my $class = shift;
-      return $class->_sql_to_sth($class->transform_sql($sql, @_));
-    };
-  if ($sql =~ /select/i) {
-    my $meth = "sql_${name}";
-    *{"${class}::search_${name}"} =
-      sub {
-        my ($class, @args) = @_;
-        $class->sth_to_objects($class->$meth, \@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
   }
 }
 
+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;
-  foreach my $key (keys %{ $class->_transform_sql_handlers }) {
-    my $h = $class->_transform_sql_handlers->{$key};
-    $sql =~ s/__$key(?:\(([^\)]+)\))?__/$h->($class, $1)/eg;
+
+  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(@_);
   }
-  return sprintf($sql, @args);
+  $sth->{Taint} = $old_value;
+  return $ret;
 }
 
 1;