From: Rafael Kitover Date: Mon, 24 Aug 2009 15:19:46 +0000 (+0000) Subject: remove duplicate oracle method and fix an mssql method call X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e33b954c9a8c955f72f302255aad685cdd9a8cd4;p=dbsrgits%2FDBIx-Class-Historic.git remove duplicate oracle method and fix an mssql method call --- diff --git a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm index 6998e86..88cf72d 100644 --- a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm +++ b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm @@ -206,12 +206,6 @@ sub connect_call_datetime_setup { "alter session set nls_timestamp_tz_format='$timestamp_tz_format'"); } -sub _svp_begin { - my ($self, $name) = @_; - - $self->_get_dbh->do("SAVEPOINT $name"); -} - =head2 source_bind_attributes Handle LOB types in Oracle. Under a certain size (4k?), you can get away @@ -259,7 +253,7 @@ sub source_bind_attributes sub _svp_begin { my ($self, $name) = @_; - $self->last_dbh->do("SAVEPOINT $name"); + $self->_get_dbh->do("SAVEPOINT $name"); } # Oracle automatically releases a savepoint when you start another one with the diff --git a/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm index 9731098..e7f0e51 100644 --- a/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm +++ b/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm @@ -13,7 +13,7 @@ sub _rebless { my $self = shift; my $dbh = $self->_get_dbh; - if (not $self->placeholders_with_type_conversion_supported) { + if (not $self->_typeless_placeholders_supported) { bless $self, 'DBIx::Class::Storage::DBI::Sybase::Microsoft_SQL_Server::NoBindVars'; $self->_rebless;