-package DBIx::Class::CDBICompat::ImaDBI;
+package # hide from PAUSE
+ DBIx::Class::CDBICompat::ImaDBI;
use strict;
use warnings;
+use DBIx::ContextualFetch;
-use NEXT;
-use base qw/Class::Data::Inheritable/;
+use base 'DBIx::Class';
-__PACKAGE__->mk_classdata('_transform_sql_handler_order'
- => [ qw/TABLE ESSENTIAL JOIN/ ] );
+use DBIx::Class::_Util qw(quote_sub perlstring);
+use namespace::clean;
-__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->{_aliases}{$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->{_aliases}{$data}->columns('Essential'));
- },
- 'JOIN' =>
- sub {
- my ($self, $class, $data) = @_;
- my ($from, $to) = split(/ /, $data);
- my ($from_class, $to_class) = @{$self->{_aliases}}{$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 = {
- _aliases => { self => $from, foreign => $to },
- _action => 'join',
- };
- my $join = $from_class->_cond_resolve($rel_obj->{cond}, $attrs);
- return $join;
- }
-
- } );
+__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, $rsrc);
+ while (my $row = $sth->fetchrow_hashref) {
+ push(@ret, $class->inflate_result(
+ ( $rsrc ||= $class->result_source ),
+ $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;
+
+ 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;