From: Rafael Kitover Date: Sat, 24 Mar 2012 04:07:41 +0000 (-0400) Subject: Fix thinkos from bfec318f and 3edfebff X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5c6696c8fc3ea7b3d266a7357f86baffe8a93f84;p=dbsrgits%2FDBIx-Class-Historic.git Fix thinkos from bfec318f and 3edfebff --- diff --git a/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm b/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm index 24fe0b4..9741a45 100644 --- a/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm +++ b/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm @@ -34,14 +34,14 @@ makes it more suitable for long running processes such as under L. __PACKAGE__->datetime_parser_type ('DBIx::Class::Storage::DBI::ODBC::Firebird::DateTime::Format'); # batch operations in DBD::ODBC 1.35 do not work with the official ODBC driver -sub _init { +sub _run_connection_actions { my $self = shift; - $self->next::method(@_); - if ($self->_dbh_get_info('SQL_DRIVER_NAME') eq 'OdbcFb') { $self->_get_dbh->{odbc_disable_array_operations} = 1; } + + return $self->next::method(@_); } # releasing savepoints doesn't work for some reason, but that shouldn't matter diff --git a/lib/DBIx/Class/Storage/DBI/Sybase/ASE.pm b/lib/DBIx/Class/Storage/DBI/Sybase/ASE.pm index a66f190..6036acd 100644 --- a/lib/DBIx/Class/Storage/DBI/Sybase/ASE.pm +++ b/lib/DBIx/Class/Storage/DBI/Sybase/ASE.pm @@ -123,7 +123,7 @@ sub _init { if ($self->_using_freetds && (my $ver = $self->_using_freetds_version||999) > 0.82) { carp_once( - "Buggy FreeTDS version $ver detected, statement caching will not work and" + "Buggy FreeTDS version $ver detected, statement caching will not work and " . 'will be disabled.' ); $self->disable_sth_caching(1);