From: Rafael Kitover Date: Wed, 5 Aug 2009 09:02:26 +0000 (+0000) Subject: fix a couple minor issues after pull from trunk X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b4ad6d390ea8a1557b047f311d00b49a283b0b82;p=dbsrgits%2FDBIx-Class-Historic.git fix a couple minor issues after pull from trunk --- diff --git a/lib/DBIx/Class/Storage/DBI/Cursor.pm b/lib/DBIx/Class/Storage/DBI/Cursor.pm index d1f1c6e..c4c9806 100644 --- a/lib/DBIx/Class/Storage/DBI/Cursor.pm +++ b/lib/DBIx/Class/Storage/DBI/Cursor.pm @@ -128,7 +128,7 @@ sub _dbh_all { my ($storage, $dbh, $self) = @_; $self->_check_dbh_gen; - $self->sth->finish if $self->sth->{Active}; + $self->sth->finish if $self->sth && $self->sth->{Active}; $self->sth(undef); my ($rv, $sth) = $storage->_select(@{$self->{args}}); return @{$sth->fetchall_arrayref}; 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 7e19816..9926b74 100644 --- a/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm +++ b/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm @@ -6,7 +6,6 @@ use warnings; use base qw/ DBIx::Class::Storage::DBI::Sybase::Base DBIx::Class::Storage::DBI::MSSQL - DBIx::Class::Storage::DBI::NoBindVars /; use mro 'c3'; @@ -14,7 +13,7 @@ sub _rebless { my $self = shift; my $dbh = $self->_dbh; - if (not $self->_placeholders_supported) { + if (not $self->placeholders_with_type_conversion_supported) { bless $self, 'DBIx::Class::Storage::DBI::Sybase::Microsoft_SQL_Server::NoBindVars'; $self->_rebless;