From: Peter Rabbitson Date: Wed, 5 Aug 2009 10:12:20 +0000 (+0000) Subject: Whoopsie - more renames X-Git-Tag: v0.08109~30^2~5 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=86e68d2d59a7505fcd711c3a30dc1371d597cb76;p=dbsrgits%2FDBIx-Class.git Whoopsie - more renames --- diff --git a/lib/DBIx/Class/Storage/DBI/MSSQL.pm b/lib/DBIx/Class/Storage/DBI/MSSQL.pm index b0da553..674d458 100644 --- a/lib/DBIx/Class/Storage/DBI/MSSQL.pm +++ b/lib/DBIx/Class/Storage/DBI/MSSQL.pm @@ -30,14 +30,14 @@ sub insert_bulk { if ($identity_insert) { my $table = $source->from; - $self->_get_dbh->do("SET IDENTITY_INSERT $table ON"); + $self->last_dbh->do("SET IDENTITY_INSERT $table ON"); } $self->next::method(@_); if ($identity_insert) { my $table = $source->from; - $self->_get_dbh->do("SET IDENTITY_INSERT $table OFF"); + $self->last_dbh->do("SET IDENTITY_INSERT $table OFF"); } } @@ -68,7 +68,7 @@ sub insert { grep { not exists $to_insert->{$_} } (@pk_guids, @auto_guids); for my $guid_col (@get_guids_for) { - my ($new_guid) = $self->_get_dbh->selectrow_array('SELECT NEWID()'); + my ($new_guid) = $self->last_dbh->selectrow_array('SELECT NEWID()'); $updated_cols->{$guid_col} = $to_insert->{$guid_col} = $new_guid; } @@ -145,7 +145,7 @@ sub last_insert_id { shift->_identity } sub _svp_begin { my ($self, $name) = @_; - $self->_get_dbh->do("SAVE TRANSACTION $name"); + $self->last_dbh->do("SAVE TRANSACTION $name"); } # A new SAVE TRANSACTION with the same name releases the previous one. @@ -154,7 +154,7 @@ sub _svp_release { 1 } sub _svp_rollback { my ($self, $name) = @_; - $self->_get_dbh->do("ROLLBACK TRANSACTION $name"); + $self->last_dbh->do("ROLLBACK TRANSACTION $name"); } sub build_datetime_parser { diff --git a/lib/DBIx/Class/Storage/DBI/Sybase/Base.pm b/lib/DBIx/Class/Storage/DBI/Sybase/Base.pm index 757d4d9..b375a8c 100644 --- a/lib/DBIx/Class/Storage/DBI/Sybase/Base.pm +++ b/lib/DBIx/Class/Storage/DBI/Sybase/Base.pm @@ -29,7 +29,7 @@ sub _ping { sub _placeholders_supported { my $self = shift; - my $dbh = $self->_get_dbh; + my $dbh = $self->last_dbh; return eval { # There's also $dbh->{syb_dynamic_supported} but it can be inaccurate for this 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 6a20ba4..6cda222 100644 --- a/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm +++ b/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm @@ -11,7 +11,7 @@ use mro 'c3'; sub _rebless { my $self = shift; - my $dbh = $self->_get_dbh; + my $dbh = $self->last_dbh; if (not $self->_placeholders_supported) { bless $self,