Merge 'trunk' into 'replication_dedux'

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

diff --git a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
index 73c7b43..80f367d 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
@@ -5,63 +5,64 @@ use warnings;
 
 use base 'DBIx::Class::Storage::DBI';
 
-sub _execute {
-  my ($self, $op, $extra_bind, $ident, @args) = @_;
-  my ($sql, @bind) = $self->sql_maker->$op($ident, @args);
-  unshift(@bind, @$extra_bind) if $extra_bind;
-  if ($self->debug) {
-    my @debug_bind = map { defined $_ ? qq{'$_'} : q{'NULL'} } @bind;
-    $self->debugobj->query_start($sql, @debug_bind);
-  }
+=head1 NAME 
 
-  while(my $bvar = shift @bind) {
-    $bvar = $self->dbh->quote($bvar);
-    $sql =~ s/\?/$bvar/;
-  }
+DBIx::Class::Storage::DBI::NoBindVars - Sometime DBDs have poor to no support for bind variables
 
-  my $sth = eval { $self->sth($sql,$op) };
+=head1 DESCRIPTION
 
-  if (!$sth || $@) {
-    $self->throw_exception(
-      'no sth generated via sql (' . ($@ || $self->_dbh->errstr) . "): $sql"
-    );
-  }
+This class allows queries to work when the DBD or underlying library does not
+support the usual C<?> placeholders, or at least doesn't support them very
+well, as is the case with L<DBD::Sybase>
 
-  my $rv;
-  if ($sth) {
-    my $time = time();
-    $rv = eval { $sth->execute };
+=head1 METHODS
 
-    if ($@ || !$rv) {
-      $self->throw_exception("Error executing '$sql': ".($@ || $sth->errstr));
-    }
-  } else {
-    $self->throw_exception("'$sql' did not generate a statement.");
-  }
-  if ($self->debug) {
-    my @debug_bind = map { defined $_ ? qq{`$_'} : q{`NULL'} } @bind;
-    $self->debugobj->query_end($sql, @debug_bind);
-  }
-  return (wantarray ? ($rv, $sth, @bind) : $rv);
+=head2 connect_info
+
+We can't cache very effectively without bind variables, so force the C<disable_sth_caching> setting to be turned on when the connect info is set.
+
+=cut
+
+sub connect_info {
+    my $self = shift;
+    my $retval = $self->next::method(@_);
+    $self->disable_sth_caching(1);
+    $retval;
 }
 
-1;
+=head2 _prep_for_execute
 
-=head1 NAME 
+Manually subs in the values for the usual C<?> placeholders.
 
-DBIx::Class::Storage::DBI::NoBindVars - Sometime DBDs have poor to no support for bind variables
+=cut
 
-=head1 SYNOPSIS
+sub _prep_for_execute {
+  my $self = shift;
+  my ($sql, $bind) = $self->next::method(@_);
 
-=head1 DESCRIPTION
+  # stringify args, quote via $dbh, and manually insert
 
-This class allows queries to work when the DBD or underlying library does not
-support the usual C<?> placeholders, or at least doesn't support them very
-well, as is the case with L<DBD::Sybase>
+  my @sql_part = split /\?/, $sql;
+  my $new_sql;
+
+  foreach my $bound (@$bind) {
+    shift @$bound;
+    foreach my $data (@$bound) {
+        if(ref $data) {
+            $data = ''.$data;
+        }
+        $new_sql .= shift(@sql_part) . $self->_dbh->quote($data);
+    }
+  }
+  $new_sql .= join '', @sql_part;
+
+  return ($new_sql);
+}
 
 =head1 AUTHORS
 
 Brandon Black <blblack@gmail.com>
+
 Trym Skaar <trym@tryms.no>
 
 =head1 LICENSE
@@ -69,3 +70,5 @@ Trym Skaar <trym@tryms.no>
 You may distribute this code under the same terms as Perl itself.
 
 =cut
+
+1;