Finished ripping hand-hacked abstract implementation out of core

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI.pm

diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index c0b4d82..c5e0162 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -4,11 +4,11 @@ use strict;
 use warnings;
 use DBI;
 use SQL::Abstract;
-use DBIx::Class::Cursor;
+use DBIx::Class::Storage::DBI::Cursor;
 
 use base qw/DBIx::Class/;
 
-__PACKAGE__->load_components(qw/SQL SQL::Abstract Exception AccessorGroup/);
+__PACKAGE__->load_components(qw/Exception AccessorGroup/);
 
 __PACKAGE__->mk_group_accessors('simple' =>
   qw/connect_info _dbh sql_maker debug cursor/);
@@ -16,8 +16,8 @@ __PACKAGE__->mk_group_accessors('simple' =>
 sub new {
   my $new = bless({}, ref $_[0] || $_[0]);
   $new->sql_maker(new SQL::Abstract);
-  $new->cursor("DBIx::Class::Cursor");
-  #$new->debug(1);
+  $new->cursor("DBIx::Class::Storage::DBI::Cursor");
+  $new->debug(1) if $ENV{DBIX_CLASS_STORAGE_DBI_DEBUG};
   return $new;
 }
 
@@ -93,8 +93,8 @@ sub _execute {
   unshift(@bind, @$extra_bind) if $extra_bind;
   warn "$sql: @bind" if $self->debug;
   my $sth = $self->sth($sql);
-  @bind = map { ref $_ ? ''.$_ : $_ } @bind;
-  my $rv = $sth->execute(@bind); # stringify args
+  @bind = map { ref $_ ? ''.$_ : $_ } @bind; # stringify args
+  my $rv = $sth->execute(@bind);
   return (wantarray ? ($rv, $sth, @bind) : $rv);
 }