package DBIx::Class::Storage::DBI;
+use base 'DBIx::Class::Storage';
+
use strict;
use warnings;
use DBI;
use SQL::Abstract::Limit;
use DBIx::Class::Storage::DBI::Cursor;
use IO::File;
+use Carp::Clan qw/DBIx::Class/;
BEGIN {
return $ret;
}
+sub _order_directions {
+ my ($self, $order) = @_;
+ $order = $order->{order_by} if ref $order eq 'HASH';
+ return $self->SUPER::_order_directions($order);
+}
+
sub _table {
my ($self, $from) = @_;
if (ref $from eq 'ARRAY') {
sub _quote {
my ($self, $label) = @_;
return '' unless defined $label;
+ return "*" if $label eq '*';
+ return $label unless $self->{quote_char};
+ if(ref $self->{quote_char} eq "ARRAY"){
+ return $self->{quote_char}->[0] . $label . $self->{quote_char}->[1]
+ if !defined $self->{name_sep};
+ my $sep = $self->{name_sep};
+ return join($self->{name_sep},
+ map { $self->{quote_char}->[0] . $_ . $self->{quote_char}->[1] }
+ split(/\Q$sep\E/,$label));
+ }
return $self->SUPER::_quote($label);
}
+sub _RowNum {
+ my $self = shift;
+ my $c;
+ $_[0] =~ s/SELECT (.*?) FROM/
+ 'SELECT '.join(', ', map { $_.' AS col'.++$c } split(', ', $1)).' FROM'/e;
+ $self->SUPER::_RowNum(@_);
+}
+
# Accessor for setting limit dialect. This is useful
# for JDBC-bridge among others where the remote SQL-dialect cannot
# be determined by the name of the driver alone.
return $self->{limit_dialect};
}
+sub quote_char {
+ my $self = shift;
+ $self->{quote_char} = shift if @_;
+ return $self->{quote_char};
+}
+
+sub name_sep {
+ my $self = shift;
+ $self->{name_sep} = shift if @_;
+ return $self->{name_sep};
+}
+
+
+
+
+package DBIx::Class::Storage::DBI::DebugCallback;
+
+sub print {
+ my ($self, $string) = @_;
+ $string =~ m/^(\w+)/;
+ ${$self}->($1, $string);
+}
+
} # End of BEGIN block
use base qw/DBIx::Class/;
-__PACKAGE__->load_components(qw/Exception AccessorGroup/);
+__PACKAGE__->load_components(qw/AccessorGroup/);
__PACKAGE__->mk_group_accessors('simple' =>
- qw/connect_info _dbh _sql_maker debug debugfh cursor on_connect_do transaction_depth/);
+ qw/connect_info _dbh _sql_maker _connection_pid debug debugfh cursor
+ on_connect_do transaction_depth/);
sub new {
my $new = bless({}, ref $_[0] || $_[0]);
$new->transaction_depth(0);
if (defined($ENV{DBIX_CLASS_STORAGE_DBI_DEBUG}) &&
($ENV{DBIX_CLASS_STORAGE_DBI_DEBUG} =~ /=(.+)$/)) {
- $new->debugfh(IO::File->new($1, 'w')||die "Cannot open trace file $1");
+ $new->debugfh(IO::File->new($1, 'w')||croak "Cannot open trace file $1");
} else {
$new->debugfh(IO::File->new('>&STDERR'));
}
used). Initially set to be STDERR - although see information on the
L<DBIX_CLASS_STORAGE_DBI_DEBUG> environment variable.
+=head2 debugcb
+
+Sets a callback to be executed each time a statement is run; takes a sub
+reference. Overrides debugfh. Callback is executed as $sub->($op, $info)
+where $op is SELECT/INSERT/UPDATE/DELETE and $info is what would normally
+be printed.
+
=cut
-sub dbh {
+sub debugcb {
+ my ($self, $cb) = @_;
+ my $cb_obj = bless(\$cb, 'DBIx::Class::Storage::DBI::DebugCallback');
+ $self->debugfh($cb_obj);
+}
+
+sub disconnect {
my ($self) = @_;
+
+ if( $self->connected ) {
+ $self->_dbh->rollback unless $self->_dbh->{AutoCommit};
+ $self->_dbh->disconnect;
+ $self->_dbh(undef);
+ }
+}
+
+sub connected {
+ my ($self) = @_;
+
my $dbh;
- unless (($dbh = $self->_dbh) && $dbh->FETCH('Active') && $dbh->ping) {
+ (($dbh = $self->_dbh) && $dbh->FETCH('Active') && $dbh->ping)
+}
+
+sub ensure_connected {
+ my ($self) = @_;
+
+ unless ($self->connected) {
$self->_populate_dbh;
}
+}
+
+sub dbh {
+ my ($self) = @_;
+
+ if($self->_connection_pid && $self->_connection_pid != $$) {
+ $self->_dbh->{InactiveDestroy} = 1;
+ $self->_dbh(undef)
+ }
+ $self->ensure_connected;
return $self->_dbh;
}
foreach my $sql_statement (@{$self->on_connect_do || []}) {
$self->_dbh->do($sql_statement);
}
+
+ $self->_connection_pid($$);
}
sub _connect {
my ($self, @info) = @_;
- return DBI->connect(@info);
+
+ if ($INC{'Apache/DBI.pm'} && $ENV{MOD_PERL}) {
+ my $old_connect_via = $DBI::connect_via;
+ $DBI::connect_via = 'connect';
+ my $dbh = DBI->connect(@info);
+ $DBI::connect_via = $old_connect_via;
+ return $dbh;
+ }
+
+ DBI->connect(@info);
}
=head2 txn_begin
sub txn_rollback {
my $self = shift;
- if ($self->{transaction_depth} == 0) {
- $self->dbh->rollback unless $self->dbh->{AutoCommit};
- }
- else {
- --$self->{transaction_depth} == 0 ? $self->dbh->rollback : die $@;
+
+ eval {
+ if ($self->{transaction_depth} == 0) {
+ $self->dbh->rollback unless $self->dbh->{AutoCommit};
+ }
+ else {
+ --$self->{transaction_depth} == 0 ?
+ $self->dbh->rollback :
+ die DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION->new;
+ }
+ };
+
+ if ($@) {
+ my $error = $@;
+ my $exception_class = "DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION";
+ $error =~ /$exception_class/ and $self->throw_exception($error);
+ $self->{transaction_depth} = 0; # ensure that a failed rollback
+ $self->throw_exception($error); # resets the transaction depth
}
}
my ($self, $op, $extra_bind, $ident, @args) = @_;
my ($sql, @bind) = $self->sql_maker->$op($ident, @args);
unshift(@bind, @$extra_bind) if $extra_bind;
- $self->debugfh->print("$sql: @bind\n") if $self->debug;
+ if ($self->debug) {
+ my @debug_bind = map { defined $_ ? $_ : 'NULL' } @bind;
+ $self->debugfh->print("$sql: @debug_bind\n");
+ }
my $sth = $self->sth($sql,$op);
+ croak "no sth generated via sql: $sql" unless $sth;
@bind = map { ref $_ ? ''.$_ : $_ } @bind; # stringify args
- my $rv = $sth->execute(@bind);
+ my $rv;
+ if ($sth) {
+ $rv = $sth->execute(@bind);
+ } else {
+ croak "'$sql' did not generate a statement.";
+ }
return (wantarray ? ($rv, $sth, @bind) : $rv);
}
sub insert {
my ($self, $ident, $to_insert) = @_;
- $self->throw( "Couldn't insert ".join(', ', map "$_ => $to_insert->{$_}", keys %$to_insert)." into ${ident}" )
+ croak( "Couldn't insert ".join(', ', map "$_ => $to_insert->{$_}", keys %$to_insert)." into ${ident}" )
unless ($self->_execute('insert' => [], $ident, $to_insert));
return $to_insert;
}
return $self->cursor->new($self, \@_, $attrs);
}
+# Need to call finish() to work round broken DBDs
+
sub select_single {
my $self = shift;
my ($rv, $sth, @bind) = $self->_select(@_);
- return $sth->fetchrow_array;
+ my @row = $sth->fetchrow_array;
+ $sth->finish();
+ return @row;
}
sub sth {
return \%result;
}
+sub DESTROY { shift->disconnect }
+
1;
=head1 ENVIRONMENT VARIABLES
projects / dbsrgits/DBIx-Class.git / blobdiff